WIP: Better error handling

extensions/users.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+from classes.exceptions import UserAlreadyExists, UserCredentialsInvalid, UserEmailCodeInvalid
 from modules.database import col_users, col_albums, col_photos, col_emails, col_videos, col_emails
 from modules.app import app
 from modules.utils import configGet, logWrite
@@ -6,9 +7,9 @@ from modules.scheduler import scheduler
 from modules.mailer import mail_sender
 
 from uuid import uuid1
-from fastapi import Depends, HTTPException, Form
+from fastapi import Depends, Form
 from fastapi.responses import Response, UJSONResponse
-from starlette.status import HTTP_204_NO_CONTENT, HTTP_400_BAD_REQUEST, HTTP_406_NOT_ACCEPTABLE
+from starlette.status import HTTP_204_NO_CONTENT
 
 from modules.security import (
     User,
@@ -38,35 +39,43 @@ async def user_me(current_user: User = Depends(get_current_active_user)):
     return current_user
 
 
+user_confirm_responses = {
+    400: UserEmailCodeInvalid().openapi
+}
 if configGet("registration_requires_confirmation") is True:
-    @app.get("/users/{user}/confirm")
-    @app.patch("/users/{user}/confirm")
+    @app.get("/users/{user}/confirm", responses=user_confirm_responses)
+    @app.patch("/users/{user}/confirm", responses=user_confirm_responses)
     async def user_confirm(user: str, code: str):
         confirm_record = col_emails.find_one( {"user": user, "code": code, "used": False} )
         if confirm_record is None:
-            raise HTTPException(HTTP_400_BAD_REQUEST, detail=configGet("email_code_invalid", "messages"))
+            raise UserEmailCodeInvalid()
         col_emails.find_one_and_update( {"_id": confirm_record["_id"]}, {"$set": {"used": True}} )
         col_users.find_one_and_update( {"user": confirm_record["user"]}, {"$set": {"disabled": False}} )
         return UJSONResponse( {"detail": configGet("email_confirmed", "messages")} )
 
+user_create_responses = {
+    409: UserAlreadyExists().openapi
+}
 if configGet("registration_enabled") is True:
-    @app.post("/users", status_code=HTTP_204_NO_CONTENT)
+    @app.post("/users", status_code=HTTP_204_NO_CONTENT, responses=user_create_responses)
     async def user_create(user: str = Form(), email: str = Form(), password: str = Form()):
         if col_users.find_one( {"user": user} ) is not None:
-            raise HTTPException(HTTP_406_NOT_ACCEPTABLE, detail=configGet("user_already_exists", "messages"))
+            raise UserAlreadyExists()
         col_users.insert_one( {"user": user, "email": email, "hash": get_password_hash(password), "disabled": configGet("registration_requires_confirmation")} )
         if configGet("registration_requires_confirmation") is True:
             scheduler.add_job( send_confirmation, trigger="date", run_date=datetime.now()+timedelta(seconds=1), kwargs={"user": user, "email": email} )
         return Response(status_code=HTTP_204_NO_CONTENT)
 
-
-@app.delete("/users/me/", status_code=HTTP_204_NO_CONTENT)
+user_delete_responses = {
+    401: UserCredentialsInvalid().openapi
+}
+@app.delete("/users/me/", status_code=HTTP_204_NO_CONTENT, responses=user_delete_responses)
 async def user_delete(password: str = Form(), current_user: User = Depends(get_current_active_user)):
     user = get_user(current_user.user)
     if not user:
         return False
     if not verify_password(password, user.hash):
-        raise HTTPException(HTTP_400_BAD_REQUEST, detail=configGet("credentials_invalid", "messages"))
+        raise UserCredentialsInvalid()
     col_users.delete_many( {"user": current_user.user} )
     col_emails.delete_many( {"user": current_user.user} )
     col_photos.delete_many( {"user": current_user.user} )