This repository was archived by the owner on May 26, 2020. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Original file line number Diff line number Diff line change 1- from django .contrib .auth import get_user_model
1+ import django
2+ from django .contrib .auth import authenticate as dj_authenticate , get_user_model
23
34from rest_framework import serializers
45
@@ -35,3 +36,10 @@ def get_username(user):
3536 username = user .username
3637
3738 return username
39+
40+
41+ def authenticate (request = None , ** credentials ):
42+ if django .version < (1 , 11 ):
43+ return dj_authenticate (** credentials )
44+ else :
45+ return dj_authenticate (request = request , ** credentials )
Original file line number Diff line number Diff line change 33from calendar import timegm
44from datetime import datetime , timedelta
55
6- from django .contrib .auth import authenticate , get_user_model
6+ from django .contrib .auth import get_user_model
77from django .utils .translation import ugettext as _
88from rest_framework import serializers
9- from .compat import Serializer
9+ from .compat import Serializer , authenticate
1010
1111from rest_framework_jwt .settings import api_settings
1212from rest_framework_jwt .compat import get_username_field , PasswordField
@@ -47,7 +47,8 @@ def validate(self, attrs):
4747 }
4848
4949 if all (credentials .values ()):
50- user = authenticate (** credentials )
50+ request = self .context .get ('request' )
51+ user = authenticate (request = request , ** credentials )
5152
5253 if user :
5354 if not user .is_active :
You can’t perform that action at this time.
0 commit comments