django-clerk-users 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

django_clerk_users/authentication/backends.py

@@ -8,7 +8,7 @@ import logging
 from typing import TYPE_CHECKING, Any
 
 from django.contrib.auth import get_user_model
-from django.contrib.auth.backends import BaseBackend
+from django.contrib.auth.backends import ModelBackend
 
 if TYPE_CHECKING:
     from django.http import HttpRequest
@@ -18,72 +18,66 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-class ClerkBackend(BaseBackend):
+class ClerkBackend(ModelBackend):
     """
     Django authentication backend for Clerk.
 
-    This backend authenticates users by their Clerk ID rather than
-    username/password. It's designed to work with Clerk's JWT-based
-    authentication.
+    This backend extends Django's ModelBackend to add Clerk ID authentication
+    while preserving standard username/password authentication. This allows:
+
+    - Superusers to log into Django admin with email/password
+    - Clerk users to authenticate via JWT tokens (clerk_id)
+    - All standard Django permission checks to work as expected
 
     To use this backend, add it to AUTHENTICATION_BACKENDS in settings:
 
         AUTHENTICATION_BACKENDS = [
             'django_clerk_users.authentication.ClerkBackend',
         ]
+
+    This is the only backend you need - it handles both Clerk authentication
+    and standard Django authentication (for admin access, etc.).
     """
 
     def authenticate(
         self,
         request: "HttpRequest | None" = None,
-        clerk_id: str | None = None,
+        username: str | None = None,
+        password: str | None = None,
         **kwargs: Any,
     ) -> "AbstractClerkUser | None":
         """
-        Authenticate a user by their Clerk ID.
+        Authenticate a user by Clerk ID or username/password.
+
+        If a clerk_id is provided in kwargs, authenticates via Clerk ID lookup.
+        Otherwise, falls back to Django's standard username/password
+        authentication (inherited from ModelBackend).
 
         Args:
             request: The current HTTP request (optional).
-            clerk_id: The Clerk user ID to authenticate.
-            **kwargs: Additional keyword arguments (ignored).
+            username: The username (email) for standard auth (optional).
+            password: The password for standard auth (optional).
+            **kwargs: Additional keyword arguments. If 'clerk_id' is present,
+                      Clerk authentication is used instead of password auth.
 
         Returns:
             The authenticated user or None if authentication fails.
         """
-        if not clerk_id:
-            return None
-
-        User = get_user_model()
-
-        try:
-            user = User.objects.get(clerk_id=clerk_id)
-            if user.is_active:
-                return user
-            logger.debug(f"User {clerk_id} is inactive")
-            return None
-        except User.DoesNotExist:
-            logger.debug(f"No user found with clerk_id: {clerk_id}")
-            return None
-
-    def get_user(self, user_id: int) -> "AbstractClerkUser | None":
-        """
-        Get a user by their Django primary key.
-
-        This method is called by Django's authentication middleware
-        to restore the user from the session.
-
-        Args:
-            user_id: The user's primary key.
-
-        Returns:
-            The user instance or None if not found.
-        """
-        User = get_user_model()
-
-        try:
-            user = User.objects.get(pk=user_id)
-            if user.is_active:
-                return user
-            return None
-        except User.DoesNotExist:
-            return None
+        # If clerk_id is provided, authenticate via Clerk
+        clerk_id = kwargs.pop("clerk_id", None)
+        if clerk_id:
+            User = get_user_model()
+
+            try:
+                user = User.objects.get(clerk_id=clerk_id)
+                if user.is_active:
+                    return user
+                logger.debug(f"User {clerk_id} is inactive")
+                return None
+            except User.DoesNotExist:
+                logger.debug(f"No user found with clerk_id: {clerk_id}")
+                return None
+
+        # Otherwise, fall back to standard Django authentication
+        # This enables superuser login via Django admin
+        return super().authenticate(request, username, password, **kwargs)

django_clerk_users/utils.py

