apexauthlib 0.1.1__tar.gz → 0.1.2__tar.gz

{apexauthlib-0.1.1 → apexauthlib-0.1.2}/PKG-INFO

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

apexauthlib-0.1.2/apexauthlib/entities/__init__.py

@@ -0,0 +1,3 @@
+from apexauthlib.entities.auth import Service, ServiceMetadata, User, UserMetadata
+
+__all__ = ["User", "Service", "UserMetadata", "ServiceMetadata"]

apexauthlib-0.1.2/apexauthlib/entities/auth.py

@@ -0,0 +1,35 @@
+from dataclasses import dataclass, field
+from typing import Any
+from uuid import uuid4
+
+
+@dataclass(frozen=True)
+class User:
+    username: str
+    hashed_password: str
+    first_name: str
+    last_name: str
+    email: str
+    phone_number: str
+
+    is_admin: bool
+
+    id: str = field(default_factory=lambda: str(uuid4()))
+
+
+@dataclass(frozen=True)
+class Service:
+    service: str
+    superuser: str
+
+
+@dataclass(frozen=True)
+class ServiceMetadata:
+    user_id: str
+    metadata: dict[str, Any]
+
+
+@dataclass(frozen=True)
+class UserMetadata:
+    service: str
+    metadata: dict[str, Any]

{apexauthlib-0.1.1 → apexauthlib-0.1.2}/apexauthlib/fastapi/auth.py

@@ -6,6 +6,7 @@ from fastapi import APIRouter, Depends, HTTPException
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from starlette import status
 
+from apexauthlib.entities import User
 from apexauthlib.integration.api import AuthApiProvider
 
 auth_api = APIRouter(tags=["Auth"])
@@ -22,10 +23,41 @@ TokenDependable = Annotated[str, Depends(oauth2())]
 def get_user(
     token: TokenDependable,
     auth: AuthApiProviderDependable,
+) -> User:
+    try:
+        api = auth.for_token(token)
+        return api.user()
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=str(e),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+
+def get_user_metadata(
+    token: TokenDependable,
+    auth: AuthApiProviderDependable,
 ) -> Any:
     try:
         api = auth.for_token(token)
-        return api.metadata_for(api.user())
+        return api.metadata_for(api.user().id)
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail=str(e),
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+
+def get_user_with_metadata(
+    token: TokenDependable,
+    auth: AuthApiProviderDependable,
+) -> tuple[User, Any]:
+    try:
+        api = auth.for_token(token)
+        user = api.user()
+        return user, api.metadata_for(api.user().id)
     except Exception as e:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,

{apexauthlib-0.1.1 → apexauthlib-0.1.2}/apexauthlib/integration/api.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Any, Generic, Mapping, TypeVar
 
-from apexdevkit.formatter import Formatter
+from apexdevkit.formatter import DataclassFormatter, Formatter
 from apexdevkit.http import FluentHttp, JsonDict
 
+from apexauthlib.entities import User
+
 ItemT = TypeVar("ItemT")
 
 
@@ -46,15 +48,15 @@ class AuthApi(Generic[ItemT]):
     formatter: Formatter[Mapping[str, Any], ItemT]
     token: str
 
-    def user(self) -> str:
-        return str(
+    def user(self) -> User:
+        return DataclassFormatter(User).load(
             (
                 self.http.with_header("Authorization", f"Bearer {self.token}")
                 .get()
                 .on_endpoint("/auth/user")
                 .on_failure(raises=RuntimeError)
                 .json()
-            )["id"]
+            )
         )
 
     def metadata_for(self, user_id: str) -> ItemT:

{apexauthlib-0.1.1 → apexauthlib-0.1.2}/pyproject.toml

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