Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2024-12-02 13:53:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

change standard auth stuff to work with simplejwt

Browse Source
This commit is contained in:
alichass 2020-03-11 06:01:03 -04:00
parent 229b75543e
commit 9bbc4a3014
3 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dj_rest_auth/serializers.py
View File

@ -135,7 +135,8 @@ class JWTSerializer(serializers.Serializer):
""" """
Serializer for JWT authentication. Serializer for JWT authentication.
""" """
token = serializers.CharField() access_token = serializers.CharField()
refresh_token = serializers.CharField()
user = serializers.SerializerMethodField() user = serializers.SerializerMethodField()
def get_user(self, obj): def get_user(self, obj):

12
dj_rest_auth/utils.py
View File

@ -17,12 +17,10 @@ def default_create_token(token_model, user, serializer):
def jwt_encode(user): def jwt_encode(user):
try: try:
from rest_framework_jwt.settings import api_settings from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
from rest_framework_simplejwt.views import TokenObtainPairView
except ImportError: except ImportError:
raise ImportError("djangorestframework_jwt needs to be installed") raise ImportError("rest-framework-simplejwt needs to be installed")
jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER refresh = TokenObtainPairSerializer.get_token(user)
jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER return refresh.access_token, refresh
payload = jwt_payload_handler(user)
return jwt_encode_handler(payload)

18
dj_rest_auth/views.py
View File

@ -59,7 +59,7 @@ class LoginView(GenericAPIView):
self.user = self.serializer.validated_data['user'] self.user = self.serializer.validated_data['user']
if getattr(settings, 'REST_USE_JWT', False): if getattr(settings, 'REST_USE_JWT', False):
self.token = jwt_encode(self.user) self.access_token, self.refresh_token = jwt_encode(self.user)
else: else:
self.token = create_token(self.token_model, self.user, self.token = create_token(self.token_model, self.user,
self.serializer) self.serializer)
@ -73,7 +73,8 @@ class LoginView(GenericAPIView):
if getattr(settings, 'REST_USE_JWT', False): if getattr(settings, 'REST_USE_JWT', False):
data = { data = {
'user': self.user, 'user': self.user,
'token': self.token 'access_token': self.access_token,
'refresh_token': self.refresh_token
} }
serializer = serializer_class(instance=data, serializer = serializer_class(instance=data,
context={'request': self.request}) context={'request': self.request})
@ -82,15 +83,6 @@ class LoginView(GenericAPIView):
context={'request': self.request}) context={'request': self.request})
response = Response(serializer.data, status=status.HTTP_200_OK) response = Response(serializer.data, status=status.HTTP_200_OK)
if getattr(settings, 'REST_USE_JWT', False):
from rest_framework_jwt.settings import api_settings as jwt_settings
if jwt_settings.JWT_AUTH_COOKIE:
from datetime import datetime
expiration = (datetime.utcnow() + jwt_settings.JWT_EXPIRATION_DELTA)
response.set_cookie(jwt_settings.JWT_AUTH_COOKIE,
self.token,
expires=expiration,
httponly=True)
return response return response
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
@ -133,10 +125,6 @@ class LogoutView(APIView):
response = Response({"detail": _("Successfully logged out.")}, response = Response({"detail": _("Successfully logged out.")},
status=status.HTTP_200_OK) status=status.HTTP_200_OK)
if getattr(settings, 'REST_USE_JWT', False):
from rest_framework_jwt.settings import api_settings as jwt_settings
if jwt_settings.JWT_AUTH_COOKIE:
response.delete_cookie(jwt_settings.JWT_AUTH_COOKIE)
return response return response