Merge 40810d5 into e6d6ed5

st4lk · Jan 19, 2020 · 2811980 · 2811980
2 parents e6d6ed5 + 40810d5
commit 2811980
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Requirements
 - social-auth-core (>=3.0, <4.0)
 - social-auth-app-django (>=3.1, <4.0)
 - [optional] djangorestframework-simplejwt (>=4.0.0)
-- [optional] django-rest-knox (>=3.2.0, <4.0.0)
+- [optional] django-rest-knox (>=4.0.0, <5.0.0)
 
 Release notes
 -------------

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -3,6 +3,9 @@ rest_social_auth release notes
 
 master
 ------
+- Update supported version of django-rest-knox (>=4.0.0, <5.0.0). v4 has breaking changes.
+
+Issues: #110
 
 v3.0.0
 ------

diff --git a/requirements_optional.txt b/requirements_optional.txt
@@ -1,3 +1,3 @@
-django-rest-knox<4.0.0
+django-rest-knox>=4.0.0,<5.0.0
 djangorestframework-simplejwt>=4.0.0
 djangorestframework-jwt==1.11.0
diff --git a/rest_social_auth/serializers.py b/rest_social_auth/serializers.py
@@ -54,8 +54,8 @@ def get_token(self, obj):
             )
             raise
 
-        token = AuthToken.objects.create(obj)
-        return token
+        token_instance, token_key = AuthToken.objects.create(obj)
+        return token_key
 
 
 class UserKnoxSerializer(KnoxSerializer, UserSerializer):

diff --git a/tox.ini b/tox.ini
@@ -22,7 +22,7 @@ deps =
     social-auth-app-django==3.1.0
     djangorestframework-jwt
     djangorestframework_simplejwt
-    django-rest-knox<4.0.0
+    django-rest-knox<5.0.0
     django111: Django>=1.11,<1.12
     django22: Django>=2.2,<2.3
     django30: Django>=3.0,<3.1