Ticket #7591: email_auth.diff

contrib/auth/backends.py

@@ -12 +12 @@
     """
     # TODO: Model, login attribute name and password attribute name should be
     # configurable.
-    def authenticate(self, username=None, password=None):
+    def authenticate(self, **credentials):
         try:
-            user = User.objects.get(username=username)
-            if user.check_password(password):
+            user = None
+            if 'username' in credentials:  
+              user = User.objects.get(username=credentials['username'])
+            else:
+              user = User.objects.get(email=credentials['email'])
+
+            if user.check_password(credentials['password']):
                 return user
+
         except User.DoesNotExist:
             return None