apexauthlib 0.1.3__tar.gz → 0.1.5__tar.gz

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

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

{apexauthlib-0.1.3 → apexauthlib-0.1.5}/apexauthlib/entities/auth.py

@@ -1,7 +1,9 @@
 from dataclasses import dataclass, field
-from typing import Any
+from typing import Any, Generic, TypeVar
 from uuid import uuid4
 
+ItemT = TypeVar("ItemT")
+
 
 @dataclass(frozen=True)
 class User:
@@ -33,3 +35,16 @@ class ServiceMetadata:
 class UserMetadata:
     service: str
     metadata: dict[str, Any]
+
+
+@dataclass(frozen=True)
+class Client:
+    client_id: str
+    hashed_secret: str
+
+
+@dataclass(frozen=True)
+class ServiceUserInfo(Generic[ItemT]):
+    user: User
+    is_superuser: bool
+    metadata: ItemT

{apexauthlib-0.1.3 → apexauthlib-0.1.5}/apexauthlib/fastapi/auth.py

@@ -7,10 +7,12 @@ from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from starlette import status
 
 from apexauthlib.entities import User
-from apexauthlib.integration.api import AuthApiProvider
+from apexauthlib.entities.auth import ServiceUserInfo
+from apexauthlib.integration.api import AuthApiProvider, AuthCodeApi
 
 auth_api = APIRouter(tags=["Auth"])
 AuthApiProviderDependable = Annotated[AuthApiProvider[Any], inject("auth")]
+AuthCodeApiDependable = Annotated[AuthCodeApi, inject("auth_code")]
 
 
 def oauth2() -> OAuth2PasswordBearer:
@@ -66,6 +68,21 @@ def get_user_with_metadata(
         )
 
 
+def get_user_with_full_metadata(
+    token: TokenDependable,
+    auth: AuthApiProviderDependable,
+) -> ServiceUserInfo[Any]:
+    try:
+        api = auth.for_token(token)
+        return api.full_metadata_for(api.user().id)
+    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
@@ -90,3 +107,23 @@ def login(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect username or password",
         )
+
+
+@auth_api.post(
+    "/login/code",
+    status_code=200,
+    response_model=TokenResponse,
+)
+def login_code(
+    code: str,
+    auth_code: AuthCodeApiDependable,
+) -> TokenResponse:
+    try:
+        return TokenResponse(
+            access_token=auth_code.token_for(code),
+        )
+    except Exception:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Incorrect username or password",
+        )

{apexauthlib-0.1.3 → apexauthlib-0.1.5}/apexauthlib/integration/api.py

@@ -1,14 +1,13 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-from typing import Any, Generic, Mapping, TypeVar
+from dataclasses import dataclass, field
+from typing import Any, Generic, Mapping
 
 from apexdevkit.formatter import DataclassFormatter, Formatter
 from apexdevkit.http import FluentHttp, JsonDict
 
 from apexauthlib.entities import User
-
-ItemT = TypeVar("ItemT")
+from apexauthlib.entities.auth import ItemT, ServiceUserInfo
 
 
 @dataclass(frozen=True)
@@ -48,6 +47,10 @@ class AuthApi(Generic[ItemT]):
     formatter: Formatter[Mapping[str, Any], ItemT]
     token: str
 
+    user_formatter: Formatter[Mapping[str, Any], User] = field(
+        default_factory=lambda: DataclassFormatter(User)
+    )
+
     def user(self) -> User:
         return DataclassFormatter(User).load(
             (
@@ -71,3 +74,47 @@ class AuthApi(Generic[ItemT]):
         )
 
         return self.formatter.load(JsonDict(result["data"]["metadata"]["metadata"]))
+
+    def full_metadata_for(self, user_id: str) -> ServiceUserInfo[ItemT]:
+        result = JsonDict(
+            (
+                self.http.with_header("Authorization", f"Bearer {self.token}")
+                .get()
+                .on_endpoint(f"/services/{self.service_name}/users/{user_id}")
+                .on_failure(raises=RuntimeError)
+                .json()
+            )
+        )["data"]["user"]
+
+        user = dict(result["user"])
+        user["hashed_password"] = "unknown"
+
+        return ServiceUserInfo[ItemT](
+            user=self.user_formatter.load(user),
+            is_superuser=bool(result["is_superuser"]),
+            metadata=self.formatter.load(result["metadata"]),
+        )
+
+
+@dataclass
+class AuthCodeApi:
+    http: FluentHttp
+    client_id: str
+    client_secret: str
+
+    def token_for(self, code: str) -> str:
+        data = {
+            "code": code,
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+        }
+
+        return str(
+            (
+                self.http.with_data(JsonDict(data))
+                .post()
+                .on_endpoint("/auth/oauth/token")
+                .on_failure(raises=RuntimeError)
+                .json()
+            )["access_token"]
+        )

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

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