Merge branch 'pashinin-master'

danfairs · Sep 9, 2017 · 0f25110 · 0f25110
2 parents 3df1e76 + 1e69193
commit 0f25110
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lazysignup/backends.py b/lazysignup/backends.py
@@ -1,13 +1,16 @@
 from django.contrib.auth.backends import ModelBackend
 from lazysignup.models import LazyUser
+from django.contrib.auth import get_user_model
 
 
 class LazySignupBackend(ModelBackend):
 
     def authenticate(self, username=None):
         user_class = LazyUser.get_user_class()
         try:
-            return user_class.objects.get(username=username)
+            return user_class.objects.get(**{
+                get_user_model().USERNAME_FIELD: username
+            })
         except user_class.DoesNotExist:
             return None
 

diff --git a/lazysignup/models.py b/lazysignup/models.py
@@ -11,6 +11,7 @@
 from lazysignup.utils import is_lazy_user
 from lazysignup.signals import converted
 from lazysignup import constants
+from django.contrib.auth import get_user_model
 DEFAULT_BLACKLIST = (
     'slurp',
     'googlebot',
@@ -31,7 +32,7 @@ def __hash__(self):
         """
         return hash(str(self))
 
-    username_field = 'username'
+    username_field = get_user_model().USERNAME_FIELD
 
     def create_lazy_user(self):
         """ Create a lazy user. Returns a 2-tuple of the underlying User