From c4cef109094b64b56b0c91e873ce6aa2a5289573 Mon Sep 17 00:00:00 2001 From: Rudi Date: Wed, 23 Sep 2026 23:07:35 +0200 Subject: [PATCH] Base Website Basic Website, mit Login, Homepage, Usericon, Profilsettings, adminsettings. (KI) --- auth/dependencies.py | 9 +++ main.py | 60 ++++++++++++++-- templates/admin.html | 154 +++++++++++++++++++++++++++++++++++++++++ templates/base.html | 34 +++++++-- templates/index.html | 17 +++-- templates/login.html | 65 +++++++++++++++++ templates/navbar.html | 26 +++++++ templates/profile.html | 73 +++++++++++++++++++ 8 files changed, 424 insertions(+), 14 deletions(-) create mode 100644 templates/admin.html create mode 100644 templates/login.html create mode 100644 templates/navbar.html create mode 100644 templates/profile.html diff --git a/auth/dependencies.py b/auth/dependencies.py index ec55db5..e3e1cf4 100644 --- a/auth/dependencies.py +++ b/auth/dependencies.py @@ -31,3 +31,12 @@ def get_me(request: Request, db: Session = Depends(get_db)) -> User: raise UnauthorizedError("Token invalid or expired") return user + +def get_current_user_optional(request: Request, db: Session = Depends(get_db)) -> User | None: + """ + Same as get_me, but without error + """ + try: + return get_me(request, db) + except UnauthorizedError: + return None diff --git a/main.py b/main.py index 9451a58..678d273 100644 --- a/main.py +++ b/main.py @@ -1,9 +1,11 @@ # @/main.py -from fastapi import FastAPI, Request, status -from fastapi.responses import JSONResponse +from fastapi import FastAPI, Request, status, Depends +from fastapi.responses import JSONResponse, RedirectResponse from fastapi.templating import Jinja2Templates from exceptions import UserNotFoundError, UserAlreadyExistsError, UnauthorizedError, ForbiddenError, ValidationError #Errors +from auth.dependencies import get_current_user_optional +from database import get_db import models #Database from routers import api_router #API @@ -13,6 +15,17 @@ app.include_router(api_router) templates = Jinja2Templates(directory="templates") +def _safe_next(path: str) -> str: + """ + Lässt als Redirect-Ziel nur relative, interne Pfade zu. + Ohne diese Prüfung wäre /login?next=https://evil.example ein offener + Redirect (Phishing: Login bei uns, Weiterleitung auf fremde Seite). + """ + if path.startswith("/") and not path.startswith("//") and "://" not in path: + return path + return "/" + + ######### ERROR handling ######### # 1. Globale Regel für 404 @@ -54,8 +67,47 @@ def permissions_handler(request: Request, exc: ValidationError): ) +######### PAGES ######### + +@app.get("/login") +async def login_page(request: Request, next: str = "/", db: Session = Depends(get_db)): + # Schon eingeloggt? Dann /login gar nicht erst anzeigen. + user = get_current_user_optional(request, db) + if user is not None: + return RedirectResponse(url=_safe_next(next), status_code=status.HTTP_302_FOUND) + return templates.TemplateResponse(request=request, name="login.html") + +@app.get("/logout") +async def logout(): + response = RedirectResponse(url="/login", status_code=status.HTTP_302_FOUND) + response.delete_cookie("access_token") + return response @app.get("/") -async def home(request: Request): - return templates.TemplateResponse(request=request, name="index.html") +async def home(request: Request, db: Session = Depends(get_db)): + user = get_current_user_optional(request, db) + if user is None: + return RedirectResponse(url="/login?next=/", status_code=status.HTTP_302_FOUND) + return templates.TemplateResponse(request=request, name="index.html", context={"user": user}) + + + +@app.get("/profile") +async def profile_page(request: Request, db: Session = Depends(get_db)): + user = get_current_user_optional(request, db) + if user is None: + return RedirectResponse(url="/login?next=/profile", status_code=status.HTTP_302_FOUND) + return templates.TemplateResponse(request=request, name="profile.html", context={"user": user}) + + +@app.get("/admin") +async def admin_page(request: Request, db: Session = Depends(get_db)): + user = get_current_user_optional(request, db) + if user is None: + return RedirectResponse(url="/login?next=/admin", status_code=status.HTTP_302_FOUND) + if user.role != "admin": + # Kein 403 auf Seitenebene - einfach zurück zur Startseite. + # Der eigentliche Schutz sitzt ohnehin serverseitig in den /api/users-Endpunkten. + return RedirectResponse(url="/", status_code=status.HTTP_302_FOUND) + return templates.TemplateResponse(request=request, name="admin.html", context={"user": user}) diff --git a/templates/admin.html b/templates/admin.html new file mode 100644 index 0000000..c516a08 --- /dev/null +++ b/templates/admin.html @@ -0,0 +1,154 @@ +{% extends "base.html" %} +{% block title %}Admin – Tandur{% endblock %} +{% block content %} +{% include "navbar.html" %} + +
+
+

Benutzer

+ +
+ + + +
+ + + + + + + + + + + + + + +
E-MailRolle
Keine Benutzer vorhanden.
+
+ + + +
+ + +{% endblock %} diff --git a/templates/base.html b/templates/base.html index 0004e12..171f65d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,15 +2,39 @@ - Shoppingliste + + {% block title %}Tandur{% endblock %} + + + + + + + {% block head %}{% endblock %} - -
- {% block content %}{% endblock %} -
+ + {% block content %}{% endblock %} diff --git a/templates/index.html b/templates/index.html index e50825b..81fe617 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,8 +1,15 @@ {% extends "base.html" %} - +{% block title %}Tandur{% endblock %} {% block content %} -
-

-

Das Grundgerüst steht!

-
+{% include "navbar.html" %} + +
+

Einkaufsliste

+

Angemeldet als {{ user.email }}

+ + +
{% endblock %} diff --git a/templates/login.html b/templates/login.html new file mode 100644 index 0000000..eb22053 --- /dev/null +++ b/templates/login.html @@ -0,0 +1,65 @@ +{% extends "base.html" %} +{% block title %}Anmelden – Tandur{% endblock %} +{% block content %} +
+
+

Tandur

+

Melde dich an, um deine Einkaufsliste zu sehen.

+ +
+
+ + +
+
+ + +
+ + + + +
+
+
+ + +{% endblock %} diff --git a/templates/navbar.html b/templates/navbar.html new file mode 100644 index 0000000..5d91730 --- /dev/null +++ b/templates/navbar.html @@ -0,0 +1,26 @@ +
+
+ Tandur + +
+ + + +
+
+
diff --git a/templates/profile.html b/templates/profile.html new file mode 100644 index 0000000..78f0037 --- /dev/null +++ b/templates/profile.html @@ -0,0 +1,73 @@ +{% extends "base.html" %} +{% block title %}Profil – Tandur{% endblock %} +{% block content %} +{% include "navbar.html" %} + +
+

Profil

+ +
+
+ + +
+
+ + +
+
Rolle: {{ user.role }}
+ + + + +
+
+ + +{% endblock %}