Fix login errors, add get /users and get /user (username or id) routes.

app/routers/user_route.py

@@ -4,11 +4,13 @@ from typing import Annotated
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordRequestForm
 
-from app.config import Settings
+from app.config import settings
 from app.logic.user_logic import (
     authenticate_user,
     create_access_token,
     get_current_user,
+    get_user_by_id,
+    get_users,
     save_user,
 )
 from app.models.token import Token
@@ -18,14 +20,17 @@ router = APIRouter(prefix="/users", tags=["users"])
 
 
 @router.get("/")
-def get_default():
-    return {"message": "Root for Users API"}
+def fetch_users():
+    users = get_users()
+    if not users:
+        return None
+    return [User.model_validate(user) for user in users]
 
 
 @router.post("/")
 async def create_user(user_in: UserIn):
     user = save_user(user_in)
-    access_token_expires = timedelta(minutes=Settings.access_token_expire_minutes)
+    access_token_expires = timedelta(minutes=settings.access_token_expire_minutes)
     access_token = create_access_token(
         data={"sub": user.username},
         expires_delta=access_token_expires,
@@ -33,12 +38,22 @@ async def create_user(user_in: UserIn):
     return Token(access_token=access_token, token_type="bearer")
 
 
-@router.get("/me")
-async def read_me(current_user: Annotated[User, Depends(get_current_user)]):
+@router.get("/user")
+async def fetch_current_user(current_user: Annotated[User, Depends(get_current_user)]):
     return current_user
 
 
-@router.post("/token")
+@router.get("/user/id/{user_id}")
+async def fetch_user_by_id(user_id: int):
+    return User.model_validate(get_user_by_id(user_id))
+
+
+@router.get("/user/name/{user_name}")
+async def fetch_user_by_name(user_id: int):
+    return User.model_validate(get_user_by_id(user_id))
+
+
+@router.post("/auth")
 async def login_for_access_token(
     form_data: Annotated[OAuth2PasswordRequestForm, Depends()],
 ) -> Token:
@@ -49,7 +64,7 @@ async def login_for_access_token(
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    access_token_expires = timedelta(minutes=Settings.access_token_expire_minutes)
+    access_token_expires = timedelta(minutes=settings.access_token_expire_minutes)
     access_token = create_access_token(
         data={"sub": user.username},
         expires_delta=access_token_expires,