Add shopping cart and related models
This commit is contained in:
@@ -10,8 +10,7 @@ templates = get_jinja_renderer()
|
||||
|
||||
|
||||
@root_router.get("/")
|
||||
async def landing_page(request: Request, user_info: UserDep, session: SessionDep):
|
||||
user = ensure_user(user_info, session)
|
||||
async def landing_page(request: Request, user: UserDep, session: SessionDep):
|
||||
print(f"User {user.username} ({user.display_name}) accessed landing page")
|
||||
transactions = []
|
||||
for account in user.accounts:
|
||||
|
||||
@@ -4,22 +4,8 @@ from typing import Annotated
|
||||
from fastapi import Depends, HTTPException, Request
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from allmende_payment_system.database import SessionLocal
|
||||
|
||||
|
||||
async def get_user(request: Request) -> dict:
|
||||
|
||||
if username := os.environ.get("APS_username", None):
|
||||
return {
|
||||
"username": username,
|
||||
"display_name": os.environ.get("APS_display_name", "Missing Display Name"),
|
||||
}
|
||||
if "ynh_user" not in request.headers:
|
||||
raise HTTPException(status_code=401, detail="Missing ynh_user header")
|
||||
return {"username": request.headers["ynh_user"]}
|
||||
|
||||
|
||||
UserDep = Annotated[dict, Depends(get_user)]
|
||||
from allmende_payment_system.database import SessionLocal, ensure_user
|
||||
from allmende_payment_system.models import User
|
||||
|
||||
|
||||
def get_session() -> Session:
|
||||
@@ -31,3 +17,27 @@ def get_session() -> Session:
|
||||
|
||||
|
||||
SessionDep = Annotated[Session, Depends(get_session)]
|
||||
|
||||
|
||||
async def get_user(request: Request) -> dict:
|
||||
|
||||
if username := os.environ.get("APS_username", None):
|
||||
return {
|
||||
"username": username,
|
||||
"display_name": os.environ.get("APS_display_name", "Missing Display Name"),
|
||||
}
|
||||
if "ynh_user" not in request.headers:
|
||||
raise HTTPException(status_code=401, detail="Missing ynh_user header")
|
||||
|
||||
return {"username": request.headers["ynh_user"]}
|
||||
|
||||
|
||||
async def get_user_object(request: Request, session: SessionDep) -> User:
|
||||
|
||||
user_info = await get_user(request)
|
||||
user = ensure_user(user_info, session)
|
||||
request.state.user = user
|
||||
return user
|
||||
|
||||
|
||||
UserDep = Annotated[dict, Depends(get_user_object)]
|
||||
|
||||
Reference in New Issue
Block a user