Merge pull request #840 from CodeWithCJ/dev

fix for MFA & TOTP code

Author: CodeWithCJ

SparkyFitnessFrontend/src/api/Auth/auth.ts

@@ -58,7 +58,7 @@ export const registerUser = async (
     throw error;
   }
 
-  const authData = data as BetterAuthResponse | null;
+  const authData = data as Partial<BetterAuthResponse> | null;
 
   if (!authData?.user) {
     throw new Error(
@@ -90,15 +90,9 @@ export const loginUser = async (
     throw error;
   }
 
-  const authData = data as BetterAuthResponse | null;
+  const authData = data as Partial<BetterAuthResponse> | null;
 
-  if (!authData?.user) {
-    throw new Error(
-      'Login succeeded but no user data was received from the server.'
-    );
-  }
-
-  // Better Auth native 2FA handling
+  // Better Auth native 2FA handling - Check this BEFORE checking for user data
   if (authData?.twoFactorRedirect) {
     return {
       userId: authData?.user?.id || '',
@@ -110,6 +104,12 @@ export const loginUser = async (
     } as AuthResponse;
   }
 
+  if (!authData?.user) {
+    throw new Error(
+      'Login succeeded but no user data was received from the server.'
+    );
+  }
+
   return {
     message: 'Login successful',
     userId: authData?.user?.id,