BmorricalDjangoWorkflows 2.1.1__tar.gz → 2.1.2__tar.gz

{bmorricaldjangoworkflows-2.1.1 → bmorricaldjangoworkflows-2.1.2}/BmorricalDjangoWorkflows.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BmorricalDjangoWorkflows
-Version: 2.1.1
+Version: 2.1.2
 Summary: Reusable Django Workflows
 Home-page: https://github.com/Bmorrical/django-workflows
 Author: Bradley Morrical

{bmorricaldjangoworkflows-2.1.1 → bmorricaldjangoworkflows-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: BmorricalDjangoWorkflows
-Version: 2.1.1
+Version: 2.1.2
 Summary: Reusable Django Workflows
 Home-page: https://github.com/Bmorrical/django-workflows
 Author: Bradley Morrical

bmorricaldjangoworkflows-2.1.2/VERSION

@@ -0,0 +1 @@
+2.1.2

{bmorricaldjangoworkflows-2.1.1 → bmorricaldjangoworkflows-2.1.2}/django_workflows/users/services/auth_flow.py

@@ -342,8 +342,8 @@ def list_users(*, exclude_groups: Any = None) -> list[dict[str, Any]]:
     users = sorted(
         filtered_users,
         key=lambda user: (
-            str(getattr(user, "username", "") or "").lower(),
             not bool(getattr(user, "is_active", False)),
+            str(getattr(user, "username", "") or "").lower(),
         ),
     )
 
@@ -639,7 +639,14 @@ def update_user(user: Any, data: dict[str, Any]) -> UserUpdateResult:
         _sync_user_groups(user=user, groups=validated_groups)
 
     if user_fields_updated:
-        user.save()
+        try:
+            user.save()
+        except IntegrityError:
+            logger.exception("User update failed due to IntegrityError for email=%s", user.email)
+            return UserUpdateResult(
+                success=False,
+                message="A user with this email already exists.",
+            )
 
     if not processed_update:
         return UserUpdateResult(

{bmorricaldjangoworkflows-2.1.1 → bmorricaldjangoworkflows-2.1.2}/django_workflows/users/views.py

@@ -1,5 +1,7 @@
 import logging
 
+from django.contrib.auth import get_user_model
+
 from rest_framework import status
 from rest_framework.permissions import BasePermission, IsAuthenticated
 from rest_framework.response import Response
@@ -38,11 +40,43 @@ def _user_has_group(user, group_name):
     return False
 
 
-class HasTimeEntryAdminGroup(BasePermission):
-    message = "Time Entry Admin group membership is required."
+class HasUserManagerGroup(BasePermission):
+    message = "User Manager group membership is required."
 
     def has_permission(self, request, view):
-        return _user_has_group(request.user, "Time Entry Admin")
+        return _user_has_group(request.user, "User Manager")
+
+
+def _resolve_patch_target_user(request):
+    target_user_id = request.data.get("id")
+    if target_user_id is None:
+        return request.user, None
+
+    try:
+        target_user_id = int(target_user_id)
+    except (TypeError, ValueError):
+        return None, Response(
+            {"detail": "id must be an integer value."},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+    if target_user_id == getattr(request.user, "id", None):
+        return request.user, None
+
+    if not _user_has_group(request.user, "User Manager"):
+        return None, Response(
+            {"detail": HasUserManagerGroup.message},
+            status=status.HTTP_403_FORBIDDEN,
+        )
+
+    User = get_user_model()
+    try:
+        return User.objects.get(id=target_user_id), None
+    except User.DoesNotExist:
+        return None, Response(
+            {"detail": "User not found."},
+            status=status.HTTP_404_NOT_FOUND,
+        )
 
 
 class AnonymousWorkflowView(APIView):
@@ -124,11 +158,11 @@ class UserCreateView(AnonymousWorkflowView):
 
 
 # Route: POST /admin-register/
-# Access: authenticated users in the Time Entry Admin group
+# Access: authenticated users in the User Manager group
 # Body params: firstName, lastName, email, optional username, optional company honeypot field, optional groups as [{name, enabled}]
 # Notes: server generates a strong password, creates an active user, and sends an informational email without verification code logic
 class AdminUserCreateView(APIView):
-    permission_classes = [IsAuthenticated, HasTimeEntryAdminGroup]
+    permission_classes = [IsAuthenticated, HasUserManagerGroup]
 
     def post(self, request):
         data = request.data
@@ -242,7 +276,8 @@ class UserListView(APIView):
 
 # Route: GET /user/
 # Route: PATCH /user/
-# PATCH body params: username, email, firstName, lastName, password, isActive, optional groups as [{name, enabled}]
+# PATCH body params: optional id, username, email, firstName, lastName, password, isActive, optional groups as [{name, enabled}]
+# Notes: when id is omitted the authenticated user is updated; updating another user by id requires the User Manager group
 class UserDetailView(APIView):
     permission_classes = [IsAuthenticated]
 
@@ -252,7 +287,11 @@ class UserDetailView(APIView):
         return Response(data, status=status.HTTP_200_OK)
 
     def patch(self, request):
-        result = update_user(request.user, request.data)
+        target_user, error_response = _resolve_patch_target_user(request)
+        if error_response is not None:
+            return error_response
+
+        result = update_user(target_user, request.data)
 
         if result.success:
             return Response(
@@ -260,5 +299,5 @@ class UserDetailView(APIView):
                 status=status.HTTP_200_OK,
             )
 
-        logger.error("UserDetailView: %s for user %s", result.message, request.user.email)
+        logger.error("UserDetailView: %s for user %s", result.message, target_user.email)
         return Response({"detail": result.message}, status=status.HTTP_400_BAD_REQUEST)

{bmorricaldjangoworkflows-2.1.1 → bmorricaldjangoworkflows-2.1.2}/tests/test_auth_flow.py

@@ -376,8 +376,8 @@ class AuthFlowTests(TestCase):
             [(item["username"], item["is_active"], item["email"]) for item in result],
             [
                 ("alex@example.com", True, "alex-active@example.com"),
-                ("alex@example.com", False, "alex-inactive@example.com"),
                 ("bravo@example.com", True, "bravo@example.com"),
+                ("alex@example.com", False, "alex-inactive@example.com"),
             ],
         )
 
@@ -1607,6 +1607,29 @@ class AuthFlowTests(TestCase):
         self.assertEqual(result.message, "groups must be a list of objects with name and enabled.")
         user.save.assert_not_called()
 
+    def test_update_user_returns_conflict_when_save_hits_integrity_error(self):
+        user = SimpleNamespace(
+            username="member@example.com",
+            email="member@example.com",
+            first_name="Member",
+            last_name="User",
+            is_active=True,
+            groups=SimpleNamespace(add=MagicMock(), remove=MagicMock()),
+            save=MagicMock(side_effect=auth_flow.IntegrityError("duplicate")),
+            set_password=MagicMock(),
+        )
+
+        result = auth_flow.update_user(
+            user,
+            {
+                "email": "taken@example.com",
+                "username": "taken@example.com",
+            },
+        )
+
+        self.assertFalse(result.success)
+        self.assertEqual(result.message, "A user with this email already exists.")
+
     def test_update_user_returns_error_for_empty_payload(self):
         user = SimpleNamespace(
             username="member@example.com",

{bmorricaldjangoworkflows-2.1.1 → bmorricaldjangoworkflows-2.1.2}/tests/test_user_views.py

@@ -349,6 +349,110 @@ class PackageUserDetailViewTest(SimpleTestCase):
             },
         )
 
+    @patch("django_workflows.users.views.get_user_model")
+    @patch("django_workflows.users.views.update_user")
+    def test_user_detail_patch_uses_payload_id_for_time_entry_admin(self, mock_update_user, mock_get_user_model):
+        mock_update_user.return_value = SimpleNamespace(
+            success=True,
+            message="User updated successfully.",
+        )
+
+        actor = self._make_user()
+        actor.id = 1
+        actor.groups = SimpleNamespace(all=lambda: [SimpleNamespace(name="User Manager")])
+        target_user = self._make_user()
+        target_user.id = 9
+        target_user.email = "target@example.com"
+        target_user.username = "target@example.com"
+
+        user_model = SimpleNamespace(objects=SimpleNamespace(get=lambda **kwargs: target_user), DoesNotExist=Exception)
+        mock_get_user_model.return_value = user_model
+
+        request = SimpleNamespace(
+            user=actor,
+            data={
+                "id": 9,
+                "email": "target@example.com",
+                "username": "target@example.com",
+                "isActive": 1,
+                "groups": [{"name": "Time Entry User", "enabled": True}],
+            },
+        )
+        response = workflow_views.UserDetailView().patch(request)
+
+        self.assertEqual(response.status_code, 200)
+        mock_update_user.assert_called_once_with(target_user, request.data)
+
+    @patch("django_workflows.users.views.get_user_model")
+    @patch("django_workflows.users.views.update_user")
+    def test_user_detail_patch_uses_authenticated_user_when_payload_id_matches_self(
+        self,
+        mock_update_user,
+        mock_get_user_model,
+    ):
+        mock_update_user.return_value = SimpleNamespace(
+            success=True,
+            message="User updated successfully.",
+        )
+
+        actor = self._make_user()
+        actor.id = 9
+        request = SimpleNamespace(
+            user=actor,
+            data={
+                "id": 9,
+                "email": "member@example.com",
+                "username": "member@example.com",
+                "firstName": "Updated",
+            },
+        )
+
+        response = workflow_views.UserDetailView().patch(request)
+
+        self.assertEqual(response.status_code, 200)
+        mock_update_user.assert_called_once_with(actor, request.data)
+        mock_get_user_model.assert_not_called()
+
+    def test_user_detail_patch_returns_400_for_invalid_id(self):
+        request = SimpleNamespace(user=self._make_user(), data={"id": "not-an-int"})
+
+        response = workflow_views.UserDetailView().patch(request)
+
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(response.data["detail"], "id must be an integer value.")
+
+    def test_user_detail_patch_returns_403_for_foreign_id_without_time_entry_admin(self):
+        actor = self._make_user()
+        actor.id = 1
+        actor.groups = SimpleNamespace(all=lambda: [SimpleNamespace(name="Time Entry User")])
+        request = SimpleNamespace(user=actor, data={"id": 9, "firstName": "Updated"})
+
+        response = workflow_views.UserDetailView().patch(request)
+
+        self.assertEqual(response.status_code, 403)
+        self.assertEqual(response.data["detail"], workflow_views.HasUserManagerGroup.message)
+
+    @patch("django_workflows.users.views.get_user_model")
+    def test_user_detail_patch_returns_404_when_target_id_is_missing(self, mock_get_user_model):
+        class DoesNotExist(Exception):
+            pass
+
+        actor = self._make_user()
+        actor.id = 1
+        actor.groups = SimpleNamespace(all=lambda: [SimpleNamespace(name="User Manager")])
+
+        user_model = SimpleNamespace(
+            objects=SimpleNamespace(get=lambda **kwargs: (_ for _ in ()).throw(DoesNotExist())),
+            DoesNotExist=DoesNotExist,
+        )
+        mock_get_user_model.return_value = user_model
+
+        request = SimpleNamespace(user=actor, data={"id": 99, "firstName": "Updated"})
+        response = workflow_views.UserDetailView().patch(request)
+
+        self.assertEqual(response.status_code, 404)
+        self.assertEqual(response.data["detail"], "User not found.")
+
     @patch("django_workflows.users.views.update_user")
     def test_user_detail_patch_validation_error_returns_400(self, mock_update_user):
         mock_update_user.return_value = SimpleNamespace(
@@ -424,7 +528,7 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             },
             format="json",
         )
