apexauthlib 0.1.6__tar.gz → 0.1.8__tar.gz

{apexauthlib-0.1.6 → apexauthlib-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apexauthlib
-Version: 0.1.6
+Version: 0.1.8
 Summary: Apex authorization library for services
 Author: Apex Dev
 Author-email: dev@apex.ge

{apexauthlib-0.1.6 → apexauthlib-0.1.8}/apexauthlib/fastapi/auth.py

@@ -83,6 +83,21 @@ def get_user_with_full_metadata(
         )
 
 
+def get_user_and_service_users(
+    token: TokenDependable,
+    auth: AuthApiProviderDependable,
+) -> tuple[ServiceUserInfo[Any], list[ServiceUserInfo[Any]]]:
+    try:
+        api = auth.for_token(token)
+        return api.full_metadata_for(api.user().id), list(api.users_for_service())
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=str(e),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+
 @dataclass
 class TokenResponse:
     access_token: str

{apexauthlib-0.1.6 → apexauthlib-0.1.8}/apexauthlib/integration/api.py

@@ -96,17 +96,19 @@ class AuthApi(Generic[ItemT]):
         )
 
     def users_for_service(self) -> Iterable[ServiceUserInfo[ItemT]]:
-        result = JsonDict(
-            (
-                self.http.with_header("Authorization", f"Bearer {self.token}")
-                .get()
-                .on_endpoint(f"/services/{self.service_name}/users")
-                .on_failure(raises=RuntimeError)
-                .json()
-            )
-        )["data"]["users"]
+        result = list(
+            JsonDict(
+                (
+                    self.http.with_header("Authorization", f"Bearer {self.token}")
+                    .get()
+                    .on_endpoint(f"/services/{self.service_name}/users")
+                    .on_failure(raises=RuntimeError)
+                    .json()
+                )
+            )["data"]["users"]
+        )
 
-        for raw_user in result["users"]:
+        for raw_user in result:
             user = dict(raw_user["user"])
             user["hashed_password"] = "unknown"
 

{apexauthlib-0.1.6 → apexauthlib-0.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "apexauthlib"
-version = "0.1.6"
+version = "0.1.8"
 description = "Apex authorization library for services"
 authors = [{ name = "Apex Dev", email = "dev@apex.ge" }]
 readme = "README.md"