fix: address review comments

Author: danieldanielecki

AUTHENTICATION_SETUP.md

@@ -52,7 +52,7 @@ This guide will help you set up Appwrite authentication for your Practice Exams
 
 1. Go to **Auth** → **Templates**
 2. Customize the email templates for:
-   - Magic URL (email OTP)
+   - Email OTP verification
    - Email verification
 
 ## Step 3: Environment Variables
@@ -99,7 +99,7 @@ In your Appwrite project settings, you need to configure callback URLs for OAuth
 
 ### Authentication Methods
 
-- **Email OTP**: Magic link authentication via email
+- **Email OTP**: 6-digit verification code sent via email
 - **Google OAuth**: Sign in with Google account
 - **Apple OAuth**: Sign in with Apple ID
 

app/auth/callback/page.tsx

@@ -19,8 +19,6 @@ function AuthCallbackContent() {
     const handleCallback = async () => {
       try {
         // Check if this is an OAuth callback
-        const userId = searchParams.get("userId");
-        const secret = searchParams.get("secret");
         const success = searchParams.get("success");
         const failure = searchParams.get("failure");
 
@@ -40,23 +38,6 @@ function AuthCallbackContent() {
           return;
         }
 
-        // Handle magic link callback
-        if (userId && secret) {
-          const result = await AuthService.updateEmailSession(userId, secret);
-          if (result.success) {
-            // Refresh auth context to update authentication state
-            await refreshUser();
-            setStatus("success");
-            setMessage("Email verified successfully! Redirecting...");
-            setTimeout(() => router.push("/"), 2000);
-          } else {
-            setStatus("error");
-            setMessage(result.error?.message || "Verification failed");
-            setTimeout(() => router.push("/"), 3000);
-          }
-          return;
-        }
-
         // If no callback parameters, redirect to home
         router.push("/");
       } catch (error) {

components/AuthModal.tsx

@@ -15,8 +15,12 @@ export const AuthModal: React.FC<AuthModalProps> = ({
   onClose,
   trialExpired = false,
 }) => {
-  const { signInWithEmail, verifyEmailOTP, signInWithGoogle, signInWithApple } =
-    useAuth();
+  const {
+    sendEmailOTP,
+    verifyOTPAndSignIn,
+    signInWithGoogle,
+    signInWithApple,
+  } = useAuth();
   const [email, setEmail] = useState("");
   const [otp, setOtp] = useState("");
   const [userId, setUserId] = useState<string | null>(null);
@@ -54,7 +58,7 @@ export const AuthModal: React.FC<AuthModalProps> = ({
     setMessage("");
 
     try {
-      const result = await signInWithEmail(email.trim());
+      const result = await sendEmailOTP(email.trim());
       if (result.success && result.userId) {
         setUserId(result.userId);
         // Save last used method
@@ -81,7 +85,7 @@ export const AuthModal: React.FC<AuthModalProps> = ({
     setMessage("");
 
     try {
-      const result = await verifyEmailOTP(userId, otp.trim());
+      const result = await verifyOTPAndSignIn(userId, otp.trim());
       if (result.success) {
         setIsVerifying(false);
         setIsRedirecting(true);

contexts/AuthContext.tsx

@@ -7,10 +7,10 @@ interface AuthContextType {
   user: AuthUser | null;
   isLoading: boolean;
   isAuthenticated: boolean;
-  signInWithEmail: (
+  sendEmailOTP: (
     email: string,
   ) => Promise<{ success: boolean; error?: string; userId?: string }>;
-  verifyEmailOTP: (
+  verifyOTPAndSignIn: (
     userId: string,
     otp: string,
   ) => Promise<{ success: boolean; error?: string }>;
@@ -57,7 +57,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
     }
   };
 
-  const signInWithEmail = async (email: string) => {
+  const sendEmailOTP = async (email: string) => {
     try {
       const result = await AuthService.createEmailOTPSession(email);
       if (result.success) {
@@ -70,7 +70,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
     }
   };
 
-  const verifyEmailOTP = async (userId: string, otp: string) => {
+  const verifyOTPAndSignIn = async (userId: string, otp: string) => {
     try {
       const result = await AuthService.verifyEmailOTP(userId, otp);
       if (result.success) {
@@ -127,8 +127,8 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
     user,
     isLoading,
     isAuthenticated,
-    signInWithEmail,
-    verifyEmailOTP,
+    sendEmailOTP,
+    verifyOTPAndSignIn,
     signInWithGoogle,
     signInWithApple,
     signOut,

hooks/useSecureTrial.tsx

@@ -59,7 +59,6 @@ export const useSecureTrial = () => {
   const getUserIP = async (): Promise<string> => {
     // Try multiple IP services for better reliability
     const ipServices = [
-      "/api/get-ip", // Local API route first
       "https://api.ipify.org?format=json",
       "https://ipapi.co/json/",
       "https://api.ip.sb/geoip",

lib/appwrite/auth.ts

@@ -64,25 +64,6 @@ export class AuthService {
     }
   }
 
-  static async updateEmailSession(
-    userId: string,
-    secret: string,
-  ): Promise<{ success: boolean; error?: AuthError }> {
-    try {
-      this.checkAppwriteAvailable();
-      await account!.updateMagicURLSession(userId, secret);
-      return { success: true };
-    } catch (error: any) {
-      return {
-        success: false,
-        error: {
-          message: error.message || "Failed to verify OTP",
-          code: error.code,
-        },
-      };
-    }
-  }
-
   // Google OAuth
   static async createGoogleSession(): Promise<{
     success: boolean;