abs-auth-rbac-core 0.3.1__tar.gz → 0.3.3__tar.gz

{abs_auth_rbac_core-0.3.1 → abs_auth_rbac_core-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: abs-auth-rbac-core
-Version: 0.3.1
+Version: 0.3.3
 Summary: RBAC and Auth core utilities including JWT token management.
 License: MIT
 Author: AutoBridgeSystems
@@ -12,7 +12,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: abs-exception-core (>=0.2.0,<0.3.0)
-Requires-Dist: abs-utils (>=0.4.0,<0.5.0)
+Requires-Dist: abs-repository-core (>=0.3.0,<0.4.0)
+Requires-Dist: abs-utils (>=0.4.1,<0.5.0)
 Requires-Dist: casbin (>=1.41.0,<2.0.0)
 Requires-Dist: casbin-redis-watcher (>=1.3.0,<2.0.0)
 Requires-Dist: casbin-sqlalchemy-adapter (>=1.4.0,<2.0.0)

{abs_auth_rbac_core-0.3.1 → abs_auth_rbac_core-0.3.3}/abs_auth_rbac_core/auth/middleware.py

@@ -1,13 +1,38 @@
 from fastapi import Depends, Request
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
+from fastapi import HTTPException
 import logging
-from typing import Callable, Any
+from typing import Callable, Any, Optional
 
 from .jwt_functions import JWTFunctions
 from .auth_functions import get_user_by_attribute
-from abs_exception_core.exceptions import UnauthorizedError
+from abs_exception_core.exceptions import UnauthorizedError, AuthError
+from fastapi.security.utils import get_authorization_scheme_param
 
-security = HTTPBearer()
+class CustomHTTPBearer(HTTPBearer):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+    
+    async def __call__(self, request: Request) -> Optional[HTTPAuthorizationCredentials]:
+        authorization = request.headers.get("Authorization")
+        scheme, credentials = get_authorization_scheme_param(authorization)
+        
+        if not (authorization and scheme and credentials):
+            if self.auto_error:
+                raise UnauthorizedError(detail="Invalid authentication credentials")
+            else:
+                return None
+        
+        if scheme.lower() != "bearer":
+            if self.auto_error:
+                raise UnauthorizedError(detail="Invalid authentication credentials")
+            else:
+                return None
+        
+        return HTTPAuthorizationCredentials(scheme=scheme, credentials=credentials)
+
+security = CustomHTTPBearer()
+# security = HTTPBearer()
 logger = logging.getLogger(__name__)
 
 
@@ -45,7 +70,11 @@ def auth_middleware(
             request.state.user = user
             return user 
 
+        except UnauthorizedError as e:
+            logger.error(e)
+            raise
         except Exception as e:
             logger.error(f"Authentication error: {str(e)}", exc_info=True)
             raise UnauthorizedError(detail="Authentication failed")
+    
     return get_auth

abs_auth_rbac_core-0.3.3/abs_auth_rbac_core/repository/__init__.py

@@ -0,0 +1,4 @@
+from .role_repository import RoleRepository
+from .permission_repository import PermissionRepository
+
+__all__ = ["RoleRepository", "PermissionRepository"]

abs_auth_rbac_core-0.3.3/abs_auth_rbac_core/repository/permission_repository.py

@@ -0,0 +1,12 @@
+from typing import Any, List, Optional, Callable
+from sqlalchemy.orm import joinedload
+from contextlib import AbstractContextManager
+from sqlalchemy.orm import Session
+from abs_repository_core.repository.base_repository import BaseRepository
+from abs_repository_core.schemas.base_schema import FindBase, FindUniqueValues
+from abs_auth_rbac_core.models.permissions import Permission
+
+class PermissionRepository(BaseRepository):
+    def __init__(self, db: Callable[..., Session]):
+        self.db = db
+        super().__init__(db, Permission)

abs_auth_rbac_core-0.3.3/abs_auth_rbac_core/repository/role_repository.py

@@ -0,0 +1,18 @@
+from typing import Any, List, Optional, Callable
+from sqlalchemy.orm import joinedload
+from contextlib import AbstractContextManager
+from sqlalchemy.orm import Session
+from abs_repository_core.repository.base_repository import BaseRepository
+from abs_auth_rbac_core.models.roles import Role
+from abs_exception_core.exceptions import NotFoundError
+from abs_repository_core.schemas import FilterSchema, FindBase
+
+
+class RoleRepository(BaseRepository):
+    def __init__(self, db: Callable[..., Session]):
+        self.db = db
+        super().__init__(db, Role)
+
+
+
+

abs_auth_rbac_core-0.3.3/abs_auth_rbac_core/service/__init__.py

@@ -0,0 +1,4 @@
+from .role_service import RoleService
+from .permission_service import PermissionService
+
+__all__ = ["RoleService", "PermissionService"]

abs_auth_rbac_core-0.3.3/abs_auth_rbac_core/service/permission_service.py

@@ -0,0 +1,15 @@
+from typing import Any, List, Optional
+from abs_repository_core.services.base_service import BaseService
+from abs_repository_core.schemas.base_schema import FindBase, FindUniqueValues
+from abs_auth_rbac_core.models.roles import Role
+from abs_auth_rbac_core.repository.permission_repository import PermissionRepository
+from pydantic import BaseModel
+
+
+class PermissionService(BaseService):
+    def __init__(self, repository:PermissionRepository):
+        super().__init__(repository)
+        self.repository = repository
+        
+    def list_permissions(self, schema: FindBase, eager: bool = True):
+        return self.repository.read_by_options(schema, eager)

abs_auth_rbac_core-0.3.3/abs_auth_rbac_core/service/role_service.py

@@ -0,0 +1,18 @@
+from typing import Any, List, Optional
+from abs_repository_core.services.base_service import BaseService
+from abs_repository_core.schemas.base_schema import FindBase, FindUniqueValues
+from abs_auth_rbac_core.models.roles import Role
+from abs_auth_rbac_core.repository.role_repository import RoleRepository
+from pydantic import BaseModel
+
+
+class RoleService(BaseService):
+    def __init__(self, repository:RoleRepository):
+        self.repository = repository
+        super().__init__(repository)
+
+
+    def list_roles(self, schema: FindBase, eager: bool = True):
+        return self.repository.read_by_options(schema, eager)
+    
+    

{abs_auth_rbac_core-0.3.1 → abs_auth_rbac_core-0.3.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "abs-auth-rbac-core"
-version = "0.3.1"
+version = "0.3.3"
 description = "RBAC and Auth core utilities including JWT token management."
 authors = [
     {name = "AutoBridgeSystems", email = "info@autobridgesystems.com"}
@@ -18,7 +18,8 @@ dependencies = [
     "casbin-sqlalchemy-adapter (>=1.4.0,<2.0.0)",
     "psycopg2-binary (>=2.9.10,<3.0.0)",
     "casbin-redis-watcher (>=1.3.0,<2.0.0)",
-    "abs-utils (>=0.4.0,<0.5.0)"
+    "abs-utils (>=0.4.1,<0.5.0)",
+    "abs-repository-core (>=0.3.0,<0.4.0)"
 ]
 
 [build-system]