Add authentification

backend/src/users/service.py

@@ -16,6 +16,23 @@ def get_all(
 def get_one(session: Session, user_id: int) -> models.UserPublic:
     return session.get(models.User, user_id)
 
+def get_or_create_roles(session: Session, role_names) -> list[models.ContractType]:
+    statement = select(models.ContractType).where(models.ContractType.name.in_(role_names))
+    existing = session.exec(statement).all()
+    existing_roles = {role.name for role in existing}
+    missing_role = set(role_names) - existing_roles
+
+    new_roles = []
+    for role_name in missing_role:
+        role = models.ContractType(name=role_name)
+        session.add(role)
+        new_roles.append(role)
+
+    session.commit()
+    for role in new_roles:
+        session.refresh(role)
+    return existing + new_roles
+
 def get_or_create_user(session: Session, user_create: models.UserCreate):
     statement = select(models.User).where(models.User.email == user_create.email)
     user = session.exec(statement).first()
@@ -24,9 +41,20 @@ def get_or_create_user(session: Session, user_create: models.UserCreate):
     user = create_one(session, user_create)
     return user
 
+def get_roles(session: Session):
+    statement = select(models.ContractType)
+    return session.exec(statement.order_by(models.ContractType.name)).all()
+
 def create_one(session: Session, user: models.UserCreate) -> models.UserPublic:
-    user_create = user.model_dump(exclude_unset=True)
-    new_user = models.User(**user_create)
+    print("USER CREATE", user)
+    new_user = models.User(
+        name=user.name,
+        email=user.email
+    )
+
+    roles = get_or_create_roles(session, user.role_names)
+    new_user.roles = roles
+
     session.add(new_user)
     session.commit()
     session.refresh(new_user)

backend/src/users/users.py

@@ -4,12 +4,14 @@ import src.models as models
 from src.database import get_session
 from sqlmodel import Session
 import src.users.service as service
+from src.auth.auth import get_current_user
 
 router = APIRouter(prefix='/users')
 
 @router.get('/', response_model=list[models.UserPublic])
 def get_users(
     session: Session = Depends(get_session),
+    user: models.User = Depends(get_current_user),
     names: list[str] = Query([]),
     emails: list[str] = Query([]),
 ):
@@ -19,26 +21,50 @@ def get_users(
         emails,
     )
 
+@router.get('/roles', response_model=list[models.ContractType])
+def get_roles(
+    user: models.User = Depends(get_current_user),
+    session: Session = Depends(get_session)
+):
+    return service.get_roles(session)
+
 @router.get('/{id}', response_model=models.UserPublic)
-def get_users(id: int, session: Session = Depends(get_session)):
+def get_users(
+    id: int, 
+    user: models.User = Depends(get_current_user),
+    session: Session = Depends(get_session)
+):
     result = service.get_one(session, id)
     if result is None:
         raise HTTPException(status_code=404, detail=messages.notfound)
     return result
 
 @router.post('/', response_model=models.UserPublic)
-def create_user(user: models.UserCreate, session: Session = Depends(get_session)):
+def create_user(
+    user: models.UserCreate, 
+    logged_user: models.User = Depends(get_current_user),
+    session: Session = Depends(get_session)
+):
     return service.create_one(session, user)
 
 @router.put('/{id}', response_model=models.UserPublic)
-def update_user(id: int, user: models.UserUpdate, session: Session = Depends(get_session)):
+def update_user(
+    id: int, 
+    user: models.UserUpdate, 
+    logged_user: models.User = Depends(get_current_user),
+    session: Session = Depends(get_session)
+):
     result = service.update_one(session, id, user)
     if result is None:
         raise HTTPException(status_code=404, detail=messages.notfound)
     return result
 
 @router.delete('/{id}', response_model=models.UserPublic)
-def delete_user(id: int, session: Session = Depends(get_session)):
+def delete_user(
+    id: int, 
+    user: models.User = Depends(get_current_user),
+    session: Session = Depends(get_session)
+):
     result = service.delete_one(session, id)
     if result is None:
         raise HTTPException(status_code=404, detail=messages.notfound)