-        force_authenticate(request, user=self._make_authenticated_user(["Time Entry Admin"]))
+        force_authenticate(request, user=self._make_authenticated_user(["User Manager"]))
 
         response = workflow_views.AdminUserCreateView.as_view()(request)
 
@@ -467,7 +571,7 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             },
             format="json",
         )
-        force_authenticate(request, user=self._make_authenticated_user(["Time Entry Admin"]))
+        force_authenticate(request, user=self._make_authenticated_user(["User Manager"]))
 
         response = workflow_views.AdminUserCreateView.as_view()(request)
 
@@ -483,7 +587,7 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             },
             format="json",
         )
-        force_authenticate(request, user=self._make_authenticated_user(["Time Entry Admin"]))
+        force_authenticate(request, user=self._make_authenticated_user(["User Manager"]))
 
         response = workflow_views.AdminUserCreateView.as_view()(request)
 
@@ -507,7 +611,7 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             },
             format="json",
         )
-        force_authenticate(request, user=self._make_authenticated_user(["Time Entry Admin"]))
+        force_authenticate(request, user=self._make_authenticated_user(["User Manager"]))
 
         response = workflow_views.AdminUserCreateView.as_view()(request)
 
@@ -530,7 +634,7 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             },
             format="json",
         )
-        force_authenticate(request, user=self._make_authenticated_user(["Time Entry Admin"]))
+        force_authenticate(request, user=self._make_authenticated_user(["User Manager"]))
 
         response = workflow_views.AdminUserCreateView.as_view()(request)
 
