Merge pull request #4 from ingeniousambivert/master

fix email conflict bug

Author: Youngestdev

app/server/routes/admin.py

@@ -3,18 +3,19 @@
 from fastapi.security import HTTPBasicCredentials
 from passlib.context import CryptContext
 
-from app.server.database.database import admin_collection
+from server.database.database import admin_collection
 #from app.server.auth.admin import validate_login
-from app.server.auth.jwt_handler import signJWT
-from app.server.database.database import add_admin
-from app.server.models.admin import AdminModel
+from server.auth.jwt_handler import signJWT
+from server.database.database import add_admin
+from server.models.admin import AdminModel
 
 router = APIRouter()
 
 hash_helper = CryptContext(schemes=["bcrypt"])
 
 @router.post("/login")
 async def admin_login(admin_credentials: HTTPBasicCredentials = Body(...)):
+    # NEW CODE
     admin_user = await admin_collection.find_one({"email": admin_credentials.username}, {"_id": 0})
     if (admin_user):
         password = hash_helper.verify(
@@ -36,9 +37,10 @@ async def admin_login(admin_credentials: HTTPBasicCredentials = Body(...)):
 
 @router.post("/")
 async def admin_signup(admin: AdminModel = Body(...)):
-    admin = admin_collection.find_one({"email":  admin.email})
-    if(admin):
+    admin_exists = await admin_collection.find_one({"email":  admin.email}, {"_id": 0})
+    if(admin_exists):
         return "Email already exists"
+    
     admin.password = hash_helper.encrypt(admin.password)
     new_admin = await add_admin(jsonable_encoder(admin))
     return new_admin