From d1b30f47924b983549ece75372067749517d3b1b Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Wed, 4 Dec 2013 10:00:12 +0000 Subject: [PATCH] Fix auth to use `get_user_document` #527 --- mongoengine/django/auth.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mongoengine/django/auth.py b/mongoengine/django/auth.py index f0f5ea1b..3d0adb04 100644 --- a/mongoengine/django/auth.py +++ b/mongoengine/django/auth.py @@ -8,6 +8,11 @@ from django.contrib import auth from django.contrib.auth.models import AnonymousUser from django.utils.translation import ugettext_lazy as _ +from .utils import datetime_now +from .mongo_auth import get_user_document + +REDIRECT_FIELD_NAME = 'next' + try: from django.contrib.auth.hashers import check_password, make_password except ImportError: @@ -33,10 +38,6 @@ except ImportError: hash = get_hexdigest(algo, salt, raw_password) return '%s$%s$%s' % (algo, salt, hash) -from .utils import datetime_now - -REDIRECT_FIELD_NAME = 'next' - class ContentType(Document): name = StringField(max_length=100) @@ -383,7 +384,7 @@ class MongoEngineBackend(object): supports_inactive_user = False def authenticate(self, username=None, password=None): - user = User.objects(username=username).first() + user = get_user_document().objects(username=username).first() if user: if password and user.check_password(password): backend = auth.get_backends()[0] @@ -392,7 +393,7 @@ class MongoEngineBackend(object): return None def get_user(self, user_id): - return User.objects.with_id(user_id) + return get_user_document().objects.with_id(user_id) def get_user(userid):