@@ -541,8 +645,8 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
         unauthenticated_user = SimpleNamespace(is_authenticated=False)
         missing_group_manager_user = SimpleNamespace(is_authenticated=True, groups=None)
 
-        self.assertFalse(workflow_views._user_has_group(unauthenticated_user, "Time Entry Admin"))
-        self.assertFalse(workflow_views._user_has_group(missing_group_manager_user, "Time Entry Admin"))
+        self.assertFalse(workflow_views._user_has_group(unauthenticated_user, "User Manager"))
+        self.assertFalse(workflow_views._user_has_group(missing_group_manager_user, "User Manager"))
 
     def test_user_has_group_uses_filter_exists_when_available(self):
         filtered_groups = SimpleNamespace(exists=lambda: True)
@@ -551,7 +655,7 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             groups=SimpleNamespace(filter=lambda **kwargs: filtered_groups),
         )
 
-        self.assertTrue(workflow_views._user_has_group(user, "Time Entry Admin"))
+        self.assertTrue(workflow_views._user_has_group(user, "User Manager"))
 
     def test_user_has_group_returns_false_without_filter_or_all(self):
         user = SimpleNamespace(
@@ -559,4 +663,4 @@ class PackageAdminUserWorkflowViewsTest(SimpleTestCase):
             groups=SimpleNamespace(),
         )
 
-        self.assertFalse(workflow_views._user_has_group(user, "Time Entry Admin"))
+        self.assertFalse(workflow_views._user_has_group(user, "User Manager"))

bmorricaldjangoworkflows-2.1.1/VERSION

@@ -1 +0,0 @@
-2.1.1