mirror of
https://github.com/Tivix/django-rest-auth.git
synced 2025-06-30 01:23:04 +03:00
Pass Knox serializer appropriate data format and separate from default
This commit is contained in:
parent
a2aa430d4a
commit
6f2319e20e
|
@ -1,13 +1,13 @@
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
if getattr(settings, 'REST_AUTH_TOKEN_APP', False) is 'knox':
|
if getattr(settings, 'REST_AUTH_TOKEN_APP', False) is 'knox':
|
||||||
from rest_auth.serializers import KnoxTokenSerializer as DefaultTokenSerializer
|
|
||||||
from .utils import create_knox_token as default_create_token
|
from .utils import create_knox_token as default_create_token
|
||||||
else:
|
else:
|
||||||
from rest_auth.serializers import TokenSerializer as DefaultTokenSerializer
|
|
||||||
from .utils import default_create_token
|
from .utils import default_create_token
|
||||||
|
|
||||||
from rest_auth.serializers import (
|
from rest_auth.serializers import (
|
||||||
|
TokenSerializer as DefaultTokenSerializer,
|
||||||
|
KnoxTokenSerializer as DefaultKnoxTokenSerializer,
|
||||||
JWTSerializer as DefaultJWTSerializer,
|
JWTSerializer as DefaultJWTSerializer,
|
||||||
UserDetailsSerializer as DefaultUserDetailsSerializer,
|
UserDetailsSerializer as DefaultUserDetailsSerializer,
|
||||||
LoginSerializer as DefaultLoginSerializer,
|
LoginSerializer as DefaultLoginSerializer,
|
||||||
|
@ -27,6 +27,9 @@ TokenSerializer = import_callable(
|
||||||
JWTSerializer = import_callable(
|
JWTSerializer = import_callable(
|
||||||
serializers.get('JWT_SERIALIZER', DefaultJWTSerializer))
|
serializers.get('JWT_SERIALIZER', DefaultJWTSerializer))
|
||||||
|
|
||||||
|
KnoxTokenSerializer = import_callable(
|
||||||
|
serializers.get('KNOX_TOKEN_SERIALIZER', DefaultKnoxTokenSerializer))
|
||||||
|
|
||||||
UserDetailsSerializer = import_callable(
|
UserDetailsSerializer = import_callable(
|
||||||
serializers.get('USER_DETAILS_SERIALIZER', DefaultUserDetailsSerializer)
|
serializers.get('USER_DETAILS_SERIALIZER', DefaultUserDetailsSerializer)
|
||||||
)
|
)
|
||||||
|
|
|
@ -16,6 +16,7 @@ from allauth.account import app_settings as allauth_settings
|
||||||
|
|
||||||
from rest_auth.app_settings import (TokenSerializer,
|
from rest_auth.app_settings import (TokenSerializer,
|
||||||
JWTSerializer,
|
JWTSerializer,
|
||||||
|
KnoxTokenSerializer,
|
||||||
create_token)
|
create_token)
|
||||||
from rest_auth.models import TokenModel
|
from rest_auth.models import TokenModel
|
||||||
from rest_auth.registration.serializers import (SocialLoginSerializer,
|
from rest_auth.registration.serializers import (SocialLoginSerializer,
|
||||||
|
@ -49,6 +50,12 @@ class RegisterView(CreateAPIView):
|
||||||
'token': self.token
|
'token': self.token
|
||||||
}
|
}
|
||||||
return JWTSerializer(data).data
|
return JWTSerializer(data).data
|
||||||
|
if getattr(settings, 'REST_AUTH_TOKEN_APP', False) is 'knox':
|
||||||
|
data = {
|
||||||
|
'token': self.token
|
||||||
|
}
|
||||||
|
return KnoxTokenSerializer(data).data
|
||||||
|
|
||||||
else:
|
else:
|
||||||
return TokenSerializer(self.token).data
|
return TokenSerializer(self.token).data
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user