Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

This is an attempt at fixing AppRegistryNotReady #175

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions rest_framework_simplejwt/authentication.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from django.contrib.auth import get_user_model
from django.utils.translation import ugettext_lazy as _
from rest_framework import HTTP_HEADER_ENCODING, authentication

from .exceptions import AuthenticationFailed, InvalidToken, TokenError
from .models import TokenUser
from .settings import api_settings
from .state import User

AUTH_HEADER_TYPES = api_settings.AUTH_HEADER_TYPES

Expand All @@ -24,6 +24,9 @@ class JWTAuthentication(authentication.BaseAuthentication):
"""
www_authenticate_realm = 'api'

def __init__(self):
self.user_model = get_user_model()

def authenticate(self, request):
header = self.get_header(request)
if header is None:
Expand Down Expand Up @@ -108,8 +111,8 @@ def get_user(self, validated_token):
raise InvalidToken(_('Token contained no recognizable user identification'))

try:
user = User.objects.get(**{api_settings.USER_ID_FIELD: user_id})
except User.DoesNotExist:
user = self.user_model.objects.get(**{api_settings.USER_ID_FIELD: user_id})
except self.user_model.DoesNotExist:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd much rather see something above the class: User = get_user_model() than see what's being done here.

raise AuthenticationFailed(_('User not found'), code='user_not_found')

if not user.is_active:
Expand Down
7 changes: 4 additions & 3 deletions rest_framework_simplejwt/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from django.contrib.auth import models as auth_models
from django.db.models.manager import EmptyManager
from django.utils.functional import cached_property

Expand All @@ -19,11 +18,13 @@ class instead of a `User` model instance. Instances of this class act as
# inactive user
is_active = True

_groups = EmptyManager(auth_models.Group)
_user_permissions = EmptyManager(auth_models.Permission)

def __init__(self, token):
self.token = token
from django.contrib.auth import models as auth_models
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this is always used, it's best if the import is still left at the top for performance.

self._groups = EmptyManager(auth_models.Group)
self._user_permissions = EmptyManager(auth_models.Permission)


def __str__(self):
return 'TokenUser {}'.format(self.id)
Expand Down
6 changes: 4 additions & 2 deletions rest_framework_simplejwt/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from django.contrib.auth import get_user_model
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Combine the import statements:
from django.contrib.auth import authenticate, get_user_model

from django.contrib.auth import authenticate
from django.utils.translation import ugettext_lazy as _
from rest_framework import exceptions, serializers

from .settings import api_settings
from .state import User
from .tokens import RefreshToken, SlidingToken, UntypedToken


Expand All @@ -18,7 +18,9 @@ def __init__(self, *args, **kwargs):


class TokenObtainSerializer(serializers.Serializer):
username_field = User.USERNAME_FIELD
user_model = get_user_model()

username_field = user_model.USERNAME_FIELD
Copy link
Member

@Andrew-Chen-Wang Andrew-Chen-Wang May 10, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it really necessary to set a name "user_model" if it's only used once in L23? Just use get_user_model().USERNAME_FIELD


default_error_messages = {
'no_active_account': _('No active account found with the given credentials')
Expand Down
1 change: 0 additions & 1 deletion rest_framework_simplejwt/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
from .backends import TokenBackend
from .settings import api_settings

User = get_user_model()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove the unused import statement for get_user_model

token_backend = TokenBackend(api_settings.ALGORITHM, api_settings.SIGNING_KEY,
api_settings.VERIFYING_KEY, api_settings.AUDIENCE, api_settings.ISSUER)