53 Commits
Author SHA1 Message Date
Rudi ea86fd75ec Final merging to main
Docker Build & Push / build-and-push (push) Successful in 35s
2026-09-03 17:49:29 +02:00
Rudi 650a11231a Somw changes 2026-09-03 17:49:18 +02:00
Rudi e543c60ed5 last visual fixes 2026-09-03 17:38:58 +02:00
Rudi 799cc9597c Zeilen Falsch
Docker Build & Push / build-and-push (push) Successful in 35s
2026-09-03 17:36:40 +02:00
Rudi a6f1c0e967 fix: repo to Lower 2026-09-03 17:35:28 +02:00
Rudi 26bb103535 some description
Docker Build & Push / build-and-push (push) Failing after 26s
2026-09-03 17:22:18 +02:00
Rudi 756799feb6 fix 'toLower' not implemented 2026-09-03 17:21:25 +02:00
Rudi 2db0cc3ecb fix with uppercase repo name
Docker Build & Push / build-and-push (push) Failing after 29s
2026-09-03 17:17:29 +02:00
Rudi 0a950cefe2 Workflow update
Docker Build & Push / build-and-push (push) Successful in 2m30s
2026-09-03 17:03:27 +02:00
Rudi 51c024edde pürerelease fix N°2
Docker Build & Push / build (push) Successful in 28s
Docker Build & Push / release (push) Successful in 9s
2026-08-28 21:10:35 +02:00
Rudi af3b084ee9 prerelease fix
Docker Build & Push / build (push) Successful in 30s
Docker Build & Push / release (push) Successful in 10s
2026-08-28 21:05:58 +02:00
Rudi bef5493dc1 YAML fix
Docker Build & Push / build (push) Successful in 29s
Docker Build & Push / release (push) Successful in 11s
2026-08-28 21:02:22 +02:00
Rudi 6a3488eb41 Some description 2026-08-28 21:00:04 +02:00
Rudi 48733ff07c added example docker-compose.yaml 2026-08-28 20:55:47 +02:00
Rudi fd8f8c5067 remove the workflow_dispatcher 2026-08-28 20:49:56 +02:00
Rudi 4e1183214f update of gitea release action
Docker Build & Push / build (push) Successful in 36s
Docker Build & Push / release (push) Successful in 13s
2026-08-28 20:48:32 +02:00
Rudi a55d48c48e Build and pull seperated
Docker Build & Push / build (push) Successful in 31s
Docker Build & Push / release (push) Failing after 11s
2026-08-28 20:40:48 +02:00
Rudi 7e989f1408 Change URL to global URL 2026-08-28 20:39:00 +02:00
rudi 71fa841085 Merge pull request 'fix: needs: build' (#18) from workflow into main
Reviewed-on: #18
2026-08-28 18:35:03 +00:00
Rudi d10473eaca fix: needs: build 2026-08-28 20:34:45 +02:00
rudi 1350c2b638 Merge pull request 'do a release' (#17) from workflow into main
Docker Build & Push / build (push) Successful in 31s
Docker Build & Push / release (push) Canceled after 0s
Reviewed-on: #17
2026-08-28 18:23:07 +00:00
Rudi 824c515fc1 do a release 2026-08-28 20:22:31 +02:00
rudi 65fc741c06 Merge pull request 'Workflow' (#16) from workflow into main
Reviewed-on: #16
2026-08-28 17:19:18 +00:00
Rudi 15d6959468 Kein Plan was das jetzt bringen soll 2026-08-28 19:19:00 +02:00
Rudi ea0e8fb831 workflows only on tag pushes 2026-08-28 19:15:39 +02:00
rudi ea5e7d80a1 Merge pull request 'Das wird niemals funktionieren, weil das Gemini gemacht hat' (#15) from workflow into main
Docker Build & Push / build (push) Failing after 32s
Reviewed-on: #15
2026-08-28 17:12:27 +00:00
Rudi e12af3a0fa Das wird niemals funktionieren, weil das Gemini gemacht hat 2026-08-28 19:11:52 +02:00
rudi f2fa4d0062 Merge pull request 'Workflow' (#14) from workflow into main
Docker Build & Push / build (push) Failing after 1m7s
Reviewed-on: #14
2026-08-28 17:06:32 +00:00
Rudi 9a925e43b7 requironments 2026-08-28 19:06:03 +02:00
Rudi cfc5c13f16 version trackling 2026-08-28 18:58:45 +02:00
rudi de0a9af376 Merge pull request 'So unnötig, wer hat das programmiert' (#13) from workflow into main
Docker Build & Push / build (push) Failing after 1m19s
Reviewed-on: #13
2026-08-28 16:53:17 +00:00
Rudi 3114b6d1e1 So unnötig, wer hat das programmiert
repo in lowercase, dümmste erfindung
2026-08-28 18:52:34 +02:00
rudi e82d3338ea Merge pull request 'secrets.token' (#12) from workflow into main
Docker Build & Push / build (push) Failing after 25s
Reviewed-on: #12
2026-08-28 16:50:55 +00:00
Rudi 09fee968b3 secrets.token 2026-08-28 18:50:36 +02:00
rudi b1739d7504 Merge pull request 'AI fix for 'unauthorized'' (#11) from workflow into main
Docker Build & Push / build (push) Failing after 17s
Reviewed-on: #11
2026-08-28 16:38:56 +00:00
Rudi ec80bda242 AI fix for 'unauthorized' 2026-08-28 18:38:24 +02:00
rudi c9c77945f6 Merge pull request 'changed url to localhost' (#10) from workflow into main
Docker Build & Push / build (push) Failing after 17s
Reviewed-on: #10
2026-08-28 16:36:11 +00:00
Rudi 6a29b05320 changed url to localhost 2026-08-28 18:35:40 +02:00
rudi ff43d4a688 Merge pull request 'Added workflow dispatch' (#9) from workflow into main
Docker Build & Push / build (push) Failing after 19m21s
Reviewed-on: #9
2026-08-28 14:55:22 +00:00
Rudi 0c9cc5ccd4 Added workflow dispatch 2026-08-28 16:54:48 +02:00
rudi a9a04e099f Merge pull request 'added dockerignore' (#8) from workflow into main
Docker Build & Push / build (push) Canceled after 13m34s
Reviewed-on: #8
2026-08-28 14:34:58 +00:00
Rudi 108ba31a1a added dockerignore 2026-08-28 16:34:38 +02:00
rudi e9d399b10c Merge pull request 'Workflow' (#7) from workflow into main
Docker Build & Push / build (push) Canceled after 0s
Reviewed-on: #7
2026-08-28 14:25:03 +00:00
Rudi 1bed9cd5f8 Update of requironments and dockerfile 2026-08-28 16:24:27 +02:00
Rudi 3e0f13e49f Workflow AI 2026-08-28 16:01:04 +02:00
rudi 28d9c471a5 Merge pull request 'Workflow' (#6) from workflow into main
Build and Push Docker Image / build-and-push (push) Canceled after 20m43s
Reviewed-on: #6
2026-08-28 13:45:39 +00:00
Rudi a2c1477a09 Workflow file by AI 2026-08-28 15:44:50 +02:00
Rudi a36749d788 API Users wit Cookies
Sorry for the wrong branch
2026-08-28 15:39:59 +02:00
rudi ad678df2ce Merge pull request 'Readme' (#5) from readme into main
Reviewed-on: #5
2026-08-22 22:49:43 +00:00
rudi 8b70ed1550 last fix 2026-08-22 22:49:29 +00:00
rudi 05128b5156 Fix: Danger 2026-08-22 22:43:20 +00:00
rudi 8e8e03d4e0 Unstable Warning
Warnung, dass das Repo unter Entwicklung ist
2026-08-22 22:40:55 +00:00
rudi ca6c31b91d Merge pull request 'Added 'Ablauf' and 'Installation'' (#4) from readme into main
Reviewed-on: #4
2026-08-22 22:37:20 +00:00
23 changed files with 633 additions and 12 deletions

No files matched your search

+8
View File
@@ -0,0 +1,8 @@
.git
.venv
venv
__pycache__
*.pyc
*.db
*.sqlite3
data/
+58
View File
@@ -0,0 +1,58 @@
name: Docker Build & Push
run-name: Release ${{ gitea.ref_name }}
on:
push:
tags:
- 'v*'
jobs:
build-and-push:
runs-on: ubuntu-latest
permissions:
releases: write
packages: write
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Log in to Gitea Container Registry
uses: docker/login-action@v3
with:
registry: git.schamagusa.de
username: ${{ gitea.actor }}
password: ${{ secrets.RELEASE_TOKEN }}
# 'toLower()' is not implemented
- name: Repository kleinschreiben
id: lowercase
env:
REPO: ${{ gitea.repository }}
run: |
echo "repo=$(printf '%s' "$REPO" | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"
- name: Build and push Docker image
uses: docker/build-push-action@v5
env:
REPO: ${{ gitea.repository }}
with:
context: .
push: true
tags: |
git.schamagusa.de/${{ steps.lowercase.outputs.repo }}:${{ gitea.ref_name }}
git.schamagusa.de/${{ steps.lowercase.outputs.repo }}:latest
- name: Prepare release notes
run: |
sed "s|{{VERSION}}|${{ gitea.ref_name }}|g" CHANGELOG.md > release_notes.md
cat release_notes.md
- name: Create Release
uses: https://gitea.com/actions/gitea-release-action@main
with:
body_path: release_notes.md
prerelease: ${{ contains(gitea.ref_name, '-rc') || contains(gitea.ref_name, '-beta') || contains(gitea.ref_name, '-alpha') }}
files: |
example.docker-compose.yaml
example.env
+22
View File
@@ -0,0 +1,22 @@
This version includes a new workflow file, so the Releases come faster and better to you
## New Features
- Workflow with better description and performance
## Bug fixes
- added 'toLower' function to workflow
---
### Installation
> **Note:** This guide assumes that Docker and Docker Compose are already installed.
Download the `example.env` and the `example.docker-compose.yaml`, edit those and rename to `.env` and `docker-compose.yaml`.
Then run
```bash
docker compose pull
docker compose up -d
```
+6 -3
View File
@@ -3,15 +3,18 @@ FROM python:3.12-slim
WORKDIR /app
# WICHTIG: Ordner für die SQLite-Datenbank (damit die Daten bei Neustarts nicht gelöscht werden)
RUN mkdir -p /app/data
# Abhängigkeiten installieren
COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r requirements.txt
# Deinen Code kopieren
COPY . .
# WICHTIG: Ordner für die SQLite-Datenbank (damit die Daten bei Neustarts nicht gelöscht werden)
RUN mkdir -p /app/data
# Port freigeben
EXPOSE 8000
+9
View File
@@ -2,6 +2,15 @@
Eine Website, die sich von einer selber gehosteten Tandoor-Instanz die Shoppinglist Einträge nimmt, und als Shoppinglist anzeigt.
<div style="border-left: 4px solid #da3633; background-color: rgba(218, 54, 51, 0.1); padding: 12px 16px; border-radius: 0 6px 6px 0; margin: 16px 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif;">
<div style="font-weight: 600; color: #f85149; margin-bottom: 4px; display: flex; align-items: center; gap: 8px;">
<span>⚠️</span> <strong>Just created</strong>
</div>
<div style="color: #c9d1d9; font-size: 14px;">
This Repository was just created. It isnt finished and under heavy construction. So this Service is unstable!
</div>
</div>
## Inhalt
- TODO
- Festlegungen
+33
View File
@@ -0,0 +1,33 @@
from fastapi import Depends, status, Request
from fastapi.security import OAuth2PasswordBearer
import jwt
# auth/dependencies.py
from sqlalchemy.orm import Session
from database import get_db
from models.user import User
from config import settings
from exceptions import UnauthorizedError
def get_me(request: Request, db: Session = Depends(get_db)) -> User:
token = request.cookies.get("access_token")
print(token)
if not token:
raise UnauthorizedError("Token missing")
try:
# 1. Token entschlüsseln
payload = jwt.decode(token, settings.SECRET_KEY, algorithms=[settings.ALGORITHM])
user_id: str = payload.get("sub")
if user_id is None:
raise UnauthorizedError("Token invalid or expired")
except jwt.PyJWTError:
raise UnauthorizedError("Token invalid or expired")
# 2. User aus der Datenbank laden
user = db.get(User, int(user_id))
if user is None:
raise UnauthorizedError("Token invalid or expired")
return user
+23
View File
@@ -0,0 +1,23 @@
from datetime import datetime, timedelta, timezone
import jwt
from pwdlib import PasswordHash
from pwdlib.hashers.argon2 import Argon2Hasher
from config import settings #Settings from .env
password_hash = PasswordHash((Argon2Hasher(),))
def hash_password(password: str) -> str:
return password_hash.hash(password)
def verify_password(plain_password: str, hashed_password: str) -> bool:
return password_hash.verify(plain_password, hashed_password)
def create_access_token(data: dict, expires_delta: timedelta | None = None) -> str:
to_encode = data.copy()
expire = datetime.now(timezone.utc) + (expires_delta or timedelta(minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES))
to_encode.update({"exp": expire})
return jwt.encode(to_encode, settings.SECRET_KEY, algorithm=settings.ALGORITHM)
+17
View File
@@ -0,0 +1,17 @@
from pydantic_settings import BaseSettings, SettingsConfigDict
class Settings(BaseSettings):
# Tandoor Server
API_KEY: str
TANDOOR_URL: str
# Security
SECRET_KEY: str
ALGORITHM: str = "HS256"
ACCESS_TOKEN_EXPIRE_MINUTES: int = 30
# Sagt Pydantic, dass es die Werte aus der .env-Datei laden soll
model_config = SettingsConfigDict(env_file=".env", env_file_encoding="utf-8")
# Instanz erzeugen, die du im gesamten Projekt importierst
settings = Settings()
+79
View File
@@ -0,0 +1,79 @@
# crud/user.py
from sqlalchemy import select, exists, func
from sqlalchemy.orm import Session
from sqlalchemy.exc import IntegrityError
from models.user import User
from exceptions import UserNotFoundError, UserAlreadyExistsError
from auth.security import hash_password
def get_users(db: Session) -> list[User]:
stmt = select(User)
users = db.scalars(stmt).all()
if not users:
raise UserNotFoundError(f"No users in Database")
return users
def get_user_by_id(db: Session, user_id: int) -> User:
stmt = select(User).where(User.id == user_id)
user = db.scalars(stmt).first()
if user is None:
raise UserNotFoundError(f"User with id: {user_id} not found")
return user
def get_user_by_email(db: Session, email: str) -> User:
stmt = select(User).where(func.lower(User.email) == func.lower(email))
user = db.scalars(stmt).first()
if user is None:
raise UserNotFoundError(f"User with email: {email} not found")
return user
def create_user(db: Session, email: str, password: str, role: bool = "user") -> User:
hashed = hash_password(password)
user = User(email=email, password=hashed, role=role)
try:
db.add(user)
db.commit()
db.refresh(user)
return user
except IntegrityError as err:
db.rollback()
raise UserAlreadyExistsError(f"User with email: '{email}' already exists") from err
def update_user(db: Session, user_id: int, user_data: dict) -> User:
user = get_user_by_id(db, user_id)
if not user:
raise UserNotFoundError(f"User with ID {user_id} not found")
# Passwort hashen, falls es im Update enthalten ist
if "password" in user_data and user_data["password"] is not None:
user_data["password"] = hash_password(user_data.pop("password"))
# Nur die mitgeschickten Felder auf dem Objekt setzen
for field, value in user_data.items():
setattr(user, field, value)
try:
db.commit()
db.refresh(user)
return user
except IntegrityError as err:
db.rollback()
raise UserAlreadyExistsError("Email is already in use") from err
def delete_user(db: Session, user_id: int) -> User:
user = get_user_by_id(db, user_id)
if user is None:
raise UserNotFoundError(f"User with id: {user_id} not found")
db.delete(user)
db.commit()
return user
+21
View File
@@ -0,0 +1,21 @@
# database.py
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker, declarative_base
DATABASE_URL = "sqlite:///./tandur.db" # Datei landet im Projektordner
engine = create_engine(
DATABASE_URL,
connect_args={"check_same_thread": False} # nötig für SQLite + FastAPI
)
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
Base = declarative_base()
def get_db():
db = SessionLocal()
try:
yield db
finally:
db.close()
+14
View File
@@ -0,0 +1,14 @@
services:
tandur:
image: git.schamagusa.de/rudi/tandur:latest
container_name: tandur
restart: unless-stopped
ports:
- "8000:8000"
volumes:
- tandur-data:/app/data
#environment:
# - TZ=Europe/Berlin
volumes:
tandur-data:
+10
View File
@@ -0,0 +1,10 @@
# Einvironment Variablen
API_KEY=
TANDOOR_URL =
SECRET_KEY =
#ALGORITHM = "HS256"
#ACCESS_TOKEN_EXPIRE_MINUTES = 30
+79
View File
@@ -0,0 +1,79 @@
from typing import Any
class AppError(Exception):
"""Basisklasse für alle eigenen Fehler dieser App"""
def __init__(self, message: str = "Ein unerwarteter Fehler ist aufgetreten."):
self.message = message
super().__init__(self.message)
# ==========================================
# 1. Datenbank- & Ressourcen-Fehler
# ==========================================
class DatabaseError(AppError):
"""Basisklasse für Datenbank-bezogene Fehler"""
pass
class NotFoundError(DatabaseError):
"""Ein angefragter Datensatz existiert nicht"""
def __init__(self, resource: str = "Ressource", identifier: Any = None):
if identifier:
msg = f"{resource} mit ID/Kennung '{identifier}' wurde nicht gefunden."
else:
msg = f"{resource} wurde nicht gefunden."
super().__init__(msg)
class AlreadyExistsError(DatabaseError):
"""Ein Unique-Constraint wurde verletzt (z. B. doppelte E-Mail)"""
def __init__(self, resource: str = "Ressource", field: str = "Eintrag", value: Any = None):
if value:
msg = f"{resource} mit {field} '{value}' existiert bereits."
else:
msg = f"{resource} existiert bereits."
super().__init__(msg)
# Domänen-spezifische Ressourcen-Fehler
class UserNotFoundError(NotFoundError):
def __init__(self, identifier: Any = None):
super().__init__(resource="User", identifier=identifier)
class UserAlreadyExistsError(AlreadyExistsError):
def __init__(self, field: str = "E-Mail", value: Any = None):
super().__init__(resource="User", field=field, value=value)
# ==========================================
# 2. Authentifizierung & Autorisierung
# ==========================================
class AuthError(AppError):
"""Basisklasse für Authentifizierungs- und Rechte-Fehler"""
pass
class UnauthorizedError(AuthError):
"""Ungültiges Token oder falsche Login-Daten"""
def __init__(self, message: str = "Ungültige Anmeldedaten oder Token abgelaufen."):
super().__init__(message)
class ForbiddenError(AuthError):
"""Fehlende Berechtigungen (z.B. Kein Admin)"""
def __init__(self, message: str = "Unzureichende Berechtigungen für diese Aktion."):
super().__init__(message)
# ==========================================
# 3. Validierungsfehler (Business Logic)
# ==========================================
class ValidationError(AppError):
"""Fehler in der Business-Logik (unabhängig von Pydantic)"""
def __init__(self, message: str = "Ungültige Eingabedaten."):
super().__init__(message)
+50 -2
View File
@@ -1,9 +1,57 @@
from fastapi import FastAPI, Request
from fastapi import FastAPI, Request, status
from fastapi.responses import JSONResponse
from fastapi.templating import Jinja2Templates
from exceptions import UserNotFoundError, UserAlreadyExistsError, UnauthorizedError, ForbiddenError, ValidationError
import models #Database
from routers import api_router #API
app = FastAPI()
app = FastAPI(title="Tandur API")
app.include_router(api_router)
templates = Jinja2Templates(directory="templates")
######### ERROR handling #########
# 1. Globale Regel für 404
@app.exception_handler(UserNotFoundError)
def user_not_found_handler(request: Request, exc: UserNotFoundError):
return JSONResponse(
status_code=status.HTTP_404_NOT_FOUND,
content={"detail": str(exc)},
)
# 2. Globale Regel für 409
@app.exception_handler(UserAlreadyExistsError)
def user_exists_handler(request: Request, exc: UserAlreadyExistsError):
return JSONResponse(
status_code=status.HTTP_409_CONFLICT,
content={"detail": str(exc)},
)
@app.exception_handler(UnauthorizedError)
def unauthorized_handler(request: Request, exc: UnauthorizedError):
return JSONResponse(
status_code=status.HTTP_401_UNAUTHORIZED,
content={"detail": str(exc)},
headers={"WWW-Authenticate": "Bearer"},
)
@app.exception_handler(ForbiddenError)
def permissions_handler(request: Request, exc: ForbiddenError):
return JSONResponse(
status_code=status.HTTP_403_FORBIDDEN,
content={"detail": str(exc)},
)
@app.exception_handler(ValidationError)
def permissions_handler(request: Request, exc: ValidationError):
return JSONResponse(
status_code=status.HTTP_400_BAD_REQUEST,
content={"detail": str(exc)},
)
@app.get("/")
async def home(request: Request):
return templates.TemplateResponse(request=request, name="index.html")
+1
View File
@@ -0,0 +1 @@
from .user import User
+12
View File
@@ -0,0 +1,12 @@
from sqlalchemy import Column, Integer, String, Boolean, DateTime
from sqlalchemy.sql import func
from database import Base
class User(Base):
__tablename__ = "users"
id = Column(Integer, primary_key=True, index=True, autoincrement=True)
email = Column(String, unique=True, index=True, nullable=False)
password = Column(String, nullable=False)
role = Column(String, default="user")
created_at = Column(DateTime(timezone=True), server_default=func.now())
+12 -7
View File
@@ -1,20 +1,25 @@
annotated-doc==0.0.5
annotated-types==0.8.0
anyio==4.14.2
certifi==2026.7.22
click==8.4.2
argon2-cffi==25.1.0
argon2-cffi-bindings==26.1.0
cffi==2.1.1
click==8.5.0
cryptography==50.0.1
fastapi==0.141.1
greenlet==3.5.5
h11==0.16.0
httpcore==1.0.9
httpx==0.28.1
idna==3.19
Jinja2==3.1.6
MarkupSafe==3.0.3
pydantic==2.13.4
pydantic_core==2.46.4
pwdlib==0.3.1
pycparser==3.0
pydantic==2.13.5
pydantic-settings==2.15.0
pydantic_core==2.46.5
PyJWT==2.13.0
python-dotenv==1.2.3
SQLAlchemy==2.0.52
sqlmodel==0.0.39
starlette==1.6.0
typing-inspection==0.4.4
typing_extensions==4.16.0
+10
View File
@@ -0,0 +1,10 @@
from fastapi import APIRouter
from .users import router as users_router
from .auth import router as auth_router
api_router = APIRouter()
api_router.include_router(users_router, prefix="/api")
api_router.include_router(auth_router, prefix="/api")
+40
View File
@@ -0,0 +1,40 @@
# routers/auth.py
from fastapi import APIRouter, Depends, status, Response
from fastapi.security import OAuth2PasswordRequestForm
from sqlalchemy.orm import Session
from database import get_db
from schemas.auth import LoginRequest
from schemas.user import UserResponse
#from exceptions import UserAlreadyExistsError, UserNotFoundError
from crud.user import get_user_by_email
from auth.security import verify_password, create_access_token
router = APIRouter(prefix="/auth", tags=["Authentication"])
@router.post("/login", response_model=UserResponse, status_code=status.HTTP_200_OK)
def login(
data: LoginRequest,
response: Response,
db: Session = Depends(get_db)
):
user = get_user_by_email(db, email=data.username)
if not user or not verify_password(data.password, user.password):
raise UnauthorizedError("Wrong username or password")
access_token = create_access_token(data={"sub": str(user.id)})
response.set_cookie(
key="access_token",
value=access_token,
httponly=True, # Schutz gegen XSS
secure=False, # Im local dev (HTTP) auf False, auf Prod (HTTPS) auf True
samesite="lax",
)
return user
+59
View File
@@ -0,0 +1,59 @@
# routers/users.py
from fastapi import APIRouter, Depends, HTTPException, status
from sqlalchemy.orm import Session
from database import get_db
from schemas.user import UserCreate, UserResponse, UserUpdate
from exceptions import UserAlreadyExistsError, UserNotFoundError, ForbiddenError
from crud.user import get_users, get_user_by_id, get_user_by_email, create_user, update_user, delete_user
from auth.dependencies import get_me
router = APIRouter(prefix="/users", tags=["Users"])
@router.get("/", response_model=list[UserResponse])
def read_users(db: Session = Depends(get_db), me: User = Depends(get_me)):
if(me.role != "admin"):
raise ForbiddenError("Not authorized")
return get_users(db=db)
@router.get("/me", response_model=UserResponse)
def read_me(db: Session = Depends(get_db), me: User = Depends(get_me)):
return me
@router.get("/by-email", response_model=UserResponse)
def read_user_by_email(email: str, db: Session = Depends(get_db), me: User = Depends(get_me)):
return get_user_by_email(db=db, email=email)
@router.get("/{user_id}", response_model=UserResponse)
def read_user(user_id: int, db: Session = Depends(get_db), me: User = Depends(get_me)):
if(user_id != me.id and me.role != "admin"):
raise ForbiddenError("Not authorized")
return get_user_by_id(db=db, user_id=user_id)
@router.post("/", response_model=UserResponse, status_code=status.HTTP_201_CREATED)
def register_user(user_data: UserCreate, db: Session = Depends(get_db), me: User = Depends(get_me)):
if(me.role != "admin"):
raise ForbiddenError("Not authorized")
return create_user(
db=db,
email=user_data.email,
password=user_data.password,
role=user_data.role
)
@router.patch("/{user_id}", response_model=UserResponse, status_code=status.HTTP_200_OK)
def patch_user(user_id: int, user_data: UserUpdate, db: Session = Depends(get_db), me: User = Depends(get_me)):
if(user_id != me.id and me.role != "admin"):
raise ForbiddenError("Not authorized")
update_dict = user_data.model_dump(exclude_unset=True)
return update_user(db=db, user_id=user_id, user_data=update_dict)
@router.delete("/{user_id}", response_model=UserResponse)
def del_user(user_id: int, db: Session = Depends(get_db), me: User = Depends(get_me)):
if(user_id != me.id and me.role != "admin"):
raise ForbiddenError("Not authorized")
return delete_user(db=db, user_id=user_id)
+15
View File
@@ -0,0 +1,15 @@
# /schemas/auth.py
from pydantic import BaseModel
class LoginRequest(BaseModel):
username: str
password: str
class TokenData(BaseModel):
user_id: int | None = None
class AuthResponse(BaseModel):
message: str
+19
View File
@@ -0,0 +1,19 @@
from pydantic import BaseModel
class UserCreate(BaseModel):
email: str
password: str
role: str | None = "user"
class UserUpdate(BaseModel):
email: str | None = None
password: str | None = None
role: str | None = None
class UserResponse(BaseModel):
id: int
email: str
role: str
class Config:
from_attributes = True # Für SQLAlchemy 2.0 Kompatibilität
+36
View File
@@ -0,0 +1,36 @@
# test_db.py (im Projekt-Root, NICHT in app/ falls main.py woanders liegt)
from database import SessionLocal, engine, Base
import models
Base.metadata.create_all(bind=engine) # falls Tabelle noch nicht existiert
from crud.user import create_user, get_user_by_email, update_user, delete_user, verify_password
db = SessionLocal()
# Erstellen
u = create_user(db, email="2test@example.com", password="test1234", role="admin")
print("Erstellt:", u.id, u.email, u.role)
# Lesen
found = get_user_by_email(db, "1test@example.com")
print(found)
print("Gefunden:", found.email if found else "nicht gefunden")
# Passwort prüfen
print("Passwort korrekt:", verify_password("test1234", found.password))
print("Falsches Passwort:", verify_password("falsch", found.password))
# Updaten
updated = update_user(db, u.id, email="neu@example.com")
print("Aktualisiert:", updated.email)
# Löschen
success = delete_user(db, u.id)
print("Gelöscht:", success)
# Prüfen, ob wirklich weg
gone = get_user_by_email(db, "neu@example.com")
print("Nach Löschen noch da?:", gone)
db.close()