opengater-globalauth-client 0.1.3__tar.gz → 0.1.5__tar.gz

{opengater_globalauth_client-0.1.3 → opengater_globalauth_client-0.1.5}/.idea/workspace.xml

@@ -83,7 +83,8 @@
       <workItem from="1769083463141" duration="612000" />
       <workItem from="1769150497374" duration="620000" />
       <workItem from="1769431218749" duration="1266000" />
-      <workItem from="1769441499505" duration="2333000" />
+      <workItem from="1769441499505" duration="3030000" />
+      <workItem from="1769700383611" duration="613000" />
     </task>
     <servers />
   </component>

{opengater_globalauth_client-0.1.3 → opengater_globalauth_client-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: opengater-globalauth-client
-Version: 0.1.3
+Version: 0.1.5
 Summary: Client library for GlobalAuth authentication service
 Project-URL: Homepage, https://github.com/opengater/globalauth-client
 Project-URL: Documentation, https://github.com/opengater/globalauth-client#readme

{opengater_globalauth_client-0.1.3 → opengater_globalauth_client-0.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "opengater-globalauth-client"
-version = "0.1.3"
+version = "0.1.5"
 description = "Client library for GlobalAuth authentication service"
 readme = "README.md"
 license = { text = "MIT" }

{opengater_globalauth_client-0.1.3 → opengater_globalauth_client-0.1.5}/src/opengater_globalauth_client/__init__.py

@@ -63,7 +63,7 @@ FastAPI integration:
     ```
 """
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"
 
 from opengater_globalauth_client.client import GlobalAuthClient
 from opengater_globalauth_client.models import (

{opengater_globalauth_client-0.1.3 → opengater_globalauth_client-0.1.5}/src/opengater_globalauth_client/fastapi/__init__.py

@@ -7,6 +7,7 @@ from opengater_globalauth_client.fastapi.dependencies import (
     get_current_user_optional,
     require_admin,
     require_verified,
+    get_token,
 )
 
 __all__ = [
@@ -16,4 +17,5 @@ __all__ = [
     "get_current_user_optional",
     "require_admin",
     "require_verified",
+    "get_token",
 ]

{opengater_globalauth_client-0.1.3 → opengater_globalauth_client-0.1.5}/src/opengater_globalauth_client/fastapi/dependencies.py

@@ -3,7 +3,8 @@ FastAPI dependencies for GlobalAuth.
 """
 from typing import Callable
 
-from fastapi import Request, HTTPException, Depends, Header
+from fastapi import Request, HTTPException, Depends
+from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 
 from opengater_globalauth_client.client import GlobalAuthClient
 from opengater_globalauth_client.models import User
@@ -16,6 +17,10 @@ from opengater_globalauth_client.exceptions import (
 )
 
 
+# Security scheme for Swagger UI
+_security = HTTPBearer(auto_error=False)
+
+
 def get_current_user(client: GlobalAuthClient | None = None) -> Callable:
     """
     Dependency factory for getting current authenticated user.
@@ -48,7 +53,7 @@ def get_current_user(client: GlobalAuthClient | None = None) -> Callable:
     """
     async def dependency(
         request: Request,
-        authorization: str | None = Header(None, alias="Authorization"),
+        credentials: HTTPAuthorizationCredentials | None = Depends(_security),
     ) -> User:
         # Try to get user from middleware first
         user = getattr(request.state, USER_STATE_KEY, None)
@@ -63,13 +68,13 @@ def get_current_user(client: GlobalAuthClient | None = None) -> Callable:
                 detail="Auth middleware not configured and no client provided"
             )
         
-        if not authorization or not authorization.startswith("Bearer "):
+        if not credentials:
             raise HTTPException(
                 status_code=401,
-                detail="Authorization header required"
+                detail="Authorization required"
             )
         
-        token = authorization[7:]
+        token = credentials.credentials
         
         try:
             return await client.introspect(token)
@@ -107,7 +112,7 @@ def get_current_user_optional(client: GlobalAuthClient | None = None) -> Callabl
     """
     async def dependency(
         request: Request,
-        authorization: str | None = Header(None, alias="Authorization"),
+        credentials: HTTPAuthorizationCredentials | None = Depends(_security),
     ) -> User | None:
         # Try to get user from middleware
         user = getattr(request.state, USER_STATE_KEY, None)
@@ -116,14 +121,14 @@ def get_current_user_optional(client: GlobalAuthClient | None = None) -> Callabl
             return user
         
         # No token - that's ok for optional auth
-        if not authorization or not authorization.startswith("Bearer "):
+        if not credentials:
             return None
         
         # Has token - validate it
         if client is None:
             return None
         
-        token = authorization[7:]
+        token = credentials.credentials
         
         try:
             return await client.introspect(token)
@@ -159,13 +164,12 @@ def require_admin(client: GlobalAuthClient | None = None) -> Callable:
             ...
         ```
     """
-    user_dependency = get_current_user(client)
-    
     async def dependency(
         request: Request,
-        authorization: str | None = Header(None, alias="Authorization"),
+        credentials: HTTPAuthorizationCredentials | None = Depends(_security),
     ) -> User:
-        user = await user_dependency(request, authorization)
+        user_dep = get_current_user(client)
+        user = await user_dep(request, credentials)
         
         if not user.is_admin:
             raise HTTPException(
@@ -192,13 +196,12 @@ def require_verified(client: GlobalAuthClient | None = None) -> Callable:
             ...
         ```
     """
-    user_dependency = get_current_user(client)
-    
     async def dependency(
         request: Request,
-        authorization: str | None = Header(None, alias="Authorization"),
+        credentials: HTTPAuthorizationCredentials | None = Depends(_security),
     ) -> User:
-        user = await user_dependency(request, authorization)
+        user_dep = get_current_user(client)
+        user = await user_dep(request, credentials)
         
         if not user.verified:
             raise HTTPException(
@@ -209,3 +212,28 @@ def require_verified(client: GlobalAuthClient | None = None) -> Callable:
         return user
     
     return dependency
+
+
+def get_token() -> Callable:
+    """
+    Simple dependency to get just the token string.
+    
+    Example:
+        ```python
+        @app.get("/something")
+        async def something(token: str = Depends(get_token())):
+            # Use raw token
+            ...
+        ```
+    """
+    async def dependency(
+        credentials: HTTPAuthorizationCredentials | None = Depends(_security),
+    ) -> str:
+        if not credentials:
+            raise HTTPException(
+                status_code=401,
+                detail="Authorization required"
+            )
+        return credentials.credentials
+    
+    return dependency