From 6a63c94153dd76f41857019530ef0054913b5cdd Mon Sep 17 00:00:00 2001
From: Shiyinq <shiyinq.github.io@gmail.com>
Date: Sat, 20 Jan 2024 21:54:53 +0700
Subject: [PATCH] feat: add guard clause to improve signup process

---
 backend/apps/web/routers/auths.py | 66 +++++++++++++++----------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/backend/apps/web/routers/auths.py b/backend/apps/web/routers/auths.py
index f245601d..a0772223 100644
--- a/backend/apps/web/routers/auths.py
+++ b/backend/apps/web/routers/auths.py
@@ -91,42 +91,40 @@ async def signin(form_data: SigninForm):
 
 @router.post("/signup", response_model=SigninResponse)
 async def signup(request: Request, form_data: SignupForm):
-    if request.app.state.ENABLE_SIGNUP:
-        if validate_email_format(form_data.email.lower()):
-            if not Users.get_user_by_email(form_data.email.lower()):
-                try:
-                    role = "admin" if Users.get_num_users() == 0 else "pending"
-                    hashed = get_password_hash(form_data.password)
-                    user = Auths.insert_new_auth(form_data.email.lower(),
-                                                 hashed, form_data.name, role)
-
-                    if user:
-                        token = create_token(data={"email": user.email})
-                        # response.set_cookie(key='token', value=token, httponly=True)
-
-                        return {
-                            "token": token,
-                            "token_type": "Bearer",
-                            "id": user.id,
-                            "email": user.email,
-                            "name": user.name,
-                            "role": user.role,
-                            "profile_image_url": user.profile_image_url,
-                        }
-                    else:
-                        raise HTTPException(
-                            500, detail=ERROR_MESSAGES.CREATE_USER_ERROR)
-                except Exception as err:
-                    raise HTTPException(500,
-                                        detail=ERROR_MESSAGES.DEFAULT(err))
-            else:
-                raise HTTPException(400, detail=ERROR_MESSAGES.EMAIL_TAKEN)
-        else:
-            raise HTTPException(400,
-                                detail=ERROR_MESSAGES.INVALID_EMAIL_FORMAT)
-    else:
+    if not request.app.state.ENABLE_SIGNUP:
         raise HTTPException(400, detail=ERROR_MESSAGES.ACCESS_PROHIBITED)
+        
+    if not validate_email_format(form_data.email.lower()):
+        raise HTTPException(400, detail=ERROR_MESSAGES.INVALID_EMAIL_FORMAT)
+        
+    if Users.get_user_by_email(form_data.email.lower()):
+        raise HTTPException(400, detail=ERROR_MESSAGES.EMAIL_TAKEN)
+        
+    try:
+        role = "admin" if Users.get_num_users() == 0 else "pending"
+        hashed = get_password_hash(form_data.password)
+        user = Auths.insert_new_auth(form_data.email.lower(),
+                                     hashed, form_data.name, role)
 
+        if user:
+            token = create_token(data={"email": user.email})
+            # response.set_cookie(key='token', value=token, httponly=True)
+
+            return {
+                "token": token,
+                "token_type": "Bearer",
+                "id": user.id,
+                "email": user.email,
+                "name": user.name,
+                "role": user.role,
+                "profile_image_url": user.profile_image_url,
+            }
+        else:
+            raise HTTPException(
+                500, detail=ERROR_MESSAGES.CREATE_USER_ERROR)
+    except Exception as err:
+        raise HTTPException(500,
+                            detail=ERROR_MESSAGES.DEFAULT(err))
 
 ############################
 # ToggleSignUp