🛠 chore : Fix validation error for Msg #7

api/endpoints/login.py

@@ -8,8 +8,8 @@
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.orm import Session
 
-import crud
 import models
+from crud import crud_user
 from crud.crud_user import CRUDUser
 from api import deps
 from core import security
@@ -60,19 +60,22 @@ def Check_Session(current_user: models.user.User = Depends(
     return current_user
 
 
-@router.post("/password-recovery/{email}", response_model=Msg)
+@router.post("/password-recovery/{email}",
+             response_model=Msg,
+             status_code=200,
+             response_description="Success")
 def recover_password(email: str, db: Session = Depends(deps.get_db)) -> Any:
     """
     Password Recovery
     """
     user = user1.get_by_email(db, email=email)
+
     if not user:
         raise HTTPException(
-            status_code=404,
+            status_code=422,
             detail="The user with this username does not exist in the system.",
         )
-    password_reset_token = generate_password_reset_token(email=email)
-    return {"Message": "Password recovery email sent"}
+    return {"msg": generate_password_reset_token(email=email)}
 
 
 @router.post("/reset-password/", response_model=Msg)
@@ -87,16 +90,11 @@ def reset_password(
     email = verify_password_reset_token(token)
     if not email:
         raise HTTPException(status_code=400, detail="Invalid token")
-    user = crud.user.get_by_email(db, email=email)
+    user = crud_user.CRUDUser.get_by_email(db, email=email)
     if not user:
-        raise HTTPException(
-            status_code=404,
-            detail="The user with this username does not exist in the system.",
-        )
-    elif not crud.user.is_active(user):
-        raise HTTPException(status_code=400, detail="Inactive user")
+        raise HTTPException(status_code=404, detail="User not found")
     hashed_password = get_password_hash(new_password)
     user.hashed_password = hashed_password
     db.add(user)
     db.commit()
-    return {"Message": "Password updated successfully"}
+    return {"msg": "Password updated successfully!"}

core/security.py

@@ -17,9 +17,7 @@ def create_access_token(subject: Union[str, Any],
         expire = datetime.utcnow() + timedelta(
             minutes=settings.ACCESS_TOKEN_EXPIRE_MINUTES)
     to_encode = {"exp": expire, "sub": str(subject)}
-    return jwt.encode(to_encode,
-                             settings.SECRET_KEY,
-                             algorithm=ALGORITHM)
+    return jwt.encode(to_encode, settings.SECRET_KEY, algorithm=ALGORITHM)
 
 
 def verify_password(plain_password: str, hashed_password: str) -> bool:

utils.py

@@ -9,7 +9,7 @@ def generate_password_reset_token(email: str) -> str:
     now = datetime.utcnow()
     expires = now + delta
     exp = expires.timestamp()
-    encoded_jwt = jwt.encode(
+    return jwt.encode(
         {
             "exp": exp,
             "nbf": now,
@@ -18,14 +18,10 @@ def generate_password_reset_token(email: str) -> str:
         settings.SECRET_KEY,
         algorithm="HS256",
     )
-    return encoded_jwt
 
 
 def verify_password_reset_token(token: str) -> Optional[str]:
     try:
-        decoded_token = jwt.decode(token,
-                                   settings.SECRET_KEY,
-                                   algorithms=["HS256"])
-        return decoded_token["email"]
+        return jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
     except jwt.JWTError:
         return None