abs-auth-rbac-core 0.1.1__tar.gz → 0.1.3__tar.gz

{abs_auth_rbac_core-0.1.1 → abs_auth_rbac_core-0.1.3}/PKG-INFO

@@ -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 → abs_auth_rbac_core-0.1.3}/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 → abs_auth_rbac_core-0.1.3}/pyproject.toml

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

abs_auth_rbac_core-0.1.1/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()