Alpha/task15 - Done Upgrading - Change Password

app/api/deps.py

@@ -1,7 +1,7 @@
 from collections.abc import Generator
 from typing import Annotated, Any
 
-from fastapi import Depends, HTTPException
+from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 from jose import JWTError, jwt
 from pymongo.database import Database
@@ -25,7 +25,7 @@ def get_user(
     token: str = Depends(oauth2_scheme),
 ) -> UserRead:
     credentials_exception = HTTPException(
-        status_code=401,
+        status_code=status.HTTP_401_UNAUTHORIZED,
         detail="Could not validate credentials",
         headers={"WWW-Authenticate": "Bearer"},
     )
@@ -41,13 +41,13 @@ def get_user(
     user = crud.get_user_by_username(username=username)
     if user is None:
         raise HTTPException(
-            status_code=403,
+            status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Authenticaton error",
         )
 
     if user.role is UserRole.inactive:
         raise HTTPException(
-            status_code=403,
+            status_code=status.HTTP_401_UNAUTHORIZED,
             detail="User account is inactive. Please contact support.",
         )
 

app/api/endpoints/user.py

@@ -82,6 +82,9 @@ def change_password(
     current_user: Annotated[UserRead, Depends(get_user)],
     request: ChangePasswordRequest,
 ) -> ApiGeneralResponse:
+    if not AuthService.verify_password(password=request.old_password, hashed=current_user.hashed_password):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Incorrect old password")
+
     user_update = UserUpdate.from_user_read(
         user_read=current_user,
         password=request.new_password,

app/core/config/auth.py

@@ -4,7 +4,7 @@
 
 
 class Config(BaseSettings):
-    ACCESS_TOKEN_EXPIRE_MINUTS: int = 60 * 24 * 30
+    ACCESS_TOKEN_EXPIRE_MINUTS: int = 60 * 24 * 7  # 7 days
     JWT_ALGORITHM: str = "HS256"
     JWT_SECRET_KEY: str = config_env.JWT_SECRET_KEY
 

app/schemas/auth.py

@@ -2,4 +2,5 @@
 
 
 class ChangePasswordRequest(BaseModel):
+    old_password: str
     new_password: str