This repository was archived by the owner on May 26, 2020. It is now read-only.
File tree 2 files changed +13
-4
lines changed 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
2
3
3
4
from rest_framework import serializers
4
5
@@ -35,3 +36,10 @@ def get_username(user):
35
36
username = user .username
36
37
37
38
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 3
3
from calendar import timegm
4
4
from datetime import datetime , timedelta
5
5
6
- from django .contrib .auth import authenticate , get_user_model
6
+ from django .contrib .auth import get_user_model
7
7
from django .utils .translation import ugettext as _
8
8
from rest_framework import serializers
9
- from .compat import Serializer
9
+ from .compat import Serializer , authenticate
10
10
11
11
from rest_framework_jwt .settings import api_settings
12
12
from rest_framework_jwt .compat import get_username_field , PasswordField
@@ -47,7 +47,8 @@ def validate(self, attrs):
47
47
}
48
48
49
49
if all (credentials .values ()):
50
- user = authenticate (** credentials )
50
+ request = self .context .get ('request' )
51
+ user = authenticate (request = request , ** credentials )
51
52
52
53
if user :
53
54
if not user .is_active :
You can’t perform that action at this time.
0 commit comments