django-clerk-users 0.1.0__tar.gz → 0.1.1__tar.gz

{django_clerk_users-0.1.0 → django_clerk_users-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-clerk-users
-Version: 0.1.0
+Version: 0.1.1
 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 → django_clerk_users-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "django-clerk-users"
-version = "0.1.0"
+version = "0.1.1"
 description = "Integrate Clerk with Django"
 readme = "README.md"
 requires-python = ">=3.12"

django_clerk_users-0.1.1/src/django_clerk_users/authentication/backends.py

@@ -0,0 +1,83 @@
+"""
+Django authentication backend for Clerk.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import TYPE_CHECKING, Any
+
+from django.contrib.auth import get_user_model
+from django.contrib.auth.backends import ModelBackend
+
+if TYPE_CHECKING:
+    from django.http import HttpRequest
+
+    from django_clerk_users.models import AbstractClerkUser
+
+logger = logging.getLogger(__name__)
+
+
+class ClerkBackend(ModelBackend):
+    """
+    Django authentication backend for Clerk.
+
+    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,
+        username: str | None = None,
+        password: str | None = None,
+        **kwargs: Any,
+    ) -> "AbstractClerkUser | None":
+        """
+        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).
+            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 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-0.1.0 → django_clerk_users-0.1.1}/uv.lock

@@ -289,7 +289,7 @@ wheels = [
 
 [[package]]
 name = "django-clerk-users"
-version = "0.0.2"
+version = "0.1.0"
 source = { editable = "." }
 dependencies = [
     { name = "clerk-backend-api" },

django_clerk_users-0.1.0/src/django_clerk_users/authentication/backends.py

@@ -1,89 +0,0 @@
-"""
-Django authentication backend for Clerk.
-"""
-
-from __future__ import annotations
-
-import logging
-from typing import TYPE_CHECKING, Any
-
-from django.contrib.auth import get_user_model
-from django.contrib.auth.backends import BaseBackend
-
-if TYPE_CHECKING:
-    from django.http import HttpRequest
-
-    from django_clerk_users.models import AbstractClerkUser
-
-logger = logging.getLogger(__name__)
-
-
-class ClerkBackend(BaseBackend):
-    """
-    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.
-
-    To use this backend, add it to AUTHENTICATION_BACKENDS in settings:
-
-        AUTHENTICATION_BACKENDS = [
-            'django_clerk_users.authentication.ClerkBackend',
-        ]
-    """
-
-    def authenticate(
-        self,
-        request: "HttpRequest | None" = None,
-        clerk_id: str | None = None,
-        **kwargs: Any,
-    ) -> "AbstractClerkUser | None":
-        """
-        Authenticate a user by their Clerk ID.
-
-        Args:
-            request: The current HTTP request (optional).
-            clerk_id: The Clerk user ID to authenticate.
-            **kwargs: Additional keyword arguments (ignored).
-
-        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