nlbone 0.3.0__tar.gz → 0.3.1__tar.gz

{nlbone-0.3.0 → nlbone-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nlbone
-Version: 0.3.0
+Version: 0.3.1
 Summary: Backbone package for interfaces and infrastructure in Python projects
 Author-email: Amir Hosein Kahkbazzadeh <a.khakbazzadeh@gmail.com>
 License: MIT

{nlbone-0.3.0 → nlbone-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nlbone"
-version = "0.3.0"
+version = "0.3.1"
 description = "Backbone package for interfaces and infrastructure in Python projects"
 readme = "README.md"
 requires-python = ">=3.10"

{nlbone-0.3.0 → nlbone-0.3.1}/src/nlbone/adapters/auth/keycloak.py

@@ -43,15 +43,23 @@ class KeycloakAuthService(AuthService):
             print(f"Failed to get client token: {e}")
             return None
 
-    def is_client_token(self, token: str, allowed_clients: set[str] | None = None) -> bool:
+    def get_client_id(self, token: str):
         data = self.verify_token(token)
         if not data:
-            return False
+            return None
 
-        is_service_account = bool(data.get("username").startswith('service-account-'))
+        is_service_account = bool(data.get("username").startswith("service-account-"))
         client_id = data.get("client_id")
 
         if not is_service_account or not client_id:
+            return None
+
+        return client_id
+
+    def is_client_token(self, token: str, allowed_clients: set[str] | None = None) -> bool:
+        client_id = self.get_client_id(token)
+
+        if not client_id:
             return False
 
         if allowed_clients is not None and client_id not in allowed_clients:
@@ -62,4 +70,4 @@ class KeycloakAuthService(AuthService):
     def client_has_access(self, token: str, permissions: list[str], allowed_clients: set[str] | None = None) -> bool:
         if not self.is_client_token(token, allowed_clients):
             return False
-        return self.has_access(token, permissions)
+        return self.has_access(token, permissions)

{nlbone-0.3.0 → nlbone-0.3.1}/src/nlbone/interfaces/api/dependencies/auth.py

@@ -5,6 +5,20 @@ from nlbone.interfaces.api.exceptions import ForbiddenException, UnauthorizedExc
 from nlbone.utils.context import current_request
 
 
+def current_user_id() -> int:
+    user_id = current_request().state.user_id
+    if user_id is not None:
+        return int(user_id)
+    raise UnauthorizedException()
+
+
+def current_client_id() -> str:
+    request = current_request()
+    if client_id := KeycloakAuthService().get_client_id(request.state.token):
+        return str(client_id)
+    raise UnauthorizedException()
+
+
 def client_has_access(*, permissions=None):
     def decorator(func):
         @functools.wraps(func)
@@ -19,12 +33,10 @@ def client_has_access(*, permissions=None):
     return decorator
 
 
-
 def user_authenticated(func):
     @functools.wraps(func)
     async def wrapper(*args, **kwargs):
-        request = current_request()
-        if not request.state.user_id:
+        if not current_user_id():
             raise UnauthorizedException()
         return await func(*args, **kwargs)
 
@@ -36,7 +48,7 @@ def has_access(*, permissions=None):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
             request = current_request()
-            if not request.state.user_id:
+            if not current_user_id():
                 raise UnauthorizedException()
             if not KeycloakAuthService().has_access(request.state.token, permissions=permissions):
                 raise ForbiddenException(f"Forbidden {permissions}")
@@ -44,5 +56,4 @@ def has_access(*, permissions=None):
             return func(*args, **kwargs)
 
         return wrapper
-    return decorator
-
+    return decorator