abs-auth-rbac-core 0.1.0__tar.gz → 0.1.2__tar.gz

{abs_auth_rbac_core-0.1.0 → abs_auth_rbac_core-0.1.2}/PKG-INFO

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

{abs_auth_rbac_core-0.1.0 → abs_auth_rbac_core-0.1.2}/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 → abs_auth_rbac_core-0.1.2}/pyproject.toml

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

abs_auth_rbac_core-0.1.0/abs_auth_rbac_core/rbac/database.py

@@ -1,52 +0,0 @@
-from contextlib import AbstractContextManager, contextmanager
-from typing import Any, Generator
-from loguru import logger
-
-from sqlalchemy import create_engine, orm
-from sqlalchemy.orm import Session
-from abs_repository_core.models import BaseModel
-
-
-class Database:
-    def __init__(self, db_url: str) -> None:
-        """
-        Initialize the database engine and session factory
-        """
-        self._engine = create_engine(
-            db_url,
-            echo=False,
-            echo_pool=False,
-            pool_pre_ping=True,
-            pool_recycle=3600,
-            query_cache_size=0,
-        )
-        self._session_factory = orm.scoped_session(
-            orm.sessionmaker(
-                autocommit=False,
-                autoflush=False,
-                bind=self._engine,
-            ),
-        )
-
-    def create_database(self) -> None:
-        """
-        Create all the tables in the database
-        """
-        BaseModel.metadata.create_all(self._engine)
-
-    @contextmanager
-    def session(self) -> Generator[Any, Any, AbstractContextManager[Session]]:
-        """
-        Provides a database session for the request
-        """
-        session: Session = self._session_factory()
-        try:
-            yield session
-        except Exception as e:
-            session.rollback()
-            import traceback
-
-            logger.error(f"Exception: {e}\n{traceback.format_exc()}")
-            raise e
-        finally:
-            session.close()