Fix/endpoints

backend/app/api/routes/auth.py

@@ -5,12 +5,10 @@
 from dishka.integrations.fastapi import DishkaRoute
 from fastapi import APIRouter, Depends, HTTPException, Request, Response
 from fastapi.security import OAuth2PasswordRequestForm
-from pymongo.errors import DuplicateKeyError
 
 from app.core.security import SecurityService
 from app.core.utils import get_client_ip
 from app.db.repositories import UserRepository
-from app.domain.exceptions import ConflictError
 from app.domain.user import DomainUserCreate
 from app.schemas_pydantic.common import ErrorResponse
 from app.schemas_pydantic.user import (
@@ -124,7 +122,7 @@ async def login(
     return LoginResponse(
         message="Login successful",
         username=user.username,
-        role="admin" if user.is_superuser else "user",
+        role=user.role,
         csrf_token=csrf_token,
     )
 
@@ -167,26 +165,16 @@ async def register(
         )
         raise HTTPException(status_code=400, detail="Username already registered")
 
-    try:
-        hashed_password = security_service.get_password_hash(user.password)
-        create_data = DomainUserCreate(
-            username=user.username,
-            email=str(user.email),
-            hashed_password=hashed_password,
-            role=user.role,
-            is_active=True,
-            is_superuser=False,
-        )
-        created_user = await user_repo.create_user(create_data)
-    except DuplicateKeyError as e:
-        logger.warning(
-            "Registration failed - duplicate email",
-            extra={
-                "username": user.username,
-                "client_ip": get_client_ip(request),
-            },
-        )
-        raise ConflictError("Email already registered") from e
+    hashed_password = security_service.get_password_hash(user.password)
+    create_data = DomainUserCreate(
+        username=user.username,
+        email=user.email,
+        hashed_password=hashed_password,
+        role=user.role,
+        is_active=True,
+        is_superuser=False,
+    )
+    created_user = await user_repo.create_user(create_data)
 
     logger.info(
         "Registration successful",
@@ -197,15 +185,7 @@ async def register(
         },
     )
 
-    return UserResponse(
-        user_id=created_user.user_id,
-        username=created_user.username,
-        email=created_user.email,
-        role=created_user.role,
-        is_superuser=created_user.is_superuser,
-        created_at=created_user.created_at,
-        updated_at=created_user.updated_at,
-    )
+    return UserResponse.model_validate(created_user, from_attributes=True)
 
 
 @router.get("/me", response_model=UserResponse)
@@ -269,7 +249,7 @@ async def verify_token(
     return TokenValidationResponse(
         valid=True,
         username=current_user.username,
-        role="admin" if current_user.is_superuser else "user",
+        role=current_user.role,
         csrf_token=csrf_token,
     )
 

backend/app/db/repositories/user_repository.py

@@ -3,9 +3,11 @@
 
 from beanie.odm.operators.find import BaseFindOperator
 from beanie.operators import Eq, Or, RegEx
+from pymongo.errors import DuplicateKeyError
 
 from app.db.docs import UserDocument
 from app.domain.enums import UserRole
+from app.domain.exceptions import ConflictError
 from app.domain.user import DomainUserCreate, DomainUserUpdate, User, UserListResult
 
 
@@ -16,7 +18,10 @@ async def get_user(self, username: str) -> User | None:
 
     async def create_user(self, create_data: DomainUserCreate) -> User:
         doc = UserDocument(**create_data.model_dump())
-        await doc.insert()
+        try:
+            await doc.insert()
+        except DuplicateKeyError as e:
+            raise ConflictError("Email already registered") from e
         return User.model_validate(doc, from_attributes=True)
 
     async def get_user_by_id(self, user_id: str) -> User | None:

backend/app/schemas_pydantic/user.py

@@ -117,7 +117,7 @@ class LoginResponse(BaseModel):
 
     message: str
     username: str
-    role: str
+    role: UserRole
     csrf_token: str
 
     model_config = ConfigDict(from_attributes=True)
@@ -128,7 +128,7 @@ class TokenValidationResponse(BaseModel):
 
     valid: bool
     username: str
-    role: str
+    role: UserRole
     csrf_token: str
 
     model_config = ConfigDict(from_attributes=True)