ohmyapi 0.4.6__py3-none-any.whl → 0.4.7__py3-none-any.whl

ohmyapi/__init__.py

@@ -1 +1 @@
-__VERSION__ = "0.4.6"
+__VERSION__ = "0.4.7"

ohmyapi/builtin/auth/models.py

@@ -66,7 +66,7 @@ class User(Model):
         return pwd_context.verify(raw_password, self.password_hash)
 
     @classmethod
-    async def authenticate_username(cls, username: str, password: str) -> Optional["User"]:
+    async def authenticate(cls, username: str, password: str) -> Optional["User"]:
         """Authenticate a user by username and password."""
         user = await cls.filter(username=username).first()
         if user and user.verify_password(password):

ohmyapi/builtin/auth/routes.py

@@ -2,14 +2,16 @@ import time
 from enum import Enum
 from typing import Any, Dict, List, Optional
 
-import jwt
-import settings
-from fastapi import APIRouter, Body, Depends, Header, HTTPException, status
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from fastapi import APIRouter, Body, Depends, Header, HTTPException, Request, status
+from fastapi.security import OAuth2, OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from fastapi.security.utils import get_authorization_scheme_param
 from pydantic import BaseModel
 
 from ohmyapi.builtin.auth.models import Group, User
 
+import jwt
+import settings
+
 # Router
 router = APIRouter(prefix="/auth", tags=["Auth"])
 
@@ -23,12 +25,25 @@ REFRESH_TOKEN_EXPIRE_SECONDS = getattr(
     settings, "JWT_REFRESH_TOKEN_EXPIRE_SECONDS", 7 * 24 * 60 * 60
 )
 
+class OptionalOAuth2PasswordBearer(OAuth2):
+    def __init__(self, tokenUrl: str):
+        super().__init__(flows={"password": {"tokenUrl": tokenUrl}}, scheme_name="OAuth2PasswordBearer")
+
+    async def __call__(self, request: Request) -> Optional[str]:
+        authorization: str = request.headers.get("Authorization")
+        scheme, param = get_authorization_scheme_param(authorization)
+        if not authorization or scheme.lower() != "bearer":
+            # No token provided — just return None
+            return None
+        return param
+
+
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login")
+oauth2_optional_scheme = OptionalOAuth2PasswordBearer(tokenUrl="/auth/login")
 
 
 class ClaimsUser(BaseModel):
     username: str
-    email: str
     is_admin: bool
     is_staff: bool
 
@@ -70,7 +85,6 @@ def claims(token_type: TokenType, user: User, groups: List[Group] = []) -> Claim
         sub=str(user.id),
         user=ClaimsUser(
             username=user.username,
-            email=user.email,
             is_admin=user.is_admin,
             is_staff=user.is_staff,
         ),
@@ -124,7 +138,7 @@ async def get_current_user(token: str = Depends(oauth2_scheme)) -> User:
     return user
 
 
-async def maybe_authenticated(token: Optional[str] = Depends(oauth2_scheme)) -> Optional[User]:
+async def maybe_authenticated(token: Optional[str] = Depends(oauth2_optional_scheme)) -> Optional[User]:
     if token is None:
         return None
     return await get_current_user(token)

ohmyapi/core/runtime.py

@@ -40,6 +40,14 @@ class Project:
         if str(self.project_path) not in sys.path:
             sys.path.insert(0, str(self.project_path))
 
+        # Load settings.py
+        try:
+            self.settings = importlib.import_module("settings")
+        except Exception as e:
+            raise RuntimeError(
+                f"Failed to import project settings from {self.project_path}"
+            ) from e
+
         # Alias builtin apps as ohmyapi_<name>.
         # We need this, because Tortoise app-names may not include dots `.`.
         spec = importlib.util.find_spec("ohmyapi.builtin")
@@ -57,14 +65,6 @@ class Project:
                     except ModuleNotFoundError:
                         pass
 
-        # Load settings.py
-        try:
-            self.settings = importlib.import_module("settings")
-        except Exception as e:
-            raise RuntimeError(
-                f"Failed to import project settings from {self.project_path}"
-            ) from e
-
         # Load installed apps
         for app_name in getattr(self.settings, "INSTALLED_APPS", []):
             self._apps[app_name] = App(self, name=app_name)

