Login Fixes

Author: Odzen

backend/api/utils/email_sync.py

@@ -0,0 +1,53 @@
+from api.core import logger
+from api.models import (
+    Admin,
+    Guest,
+    Hub,
+    MentorProfile,
+    MenteeProfile,
+    MentorApplication,
+    MenteeApplication,
+    NewMentorApplication,
+    PartnerApplication,
+    PartnerProfile,
+    Support,
+    Moderator,
+    Users,
+    VerifiedEmail,
+)
+
+
+def update_email_across_models(old_email: str, new_email: str) -> None:
+    if not old_email or not new_email:
+        return
+    old_email_normalized = old_email.strip()
+    new_email_normalized = new_email.strip().lower()
+    if old_email_normalized.lower() == new_email_normalized:
+        return
+
+    models = [
+        MenteeApplication,
+        MentorApplication,
+        NewMentorApplication,
+        PartnerApplication,
+        MenteeProfile,
+        MentorProfile,
+        PartnerProfile,
+        Users,
+        VerifiedEmail,
+        Guest,
+        Support,
+        Moderator,
+        Admin,
+        Hub,
+    ]
+
+    for model in models:
+        try:
+            model.objects(email__iexact=old_email_normalized).update(
+                set__email=new_email_normalized
+            )
+        except Exception as exc:
+            logger.error(
+                f"Failed updating email for {model.__name__} {old_email_normalized} -> {new_email_normalized}: {exc}"
+            )

backend/api/views/admin.py

@@ -22,6 +22,7 @@
 from api.utils.require_auth import admin_only
 from api.utils.request_utils import get_profile_model, imgur_client
 from api.utils.constants import Account
+from api.utils.email_sync import update_email_across_models
 import csv
 import io
 from api.views.auth import create_firebase_user
@@ -433,60 +434,6 @@ def editEmailPassword():
             email=email,
         )
     if email != ex_email:
-        ex_data = MenteeApplication.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = MentorApplication.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = MenteeProfile.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = MentorProfile.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = NewMentorApplication.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = PartnerProfile.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = Users.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = VerifiedEmail.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = Guest.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = Support.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
-        ex_data = Moderator.objects.filter(email=ex_email)
-        if len(ex_data) > 0:
-            for ex_item in ex_data:
-                ex_item.email = email
-                ex_item.save()
+        update_email_across_models(ex_email, email)
 
     return create_response(status=200, message="successful edited")

backend/api/views/main.py

@@ -47,6 +47,7 @@
 )
 from api.utils.constants import NEW_APPLICATION_STATUS
 from api.utils.profile_parse import new_profile, edit_profile
+from api.utils.email_sync import update_email_across_models
 from api.utils.constants import Account
 from api.utils.require_auth import all_users, mentee_only, verify_user
 from firebase_admin import auth as firebase_admin_auth
@@ -931,9 +932,27 @@ def edit_mentor(id):
         logger.info(msg)
         return create_response(status=422, message=msg)
 
+    old_email = account.email.strip().lower() if account.email else account.email
+
     if not edit_profile(data, account):
         msg = "Couldn't update profile"
         return create_response(status=500, message=msg)
+    new_email = account.email.strip().lower() if account.email else account.email
+    if new_email and old_email and new_email != old_email:
+        try:
+            if account.firebase_uid:
+                firebase_admin_auth.update_user(account.firebase_uid, email=new_email)
+            else:
+                firebase_user = firebase_admin_auth.get_user_by_email(old_email)
+                firebase_admin_auth.update_user(firebase_user.uid, email=new_email)
+        except Exception as exc:
+            logger.error(
+                f"Failed to update Firebase email {old_email} -> {new_email}: {exc}"
+            )
+            return create_response(status=422, message="Email update failed")
+
+        update_email_across_models(old_email, new_email)
+        account.email = new_email
 
     account.save()