ohmyapi 0.1.10__tar.gz → 0.1.11__tar.gz

{ohmyapi-0.1.10 → ohmyapi-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ohmyapi
-Version: 0.1.10
+Version: 0.1.11
 Summary: A Django-like but async web-framework based on FastAPI and TortoiseORM.
 License-Expression: MIT
 Keywords: fastapi,tortoise,orm,async,web-framework
@@ -158,7 +158,10 @@ from ohmyapi.db.exceptions import DoesNotExist
 
 from .models import Tournament
 
-router = APIRouter(prefix="/tournament")
+# Expose your app's routes via `router = fastapi.APIRouter`.
+# Use prefixes wisely to avoid cross-app namespace-collisions.
+# Tags improve the UX of the OpenAPI docs at /docs.
+router = APIRouter(prefix="/tournament", tags=['Tournament'])
 
 
 @router.get("/")

{ohmyapi-0.1.10 → ohmyapi-0.1.11}/README.md

@@ -126,7 +126,10 @@ from ohmyapi.db.exceptions import DoesNotExist
 
 from .models import Tournament
 
-router = APIRouter(prefix="/tournament")
+# Expose your app's routes via `router = fastapi.APIRouter`.
+# Use prefixes wisely to avoid cross-app namespace-collisions.
+# Tags improve the UX of the OpenAPI docs at /docs.
+router = APIRouter(prefix="/tournament", tags=['Tournament'])
 
 
 @router.get("/")

{ohmyapi-0.1.10 → ohmyapi-0.1.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ohmyapi"
-version = "0.1.10"
+version = "0.1.11"
 description = "A Django-like but async web-framework based on FastAPI and TortoiseORM."
 license = "MIT"
 keywords = ["fastapi", "tortoise", "orm", "async", "web-framework"]

{ohmyapi-0.1.10 → ohmyapi-0.1.11}/src/ohmyapi/builtin/auth/permissions.py

@@ -4,4 +4,5 @@ from .routes import (
     require_authenticated,
     require_admin,
     require_staff,
+    require_group,
 )

{ohmyapi-0.1.10 → ohmyapi-0.1.11}/src/ohmyapi/builtin/auth/routes.py

@@ -95,7 +95,7 @@ async def require_admin(current_user: User = Depends(get_current_user)) -> User:
 
 async def require_staff(current_user: User = Depends(get_current_user)) -> User:
     """Ensure the current user is a staff member."""
-    if not current_user.is_staff:
+    if not current_user.is_admin and not current_user.is_staff:
         raise HTTPException(403, "Staff privileges required")
     return current_user
 
@@ -152,17 +152,13 @@ async def refresh_token(refresh_token: str):
     return {"access_token": new_access, "token_type": "bearer"}
 
 
+@router.get("/introspect")
+async def introspect(token: Dict = Depends(get_token)):
+    return token
+
+
 @router.get("/me")
 async def me(user: User = Depends(get_current_user)):
     """Return the currently authenticated user."""
-    return {
-        "email": user.email,
-        "username": user.username,
-        "is_admin": user.is_admin,
-        "is_staff": user.is_staff,
-    }
-
+    return user
 
-@router.get("/introspect")
-async def introspect(token: Dict = Depends(get_token)):
-    return token

ohmyapi-0.1.11/src/ohmyapi/core/templates/app/routes.py.j2

@@ -0,0 +1,17 @@
+from ohmyapi.router import APIRouter
+
+from . import models
+
+# Expose your app's routes via `router = fastapi.APIRouter`.
+# Use prefixes wisely to avoid cross-app namespace-collisions.
+# Tags improve the UX of the OpenAPI docs at /docs.
+router = APIRouter(prefix="/{{ app_name }}", tags=[{{ app_name }}])
+
+
+@router.get("/")
+def hello_world():
+    return {
+        "project": "{{ project_name }}",
+        "app": "{{ app_name }}",
+    }
+

ohmyapi-0.1.10/src/ohmyapi/core/templates/app/routes.py.j2

@@ -1,13 +0,0 @@
-from ohmyapi.router import APIRouter
-from . import models
-
-router = APIRouter(prefix="/{{ app_name }}")
-
-
-@router.get("/")
-def ping():
-    return {
-        "project": "{{ project_name }}",
-        "app": "{{ app_name }}",
-    }
-