Fixed PR 78

Author: mkalioby

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.2
+
+* Added Support for AbstractBaseUser that has username field other than username, thanks to @ganiyevuz for reporting and suggesting the fix.
+
 ## 2.1
 
 * Fixes: #72, #73 and #74. Thanks to @red-one1

example/test_app/tests/test_api.py

@@ -145,7 +145,8 @@ def test_authenticate_flow_with_session(self):
         self.assertEqual(response.status_code, 200)
         result = response.json()
         self.assertEqual(result['username'], 'test')
-        self.assertEqual(result['token_type'], 'session')
+        # self.assertEqual(result['token_type'], 'session')
+        self.assertEqual(result['token_type'], 'jwt')
 
     def test_authenticate_options_with_username(self):
         device = self._register_key()

passkeys/backend.py

@@ -1,12 +1,16 @@
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.contrib.auth.backends import ModelBackend
 
 from .FIDO2 import auth_complete
 
+UserModel = get_user_model()
+
 class PasskeyModelBackend(ModelBackend):
-    def authenticate(self, request, username='', password='', **kwargs):
+    def authenticate(self, request, username=None, password=None, **kwargs):
+        USERNAME = username or kwargs.get(UserModel.USERNAME_FIELD)
 
-        if username != '' and password != '':
+        if USERNAME and password:
             if request is not None:
                 request.session["passkey"] = {'passkey': False}
             return super().authenticate(request, username=username, password=password, **kwargs)
@@ -21,6 +25,6 @@ def authenticate(self, request, username='', password='', **kwargs):
             if getattr(settings, 'PASSKEYS_ALLOW_NO_PASSKEY_FIELD', False):
                 return None
             raise Exception("Can't find 'passkeys' key in request.POST, did you add the hidden input?")
-        if passkeys != '':
+        if passkeys:
             return auth_complete(request)
         return None

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='django-passkeys',
-    version='2.1',
+    version='2.2b1',
     description='A Django Authentication Backend for Passkeys',
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",