{ohmyapi-0.4.6.dist-info → ohmyapi-0.4.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.4.6
+Version: 0.4.7
 Summary: Django-flavored scaffolding and management layer around FastAPI, Pydantic, TortoiseORM and Aerich migrations
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,pydantic,async,web-framework

{ohmyapi-0.4.6.dist-info → ohmyapi-0.4.7.dist-info}/RECORD

@@ -1,16 +1,16 @@
-ohmyapi/__init__.py,sha256=Aesb1aUp9E48itirzLhS0MUBd9wk-WqMgRtzjYBkOBE,22
+ohmyapi/__init__.py,sha256=3dsUOCvM16TDxvcoMYe1SuKxNaZ9jZXHay8N798iVaQ,22
 ohmyapi/__main__.py,sha256=wcCrL4PjG51r5wVKqJhcoJPTLfHW0wNbD31DrUN0MWI,28
 ohmyapi/builtin/auth/__init__.py,sha256=vOVCSJX8BALzs8h5ZW9507bjoscP37bncMjdMmBXcMM,42
-ohmyapi/builtin/auth/models.py,sha256=FJ-F7wY5tXBSZl5YZth6UzhBSFISVCZNc2gp2uKvmR0,2602
+ohmyapi/builtin/auth/models.py,sha256=GXYSSdNdKomlcY5jh8sjxXj7HY6FgttusQ9w73usyVA,2593
 ohmyapi/builtin/auth/permissions.py,sha256=jpfiGf7CA8ghy7wI5OBYBafpqDsqM0SQYliCOGh7ZjA,170
-ohmyapi/builtin/auth/routes.py,sha256=jBQ9kKXz00GRQ5nRgUehHy18JZHElI7ywAYIqKQ3oB8,6495
+ohmyapi/builtin/auth/routes.py,sha256=LKN79_rllymkObguR8ooS8JVZLBdH37TR2CnJ1fI4lA,7171
 ohmyapi/builtin/demo/__init__.py,sha256=44Yo3mYmlKSKEwVp6O9urr-C_3qDQzCYLMn6B9i6wew,29
 ohmyapi/builtin/demo/models.py,sha256=r06rfuhPJaI2fYsQ24L1JCOd67f2GQNfGnkgKAptOX8,1404
 ohmyapi/builtin/demo/routes.py,sha256=1VTlEttrez6Qnhrz_9sTA-emtfXem0s0BkPVcLvg3k0,1801
 ohmyapi/cli.py,sha256=iWP0vPkodC_Y3MenNs9AH8FR_d-XpoXliGtz4inWkR4,5114
 ohmyapi/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ohmyapi/core/logging.py,sha256=YHN-I2--WP1uXy4W3Q1aD1XLiG9-CrVWvyCYe8HsD9E,1094
-ohmyapi/core/runtime.py,sha256=sXIlbRAzTvDzfJNB1COk0CHaUUfc-Vflmx6cVVoLRRg,13822
+ohmyapi/core/runtime.py,sha256=n1OLGlPSks6V67MBX7ZTUuNneLRg_qAD2lVumHPZb3I,13822
 ohmyapi/core/scaffolding.py,sha256=EehJesfDBB8vcMvc_T351QYdyJuyMGBA__BpLT33oVA,3122
 ohmyapi/core/templates/app/__init__.py.j2,sha256=QwVIQVUGZVhdH1d4NrvL7NTsK4-T4cihzYs8UVX2dt4,43
 ohmyapi/core/templates/app/models.py.j2,sha256=_3w-vFJ5fgsmncsCv34k_wyCMF78jufbSSglns4gbb0,119
@@ -26,7 +26,7 @@ ohmyapi/db/model/__init__.py,sha256=k3StTNuKatpwZo_Z5JBFa-927eJrzibFE8U4SA82asc,
 ohmyapi/db/model/model.py,sha256=ui4g78c5xoS06Dj8Cdk7QgTjRnE68zKeL-AdmeYYPuQ,2776
 ohmyapi/middleware/cors.py,sha256=p8HlKsZLM6jKLEa2-q22cIEZUKawirMQB9ajfxaM4xw,818
 ohmyapi/router.py,sha256=5g0U59glu4hxxnIoTSFzb2S2offkOT3eE39aprzVxwo,83
-ohmyapi-0.4.6.dist-info/METADATA,sha256=lRL0YxhyfMpilWolAShQispky9aHL7Xbt1WVjbXd03U,2657
-ohmyapi-0.4.6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-ohmyapi-0.4.6.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
-ohmyapi-0.4.6.dist-info/RECORD,,
+ohmyapi-0.4.7.dist-info/METADATA,sha256=9DxryMIXrrCWLaGGOkehOcq3BaC1a8ea6-fVs1p2YLA,2657
+ohmyapi-0.4.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ohmyapi-0.4.7.dist-info/entry_points.txt,sha256=wb3lw8-meAlpiv1mqcQ3m25ukL7djagU_w89GkrC37k,43
+ohmyapi-0.4.7.dist-info/RECORD,,