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

abs_auth_rbac_core/auth/middleware.py

@@ -1,4 +1,4 @@
-from fastapi import Depends
+from fastapi import Depends, Request
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 import logging
 from typing import Callable, Any
@@ -21,13 +21,12 @@ def auth_middleware(
     This middleware is used for authentication of the user.
     Args:
         db_session: Callable[...,Any]: Session of the SQLAlchemy database engine
-        Users: User table fo teh system
         jwt_secret_key: Secret key of the JWT for jwt functions
         jwt_algorithm: Algorithm used for JWT
 
     Returns:
     """
-    def get_auth(token: HTTPAuthorizationCredentials = Depends(security)):
+    async def get_auth(request: Request, token: HTTPAuthorizationCredentials = Depends(security)):
         jwt_functions = JWTFunctions(secret_key=jwt_secret_key,algorithm=jwt_algorithm)
         try:
             if not token or not token.credentials:
@@ -42,7 +41,9 @@ def auth_middleware(
                 logger.error(f"Authentication failed: User with id {uuid} not found")
                 raise UnauthorizedError(detail="Authentication failed")
 
-            return user  # Attach user for use in route
+            # Attach user to request state
+            request.state.user = user
+            return user  # Still return user for backward compatibility
 
         except Exception as e:
             logger.error(f"Authentication error: {str(e)}", exc_info=True)

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

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

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

@@ -2,7 +2,7 @@ abs_auth_rbac_core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 abs_auth_rbac_core/auth/__init__.py,sha256=Pvetd98VD9jsok1F9e82yS9kLZMFqTpbN51hkxZQHzw,67
 abs_auth_rbac_core/auth/auth_functions.py,sha256=fhfKRhtpE_J9MHu2jSsIA-cy77A3wCAQKbGGZeh4pe4,947
 abs_auth_rbac_core/auth/jwt_functions.py,sha256=9vhjWrxXdE8fVQ4FGrPj9y6PoSEsaeFohPhgI-3hToI,4111
-abs_auth_rbac_core/auth/middleware.py,sha256=1J0yE2aEgfMzTgkSz1Tz_8xs0Nl095k5S1wbygShkl0,1806
+abs_auth_rbac_core/auth/middleware.py,sha256=c1HY2UHNAflo7cqSPE-_zYP27T-CGhaACO3cOWED8Lc,1896
 abs_auth_rbac_core/models/__init__.py,sha256=HHnXZ1wIq6Us3MP9YywjHVeCViXD_zyMWl8mBglqFBc,231
 abs_auth_rbac_core/models/base_model.py,sha256=AaWObslm8sTetv4H1Ia_gPpi_75uF5z1o7Et9WAvstU,612
 abs_auth_rbac_core/models/gov_casbin_rule.py,sha256=uWkzOgtG0_8CXR4YLBz_JINA8apcB1D4aWiCgSkuTCs,789
@@ -14,12 +14,11 @@ abs_auth_rbac_core/models/seeder/permission_seeder.py,sha256=j-aUy8uLHnUWpMmw1Dq
 abs_auth_rbac_core/models/user.py,sha256=t_ardJOsfBiyedPg6Z4WywLiZRTPmAGYkMealZcEqJc,833
 abs_auth_rbac_core/models/user_role.py,sha256=20pqmtJPzlUrI9ulHGouk8XlFgrGG7I6ikctb8sMUGs,706
 abs_auth_rbac_core/rbac/__init__.py,sha256=oYjtpmfrkEbwWCBAWuRoU1fM4fCpBxkF_lwQrelK1As,79
-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=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.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,,
+abs_auth_rbac_core-0.1.3.dist-info/METADATA,sha256=TI0c8jITxxaCb6GFkrgPbYVmTPjr3T-97BKRavFOghw,6586
+abs_auth_rbac_core-0.1.3.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+abs_auth_rbac_core-0.1.3.dist-info/RECORD,,

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()