abs-auth-rbac-core 0.3.4__tar.gz → 0.3.6__tar.gz

{abs_auth_rbac_core-0.3.4 → abs_auth_rbac_core-0.3.6}/PKG-INFO

@@ -1,16 +1,16 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: abs-auth-rbac-core
-Version: 0.3.4
+Version: 0.3.6
 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 → abs_auth_rbac_core-0.3.6}/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):
@@ -392,7 +392,7 @@ class RBACService:
             if not role:
                 raise NotFoundError(detail="Requested role does not exist")
                 
-            return role
+            return role    
 
     def update_role_permissions(
         self,
@@ -402,6 +402,7 @@ class RBACService:
         description: Optional[str] = None,
     ) -> Any:
         """Update role permissions by replacing all existing permissions with new ones"""
+
         with self.db() as session:
             try:
                 if not session.is_active:
@@ -438,49 +439,45 @@ class RBACService:
                         role.description = description
 
                 if permissions is not None:
-                    existing_permissions = role.permissions
-
-                    # 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
+                    # Remove ALL existing policies for this role from Casbin
+                    self.enforcer.remove_filtered_policy(0, str(role_uuid))
+                    
+                    # Delete existing role permissions from database
                     session.query(RolePermission).filter(
                         RolePermission.role_uuid == role_uuid
                     ).delete(synchronize_session=False)
 
-                if permissions:
-                    # Fetch all permissions in a single query
-                    permissions_objs = (
-                        session.query(Permission)
-                        .filter(Permission.uuid.in_(permissions))
-                        .all()
-                    )
-
-                    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"
+                    # Add new permissions if provided
+                    if permissions:
+                        # Fetch all permissions in a single query
+                        permissions_objs = (
+                            session.query(Permission)
+                            .filter(Permission.uuid.in_(permissions))
+                            .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)
-
-                    # Add Casbin policies
-                    policies = [
-                        [role_uuid, permission.resource, permission.action, permission.module]
-                        for permission in permissions_objs
-                    ]
-                    self.enforcer.add_policies(policies)
+                        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"
+                            )
+
+                        # 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)
+
+                        # Add new Casbin policies
+                        policies = [
+                            [role_uuid, permission.resource, permission.action, permission.module]
+                            for permission in permissions_objs
+                        ]
+                        self.enforcer.add_policies(policies)
+                    
+                    # Save all Casbin changes
                     self.enforcer.save_policy()
 
                 session.commit()

{abs_auth_rbac_core-0.3.4 → abs_auth_rbac_core-0.3.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "abs-auth-rbac-core"
-version = "0.3.4"
+version = "0.3.6"
 description = "RBAC and Auth core utilities including JWT token management."
 authors = [
     {name = "AutoBridgeSystems", email = "info@autobridgesystems.com"}