@@ -28,7 +28,9 @@ def update_or_create_clerk_user(
     Update or create a Django user from Clerk data.
 
     Fetches user data from the Clerk API and creates or updates
-    the corresponding Django user.
+    the corresponding Django user. If a user with the same email
+    already exists (e.g., a superuser created via createsuperuser),
+    it will be linked to the Clerk ID rather than creating a duplicate.
 
     Args:
         clerk_user_id: The Clerk user ID.
@@ -70,17 +72,42 @@ def update_or_create_clerk_user(
 
         # Prepare user data
         user_data = {
-            "email": primary_email,
             "first_name": getattr(clerk_user, "first_name", "") or "",
             "last_name": getattr(clerk_user, "last_name", "") or "",
             "image_url": getattr(clerk_user, "image_url", "") or "",
         }
 
-        # Update or create the Django user
-        user, created = User.objects.update_or_create(
-            clerk_id=clerk_user_id,
-            defaults=user_data,
-        )
+        # First, try to find by clerk_id
+        user = User.objects.filter(clerk_id=clerk_user_id).first()
+        created = False
+
+        if user:
+            # Update existing Clerk-linked user
+            for key, value in user_data.items():
+                setattr(user, key, value)
+            user.email = primary_email
+            user.save()
+        else:
+            # No user with this clerk_id - check if email already exists
+            user = User.objects.filter(email__iexact=primary_email).first()
+
+            if user:
+                # Link existing Django user to Clerk
+                user.clerk_id = clerk_user_id
+                for key, value in user_data.items():
+                    setattr(user, key, value)
+                user.save()
+                logger.info(
+                    f"Linked existing user {user.email} to Clerk ID {clerk_user_id}"
+                )
+            else:
+                # Create new user
+                user = User.objects.create(
+                    clerk_id=clerk_user_id,
+                    email=primary_email,
+                    **user_data,
+                )
+                created = True
 
         # Update cache
         set_cached_user(clerk_user_id, user)

{django_clerk_users-0.1.0.dist-info → django_clerk_users-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-clerk-users
-Version: 0.1.0
+Version: 0.1.2
 Summary: Integrate Clerk with Django
 Project-URL: Changelog, https://github.com/jmitchel3/django-clerk-users
 Project-URL: Documentation, https://github.com/jmitchel3/django-clerk-users

{django_clerk_users-0.1.0.dist-info → django_clerk_users-0.1.2.dist-info}/RECORD

@@ -9,9 +9,9 @@ django_clerk_users/managers.py,sha256=HvSkGeiQhjA6EFXrW4GTlxXtlRDtlT54BbwbvnNuOW
 django_clerk_users/models.py,sha256=DMcEnGNioGX5xsP4U47ich1L_UoZNAFEDb-vZVVV8Tk,5210
 django_clerk_users/settings.py,sha256=pRyt_kSPWOT8CkTvyce3sf0RxfIoG5DEwnGUT8bIDi8,1305
 django_clerk_users/testing.py,sha256=ZoYi7dG_HjSp19_c1AvILOoCfHlofs7LN-5ALS_UhDw,12160
-django_clerk_users/utils.py,sha256=bQWfPUKfVvXi69Ctny1T1Kxzk-qMDpXQBRVa6URH53I,5886
+django_clerk_users/utils.py,sha256=OMB2OCv-SUk6iAbWU6NPo-Psq63dcVJRSDTkAICFNmY,7002
 django_clerk_users/authentication/__init__.py,sha256=PStQVzC-CA2Guyo4ksrxP58o93mfygW4qcJXWEjs6ak,614
-django_clerk_users/authentication/backends.py,sha256=We0P2AhMv_DB_ZwtFGmmjWKvT5Cewy441Iua2lAZZCg,2400
+django_clerk_users/authentication/backends.py,sha256=bDJ2mEO66xhcJPc6f-jYa3F9x-PJ4RJrm9GD-pCTo6Y,2855
 django_clerk_users/authentication/drf.py,sha256=AqHvZTe9RnxN7FVzlSUXR72QBj2imGglkx9rpOrRDIk,3215
 django_clerk_users/authentication/utils.py,sha256=tpnRXQLbQPkosKV8OhxtXpapuema4c08g58YYmMl3js,5326
 django_clerk_users/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,7 +37,7 @@ django_clerk_users/webhooks/handlers.py,sha256=GnotJNhN809DsrbfZjtJD0KurThKyAXZS
 django_clerk_users/webhooks/security.py,sha256=Ig2ZxF8SxX5o-4bNRehFhip4hVvcQxoGsTj3sTY3WSU,3461
 django_clerk_users/webhooks/signals.py,sha256=bytshg7IMDnlvnCZ0_TGjUXZZLRNxtn2RSx97qacZ-w,1668
 django_clerk_users/webhooks/views.py,sha256=0-ilzzO7tBfc-pENMy0ZSSkQ4uPqH2QAt249EK2wQKA,2287
-django_clerk_users-0.1.0.dist-info/METADATA,sha256=JSE1da_-Xl_lXQimkztPbpz1bY4MF45wkQY2K49U75E,8687
-django_clerk_users-0.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-django_clerk_users-0.1.0.dist-info/licenses/LICENSE,sha256=X4PZDRQG4RmPhHU5c0G21Ki9LXWDCuLQ8W4mnED5RDU,1071
-django_clerk_users-0.1.0.dist-info/RECORD,,
+django_clerk_users-0.1.2.dist-info/METADATA,sha256=FXGQeLLxETfuOZb53Zn-m4tbXonJDjldPgjx0z6TsRY,8687
+django_clerk_users-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+django_clerk_users-0.1.2.dist-info/licenses/LICENSE,sha256=X4PZDRQG4RmPhHU5c0G21Ki9LXWDCuLQ8W4mnED5RDU,1071
+django_clerk_users-0.1.2.dist-info/RECORD,,