abs-auth-rbac-core 0.3.4__py3-none-any.whl → 0.3.5__py3-none-any.whl

abs_auth_rbac_core/rbac/service.py

@@ -43,8 +43,8 @@ class RBACService:
         """
         self.db = session
         self.enforcer = None
-        self.watcher = None
         self._initialize_casbin(redis_config)
+        self.watcher = None
 
 
     def _initialize_casbin(self,redis_config:Optional[RedisWatcherSchema]=None):
@@ -393,6 +393,7 @@ class RBACService:
                 raise NotFoundError(detail="Requested role does not exist")
                 
             return role
+        
 
     def update_role_permissions(
         self,
@@ -401,13 +402,12 @@ class RBACService:
         name: Optional[str] = None,
         description: Optional[str] = None,
     ) -> Any:
-        """Update role permissions by replacing all existing permissions with new ones"""
+        """Update role permissions"""
         with self.db() as session:
             try:
                 if not session.is_active:
                     session.begin()
 
-                # Get role with eager loading of permissions
                 role = (
                     session.query(Role)
                     .options(joinedload(Role.permissions))
@@ -418,81 +418,91 @@ class RBACService:
                 if not role:
                     raise NotFoundError(detail="Requested role does not exist")
 
-                # Update role information if provided
                 if name is not None or description is not None:
                     if name:
-                        # Check if new name already exists for a different role
                         existing_role = (
                             session.query(Role)
                             .filter(Role.name == name, Role.uuid != role_uuid)
                             .first()
                         )
-
                         if existing_role:
                             raise DuplicatedError(detail="Role already exists")
-                        
                         if role.name != "super_admin":
                             role.name = name
-
                     if description is not None:
                         role.description = description
 
                 if permissions is not None:
                     existing_permissions = role.permissions
+                    existing_permission = {p.uuid for p in existing_permissions}
+                    new_permission = set(permissions) if permissions else set()
 
-                    # Remove Casbin policies for existing permissions
-                    remove_policies = [
-                        [role_uuid, existing_permission.resource, existing_permission.action, existing_permission.module]
-                        for existing_permission in existing_permissions
-                    ]
-                    self.enforcer.remove_policies(remove_policies)
-                    self.enforcer.save_policy()
-
-                    # Delete existing role permissions
-                    session.query(RolePermission).filter(
-                        RolePermission.role_uuid == role_uuid
-                    ).delete(synchronize_session=False)
+                    permissions_to_remove = existing_permission - new_permission
+                    permissions_to_add = new_permission - existing_permission
 
-                if permissions:
-                    # Fetch all permissions in a single query
-                    permissions_objs = (
-                        session.query(Permission)
-                        .filter(Permission.uuid.in_(permissions))
-                        .all()
-                    )
+                    if permissions_to_remove:
+                        session.query(RolePermission).filter(
+                            RolePermission.role_uuid == role_uuid,
+                            RolePermission.permission_uuid.in_(permissions_to_remove)
+                        ).delete(synchronize_session=False)
 
-                    found_permission_ids = {p.uuid for p in permissions_objs}
-                    missing_permission_ids = set(permissions) - found_permission_ids
-                    if missing_permission_ids:
-                        raise NotFoundError(
-                            detail=f"Permissions with UUIDs '{', '.join(missing_permission_ids)}' not found"
+                    if permissions_to_add:
+                        new_permissions = (
+                            session.query(Permission)
+                            .filter(Permission.uuid.in_(permissions_to_add))
+                            .all()
                         )
 
-                    # Bulk insert role permissions
-                    role_permissions = [
-                        {"role_uuid": role_uuid, "permission_uuid": permission.uuid}
-                        for permission in permissions_objs
-                    ]
-                    session.bulk_insert_mappings(RolePermission, role_permissions)
+                        found_permission = {p.uuid for p in new_permissions}
+                        missing_permission = permissions_to_add - found_permission
+                        if missing_permission:
+                            raise NotFoundError(
+                                detail=f"Permissions with UUIDs '{', '.join(missing_permission)}' not found"
+                            )
 
-                    # Add Casbin policies
-                    policies = [
-                        [role_uuid, permission.resource, permission.action, permission.module]
-                        for permission in permissions_objs
-                    ]
-                    self.enforcer.add_policies(policies)
-                    self.enforcer.save_policy()
+                        role_permissions = [
+                            {"role_uuid": role_uuid, "permission_uuid": permission.uuid}
+                            for permission in new_permissions
+                        ]
+                        session.bulk_insert_mappings(RolePermission, role_permissions)
 
                 session.commit()
+                casbin_updated = False
+                
+                if permissions is not None:
+                    existing_permissions_dict = {p.uuid: p for p in existing_permissions}
+                    
+                    if permissions_to_remove:
+                        remove_policies = [
+                            [role_uuid, existing_permissions_dict[perm_id].resource, 
+                            existing_permissions_dict[perm_id].action, 
+                            existing_permissions_dict[perm_id].module]
+                            for perm_id in permissions_to_remove
+                        ]
+                        
+                        self.enforcer.remove_policies(remove_policies)
+                        casbin_updated = True
+
+
+                    if permissions_to_add:
+                        add_policies = [
+                            [role_uuid, p.resource, p.action, p.module]
+                            for p in new_permissions
+                        ]
+
+                        self.enforcer.add_policies(add_policies)
+                        casbin_updated = True
+
+                if casbin_updated:
+                    self.enforcer.save_policy()
 
-                # Refresh the role to get the updated permissions
                 session.refresh(role)
                 
-                # Return the updated role with permissions
                 return role
 
             except Exception as e:
                 raise e
+            
 
     def delete_role(self, role_uuid: str,exception_roles:List[str]=None):
         """Delete a role and its associated permissions"""

{abs_auth_rbac_core-0.3.4.dist-info → abs_auth_rbac_core-0.3.5.dist-info}/METADATA

@@ -1,16 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: abs-auth-rbac-core
-Version: 0.3.4
+Version: 0.3.5
 Summary: RBAC and Auth core utilities including JWT token management.
-License: MIT
+License-Expression: MIT
 Author: AutoBridgeSystems
 Author-email: info@autobridgesystems.com
 Requires-Python: >=3.11,<4.0
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: abs-exception-core (>=0.2.0,<0.3.0)
 Requires-Dist: abs-repository-core (>=0.3.0,<0.4.0)
 Requires-Dist: abs-utils (>=0.4.1,<0.5.0)

{abs_auth_rbac_core-0.3.4.dist-info → abs_auth_rbac_core-0.3.5.dist-info}/RECORD

@@ -17,7 +17,7 @@ abs_auth_rbac_core/models/user_role.py,sha256=20pqmtJPzlUrI9ulHGouk8XlFgrGG7I6ik
 abs_auth_rbac_core/rbac/__init__.py,sha256=oYjtpmfrkEbwWCBAWuRoU1fM4fCpBxkF_lwQrelK1As,79
 abs_auth_rbac_core/rbac/decorator.py,sha256=pEFAW0Nn2iE4KBctPhNOmO_VLeJFDX2V9v2LsCu6kHY,1824
 abs_auth_rbac_core/rbac/policy.conf,sha256=wghhhKxgZH0rPhh1QFrIpq9nevJT3s7OxxvXiU3zzuI,305
-abs_auth_rbac_core/rbac/service.py,sha256=0SY86djzDJ8QKt9uEaWkkN-AZX-szGK9v8HRyqRwilk,38447
+abs_auth_rbac_core/rbac/service.py,sha256=VtaEN1smrj7IhS6W9uoJNC2E6lGfHM-xxbcC0JqVz0o,38826
 abs_auth_rbac_core/repository/__init__.py,sha256=tuEdEV5HsePiaEg2Jrakf-QOR3evTeS-2Tq5VqbywyU,154
 abs_auth_rbac_core/repository/permission_repository.py,sha256=SQJyyErrrMnTnLJjhwZythPbYVGt5z0N5GJ5fV6Gvuo,541
 abs_auth_rbac_core/repository/role_repository.py,sha256=OEPpWIm_61rOljPEcejqXyOvowYDK8Uh5K_pvRLfb3Y,562
@@ -28,6 +28,6 @@ abs_auth_rbac_core/service/permission_service.py,sha256=tWasmKe0lr1QokmKzjD08O25
 abs_auth_rbac_core/service/role_service.py,sha256=Q68igKS-cArHaq-tqrjWPpptnrXYImRAEwKQep0ZOBQ,633
 abs_auth_rbac_core/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 abs_auth_rbac_core/util/permission_constants.py,sha256=EHM4ZkQmMWR-AyoSEf-pJL-EC_eZ4Q_JEp9w62GknHY,102747
-abs_auth_rbac_core-0.3.4.dist-info/METADATA,sha256=bXwUvNxw6j3RMLubiPw5LZQH-U36MAB19YBVolVSAJM,23643
-abs_auth_rbac_core-0.3.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-abs_auth_rbac_core-0.3.4.dist-info/RECORD,,
+abs_auth_rbac_core-0.3.5.dist-info/METADATA,sha256=-kCTAs13PzOFmqx26C3gG0GaIC-y_KvcDSA7Pi32qiQ,23654
+abs_auth_rbac_core-0.3.5.dist-info/WHEEL,sha256=M5asmiAlL6HEcOq52Yi5mmk9KmTVjY2RDPtO4p9DMrc,88
+abs_auth_rbac_core-0.3.5.dist-info/RECORD,,

{abs_auth_rbac_core-0.3.4.dist-info → abs_auth_rbac_core-0.3.5.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.2.0
 Root-Is-Purelib: true
 Tag: py3-none-any