abs-auth-rbac-core 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

abs_auth_rbac_core/rbac/service.py

@@ -275,46 +275,32 @@ class RBACService:
                 if not session.is_active:
                     session.begin()
 
-                role = self.get_role(role_uuid,session)
+                # Get role with permissions eagerly loaded
+                role = (
+                    session.query(Role)
+                    .options(joinedload(Role.permissions))
+                    .filter(Role.uuid == role_uuid)
+                    .first()
+                )
+                if not role:
+                    raise NotFoundError(detail="Requested role does not exist")
 
                 if exception_roles and len(exception_roles) > 0 and role.name in exception_roles:
                     raise PermissionDeniedError(detail="You are not allowed to delete the requested role.")
-                
-                # Get role name for Casbin policy removal
-                role_name = role.name
-
-                # Delete role permissions
-                role_permissions = (
-                    session.query(RolePermission)
-                    .filter(RolePermission.role_uuid == role_uuid)
-                    .all()
-                )
-
-                # Remove Casbin policies for each permission
-                remove_policies =[]
-                for role_permission in role_permissions:
-                    permission = (
-                        session.query(Permission)
-                        .filter(Permission.uuid == role_permission.permission_uuid)
-                        .first()
-                    )
-                    if permission:
-                        remove_policies.append(
-                            (role_name, permission.resource, permission.action, permission.module)
-                        )
 
-                self.enforcer.remove_policies(remove_policies)
-                self.enforcer.save_policy()
+                # Collect all policies to remove from the eagerly loaded permissions
+                remove_policies = [
+                    [role.name, permission.resource, permission.action, permission.module]
+                    for permission in role.permissions
+                ]
                 
-                # Delete role permissions
-                session.query(RolePermission).filter(
-                    RolePermission.role_uuid == role_uuid
-                ).delete()
+                # Remove all policies at once
+                if remove_policies:
 
-                # Delete user role assignments
-                session.query(UserRole).filter(UserRole.role_uuid == role_uuid).delete()
+                    self.enforcer.remove_policies(remove_policies)
+                    self.enforcer.save_policy()
 
-                # Delete role
+                # Delete role (cascade will handle role_permissions and user_roles)
                 session.delete(role)
                 session.commit()
 
@@ -363,6 +349,7 @@ class RBACService:
                             "name": permission.name,
                             "resource": permission.resource,
                             "action": permission.action,
+                            "module": permission.module
                         }
                     )
 

{abs_auth_rbac_core-0.1.0.dist-info → abs_auth_rbac_core-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: abs-auth-rbac-core
-Version: 0.1.0
+Version: 0.1.1
 Summary: RBAC and Auth core utilities including JWT token management.
 License: MIT
 Author: AutoBridgeSystems

{abs_auth_rbac_core-0.1.0.dist-info → abs_auth_rbac_core-0.1.1.dist-info}/RECORD

@@ -17,9 +17,9 @@ abs_auth_rbac_core/rbac/__init__.py,sha256=oYjtpmfrkEbwWCBAWuRoU1fM4fCpBxkF_lwQr
 abs_auth_rbac_core/rbac/database.py,sha256=4lxs3gDIMq4pnor8oHN51UImp9Ad-6_HiIdPiLI-LGc,1475
 abs_auth_rbac_core/rbac/decorator.py,sha256=y1TJqVQLWJeMqj7PxYqlAQZ5sOj1hZv9AvChGspl8A0,1794
 abs_auth_rbac_core/rbac/policy.conf,sha256=wghhhKxgZH0rPhh1QFrIpq9nevJT3s7OxxvXiU3zzuI,305
-abs_auth_rbac_core/rbac/service.py,sha256=c7n7PIhs5EDPVvjjPc3gsgTFej8WFlmWuYBQiptJNY8,25645
+abs_auth_rbac_core/rbac/service.py,sha256=C0LTqnyecePrLSh2bAAhO9xcwZ_UAfi4CREczgcQNWc,25206
 abs_auth_rbac_core/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 abs_auth_rbac_core/util/permission_constants.py,sha256=JFavEKkAJ5mtltttCwRTTtpRlu_mJiVPB_MwsP-bIAg,65337
-abs_auth_rbac_core-0.1.0.dist-info/METADATA,sha256=xnNkKtEVVrL39TehlfrKK4CLn_1AVia6BBAGITHrws8,6586
-abs_auth_rbac_core-0.1.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-abs_auth_rbac_core-0.1.0.dist-info/RECORD,,
+abs_auth_rbac_core-0.1.1.dist-info/METADATA,sha256=-rvnH3oBo96pOgFsJ-KJkQZz_2lO5mRAvBQNFU_dSPw,6586
+abs_auth_rbac_core-0.1.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+abs_auth_rbac_core-0.1.1.dist-info/RECORD,,