Some small changes
Z.B. Dateipfad oben hinschreiben
This commit is contained in:
1 parent
ea86fd75ec
commit
99cea87151
11 files changed
+19
-30
No files matched your search
@@ -2,7 +2,7 @@ from fastapi import Depends, status, Request
|
|||||||
from fastapi.security import OAuth2PasswordBearer
|
from fastapi.security import OAuth2PasswordBearer
|
||||||
import jwt
|
import jwt
|
||||||
# auth/dependencies.py
|
# auth/dependencies.py
|
||||||
|
# @/auth/dependencies.py
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from database import get_db
|
from database import get_db
|
||||||
from models.user import User
|
from models.user import User
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# @/config.py
|
||||||
from pydantic_settings import BaseSettings, SettingsConfigDict
|
from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||||
|
|
||||||
class Settings(BaseSettings):
|
class Settings(BaseSettings):
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# crud/user.py
|
# @/crud/user.py
|
||||||
from sqlalchemy import select, exists, func
|
from sqlalchemy import select, exists, func
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# @/exeptions.py
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,18 @@
|
|||||||
|
# @/main.py
|
||||||
from fastapi import FastAPI, Request, status
|
from fastapi import FastAPI, Request, status
|
||||||
from fastapi.responses import JSONResponse
|
from fastapi.responses import JSONResponse
|
||||||
from fastapi.templating import Jinja2Templates
|
from fastapi.templating import Jinja2Templates
|
||||||
from exceptions import UserNotFoundError, UserAlreadyExistsError, UnauthorizedError, ForbiddenError, ValidationError
|
|
||||||
|
from exceptions import UserNotFoundError, UserAlreadyExistsError, UnauthorizedError, ForbiddenError, ValidationError #Errors
|
||||||
import models #Database
|
import models #Database
|
||||||
from routers import api_router #API
|
from routers import api_router #API
|
||||||
|
|
||||||
|
|
||||||
app = FastAPI(title="Tandur API")
|
app = FastAPI(title="Tandur API")
|
||||||
app.include_router(api_router)
|
app.include_router(api_router)
|
||||||
templates = Jinja2Templates(directory="templates")
|
templates = Jinja2Templates(directory="templates")
|
||||||
|
|
||||||
|
|
||||||
######### ERROR handling #########
|
######### ERROR handling #########
|
||||||
|
|
||||||
# 1. Globale Regel für 404
|
# 1. Globale Regel für 404
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# @/routers/__init__.py
|
||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
|
|
||||||
from .users import router as users_router
|
from .users import router as users_router
|
||||||
|
|||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
# routers/auth.py
|
# @/routers/auth.py
|
||||||
from fastapi import APIRouter, Depends, status, Response
|
from fastapi import APIRouter, Depends, status, Response
|
||||||
from fastapi.security import OAuth2PasswordRequestForm
|
from fastapi.security import OAuth2PasswordRequestForm
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
@@ -6,7 +6,7 @@ from sqlalchemy.orm import Session
|
|||||||
from database import get_db
|
from database import get_db
|
||||||
from schemas.auth import LoginRequest
|
from schemas.auth import LoginRequest
|
||||||
from schemas.user import UserResponse
|
from schemas.user import UserResponse
|
||||||
#from exceptions import UserAlreadyExistsError, UserNotFoundError
|
from exceptions import UnauthorizedError
|
||||||
from crud.user import get_user_by_email
|
from crud.user import get_user_by_email
|
||||||
from auth.security import verify_password, create_access_token
|
from auth.security import verify_password, create_access_token
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# routers/users.py
|
# @/routers/users.py
|
||||||
from fastapi import APIRouter, Depends, HTTPException, status
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# /schemas/auth.py
|
# @/schemas/auth.py
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# @/schemas/user.py
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
|
||||||
class UserCreate(BaseModel):
|
class UserCreate(BaseModel):
|
||||||
|
|||||||
@@ -4,33 +4,14 @@ import models
|
|||||||
|
|
||||||
Base.metadata.create_all(bind=engine) # falls Tabelle noch nicht existiert
|
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
|
from crud.user import get_users, get_user_by_email, update_user, delete_user
|
||||||
|
|
||||||
db = SessionLocal()
|
db = SessionLocal()
|
||||||
|
|
||||||
# Erstellen
|
# Erstellen
|
||||||
u = create_user(db, email="2test@example.com", password="test1234", role="admin")
|
u = get_users(db)
|
||||||
print("Erstellt:", u.id, u.email, u.role)
|
for user in u:
|
||||||
|
print(f"User: {user.email}, role: {user.role}, created_at: {user.created_at}")
|
||||||
|
|
||||||
# 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()
|
db.close()
|
||||||
Reference in new issue
Block a user