every changed processed

auth/router.py

@@ -1,10 +1,15 @@
 from fastapi import APIRouter, Depends, HTTPException, status
-from .models import UserInDb, User, Role, Token, UserPublic
-from .models import get_current_active_user, authenticate_user, create_access_token , fake_db, get_current_user
+from .models import UserInDb, Role, Token, UserPublic, UserBase
+from .models import get_current_active_user, authenticate_user, create_access_token,get_current_user
 from datetime import timedelta, datetime, timezone
+from ..auth.models import get_password_hash, verify_password
 from ..config import ACCESS_TOKEN_EXPIRE_MINUTES
 from typing import Annotated, Optional
+from sqlmodel import Session
+from ..config import get_session_db
+from fastapi import Depends
 from fastapi.security import OAuth2PasswordRequestForm
+from .models import UserCreate, DBUser
 
 
 router = APIRouter(
@@ -16,7 +21,7 @@ router = APIRouter(
 
 @router.get("/me")
 async def read_users_me(
-    current_user: Annotated[User, Depends(get_current_active_user)],
+    current_user: Annotated[UserBase, Depends(get_current_active_user)],
 ) -> UserPublic:
     return current_user
 
@@ -28,15 +33,16 @@ def ADMIN(current_user: Annotated[UserInDb, Depends(get_current_user)]):
 
 
 @router.get('/home')
-async def home(current_user : Annotated[User, Depends(ADMIN)]):
+async def home(current_user : Annotated[UserBase, Depends(ADMIN)]):
     return {"message" : f"Welcome to home page {current_user.username}"}
 
 @router.post('/login')
 async def login_for_access_token(
     form_data : Annotated[OAuth2PasswordRequestForm, Depends()],
+    session : Annotated[Session, Depends(get_session_db)],
 ) -> Token:
     
-    user = authenticate_user(fake_db, form_data.username, form_data.password)
+    user = authenticate_user(session, form_data.username, form_data.password)
     if not user:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -45,6 +51,26 @@ async def login_for_access_token(
         )
     access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     access_token = create_access_token(
-        data={"sub": user['username'], "role": user['role'], 'status': user['status']}, expires_delta=access_token_expires
+        data={"sub": user.username, "role": user.role, 'status': user.status}, expires_delta=access_token_expires
     )
-    return Token(access_token=access_token, token_type="bearer")
+    return Token(access_token=access_token, token_type="bearer")
+
+
+@router.post('/register', response_model=UserPublic)
+async def create_user(
+        session : Annotated[Session, Depends(get_session_db)],
+        user : Annotated[UserCreate, Depends()]
+):
+    user_dict = user.dict()
+    print(user.password)
+    user_dict['hashed_password'] = get_password_hash(user.password)
+    print (user_dict['hashed_password'])
+
+    if not verify_password(user.password, user_dict['hashed_password']):
+        raise HTTPException(status_code=400, detail="Password hashing failed")
+    
+    db_user = DBUser.model_validate(user_dict)
+    session.add(db_user)
+    session.commit()
+    session.refresh(db_user)
+    return db_user