@onairos/react-native 3.0.66 → 3.0.67

package/src/components/EmailVerificationModal.tsx

@@ -20,6 +20,7 @@ export interface EmailVerificationModalProps {
   onClose: () => void;
   onVerificationComplete: (email: string, isExistingUser: boolean) => void;
   onVerificationFailed: (error: string) => void;
+  testMode?: boolean;
 }
 
 export const EmailVerificationModal: React.FC<EmailVerificationModalProps> = ({
@@ -28,6 +29,7 @@ export const EmailVerificationModal: React.FC<EmailVerificationModalProps> = ({
   onClose,
   onVerificationComplete,
   onVerificationFailed,
+  testMode = false,
 }) => {
   const [step, setStep] = useState<'request' | 'verify'>('request');
   const [verificationCode, setVerificationCode] = useState<string>('');
@@ -45,7 +47,7 @@ export const EmailVerificationModal: React.FC<EmailVerificationModalProps> = ({
       console.log('📧 Requesting email verification for:', email);
       
       // First check if there's already a pending verification
-      const statusCheck = await checkEmailVerificationStatus(email);
+      const statusCheck = await checkEmailVerificationStatus(email, testMode);
       if (statusCheck.success && statusCheck.isPending) {
         console.log('✅ Email verification already pending');
         setCodeSent(true);
@@ -55,7 +57,7 @@ export const EmailVerificationModal: React.FC<EmailVerificationModalProps> = ({
       }
 
       // Request new verification code
-      const result = await requestEmailVerification(email);
+      const result = await requestEmailVerification(email, testMode);
       
       if (result.success) {
         console.log('✅ Email verification code requested successfully');
@@ -91,7 +93,7 @@ export const EmailVerificationModal: React.FC<EmailVerificationModalProps> = ({
     try {
       console.log('🔍 Verifying email code for:', email);
       
-      const result = await verifyEmailCode(email, verificationCode.trim());
+      const result = await verifyEmailCode(email, verificationCode.trim(), testMode);
       
       if (result.success) {
         console.log('✅ Email verification successful');
@@ -190,9 +192,11 @@ export const EmailVerificationModal: React.FC<EmailVerificationModalProps> = ({
                         We've sent a 6-digit code to {email}
                       </Text>
                       
-                      <Text style={styles.testingNote}>
-                        🔍 Development Mode: Any 6-digit code will work for verification
-                      </Text>
+                      {testMode && (
+                        <Text style={styles.testingNote}>
+                          🔍 Test Mode: Any 6-digit code will work for verification
+                        </Text>
+                      )}
 
                       <TextInput
                         style={styles.codeInput}

package/src/components/TrainingModal.tsx

@@ -63,6 +63,7 @@ export const TrainingModal: React.FC<TrainingModalProps> = ({
       }
       
       console.log('🚀 Starting Enoch training with socketId:', socketId);
+      console.log('🔍 Production mode: Using live training API');
       
       // Prepare user data for training
       const trainingData = {
@@ -95,16 +96,18 @@ export const TrainingModal: React.FC<TrainingModalProps> = ({
         console.error('Training start failed:', result.error);
         setTrainingStatus(`Error: ${result.error}`);
         setHasError(true);
-        // Fallback to simulation if API call fails
-        console.log('🚀 Falling back to simulated training');
-      setTrainingStatus('Training model...');
-      setInternalProgress(20);
+        
+        // In production mode, don't fallback to simulation on API failure
+        console.error('🚨 Production mode: Training failed, not falling back to simulation');
       }
       
     } catch (error) {
       console.error('Training start error:', error);
       setTrainingStatus(`Error: ${error instanceof Error ? error.message : 'Unknown error'}`);
       setHasError(true);
+      
+      // In production mode, show the actual error
+      console.error('🚨 Production mode: Training failed with error:', error);
     }
   };
 
@@ -170,72 +173,79 @@ export const TrainingModal: React.FC<TrainingModalProps> = ({
     
     // Initialize real socket connection - backend confirmed this is working
     try {
-    // Initialize socket connection
-    socketRef.current = io('https://api2.onairos.uk', {
-      transports: ['websocket'],
-      autoConnect: false
-    });
-    
-    // Socket event listeners
-    socketRef.current.on('connect', () => {
-      console.log('✅ Socket connected for training');
-      setSocketConnected(true);
-      const socketId = socketRef.current?.id;
-      if (socketId) {
-        startEnochTraining(socketId);
-      }
-    });
-    
-    socketRef.current.on('disconnect', () => {
-      console.log('❌ Socket disconnected');
-      setSocketConnected(false);
-    });
-    
-    socketRef.current.on('trainingCompleted', (data) => {
-      console.log('✅ Training Complete:', data);
-      setTrainingStatus('Running test inference...');
-      setInternalProgress(60);
-    });
-    
-    socketRef.current.on('inferenceCompleted', (data) => {
-      console.log('🧠 Inference Complete:', data);
-      setTrainingStatus('Uploading to S3...');
-      setInternalProgress(80);
-      setUserTraits(data.traits);
-      setInferenceResults(data.inferenceResults);
-    });
-    
-    socketRef.current.on('modelStandby', (data) => {
-      console.log('🎉 All Complete:', data);
-      setIsTrainingComplete(true);
-      setTrainingStatus('Complete!');
-      setInternalProgress(100);
+      console.log('🔌 Production mode: Initializing real socket connection');
       
-      // Auto-complete after a short delay
-      setTimeout(() => {
-        onComplete && onComplete();
-      }, 1500);
-    });
-    
-    socketRef.current.on('trainingUpdate', (data) => {
-      if (data.error) {
-        console.error('Training update error:', data.error);
-        setTrainingStatus(`Error: ${data.error}`);
+      // Initialize socket connection
+      socketRef.current = io('https://api2.onairos.uk', {
+        transports: ['websocket'],
+        autoConnect: false
+      });
+      
+      // Socket event listeners
+      socketRef.current.on('connect', () => {
+        console.log('✅ Socket connected for training');
+        setSocketConnected(true);
+        const socketId = socketRef.current?.id;
+        if (socketId) {
+          startEnochTraining(socketId);
+        }
+      });
+      
+      socketRef.current.on('disconnect', () => {
+        console.log('❌ Socket disconnected');
+        setSocketConnected(false);
+      });
+      
+      socketRef.current.on('connect_error', (error) => {
+        console.error('❌ Socket connection error:', error);
+        setTrainingStatus('Connection failed');
         setHasError(true);
-      } else if (data.progress) {
-        setInternalProgress(data.progress);
-        setTrainingStatus(data.status || 'Training in progress...');
-      }
-    });
-    
-    // Connect to socket
-    socketRef.current.connect();
+      });
+      
+      socketRef.current.on('trainingCompleted', (data) => {
+        console.log('✅ Training Complete:', data);
+        setTrainingStatus('Running test inference...');
+        setInternalProgress(60);
+      });
+      
+      socketRef.current.on('inferenceCompleted', (data) => {
+        console.log('🧠 Inference Complete:', data);
+        setTrainingStatus('Uploading to S3...');
+        setInternalProgress(80);
+        setUserTraits(data.traits);
+        setInferenceResults(data.inferenceResults);
+      });
+      
+      socketRef.current.on('modelStandby', (data) => {
+        console.log('🎉 All Complete:', data);
+        setIsTrainingComplete(true);
+        setTrainingStatus('Complete!');
+        setInternalProgress(100);
+        
+        // Auto-complete after a short delay
+        setTimeout(() => {
+          onComplete && onComplete();
+        }, 1500);
+      });
+      
+      socketRef.current.on('trainingUpdate', (data) => {
+        if (data.error) {
+          console.error('Training update error:', data.error);
+          setTrainingStatus(`Error: ${data.error}`);
+          setHasError(true);
+        } else if (data.progress) {
+          setInternalProgress(data.progress);
+          setTrainingStatus(data.status || 'Training in progress...');
+        }
+      });
+      
+      // Connect to socket
+      socketRef.current.connect();
+      
     } catch (socketError) {
-      console.error('Socket connection failed, falling back to simulation:', socketError);
-      // Fallback to simulation if socket fails
-      console.log('🔌 Falling back to simulated socket connection...');
-      setSocketConnected(true);
-      simulateTraining();
+      console.error('🚨 Production mode: Socket connection failed:', socketError);
+      setTrainingStatus('Failed to connect to training service');
+      setHasError(true);
     }
     
     // Cleanup function

package/src/components/UniversalOnboarding.tsx

@@ -503,9 +503,9 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
       
       console.log('📧 Email validation passed, proceeding...');
       
-      // For development mode, just proceed to verification step without API call
-      if (debug || test) {
-        console.log('🧪 Debug/test mode: Skipping API call, proceeding to verification');
+      // For test mode, just proceed to verification step without API call
+      if (isTestMode) {
+        console.log('🧪 Test mode: Skipping API call, proceeding to verification');
         setStep('verify');
         return;
       }
@@ -538,7 +538,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
         
         // Race between API call and timeout
         const result = await Promise.race([
-          requestEmailVerification(email.trim()),
+          requestEmailVerification(email.trim(), isTestMode),
           timeoutPromise
         ]) as any;
         
@@ -610,14 +610,14 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
         }
       }
 
-      // Real API call (production)
-      const result = await verifyEmailCode(email.trim(), verificationCode.trim());
+      // Real API call (production) or test mode
+      const result = await verifyEmailCode(email.trim(), verificationCode.trim(), isTestMode);
       
       if (result.success) {
         console.log('✅ Email verification successful');
         
-                 // Check if user exists in backend
-         const existingUser = (result as any).existingUser || false;
+        // Check if user exists in backend (properly typed now)
+        const existingUser = result.existingUser || false;
         setIsExistingUser(existingUser);
         
         if (existingUser) {
@@ -844,9 +844,11 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
                       <Text style={styles.emailSubtitle}>
                         We've sent a 6-digit code to {email}
                       </Text>
-                      <Text style={styles.developmentNote}>
-                        🔍 Development Mode: Any 6-digit code will work
-                      </Text>
+                      {isTestMode && (
+                        <Text style={styles.developmentNote}>
+                          🔍 Test Mode: Any 6-digit code will work
+                        </Text>
+                      )}
                     </View>
                     
                     <View style={styles.emailInputSection}>

package/src/services/platformAuthService.ts

@@ -654,15 +654,17 @@ export const updateGoogleClientIds = (config: {
  * 📧 EMAIL VERIFICATION FUNCTIONS
  * Using the correct Onairos email verification endpoints
  */
-export const requestEmailVerification = async (email: string): Promise<{
+export const requestEmailVerification = async (email: string, testMode = false): Promise<{
   success: boolean;
   message?: string;
   error?: string;
 }> => {
   try {
     console.log('📧 Requesting email verification for:', email);
+    console.log('🔍 Test mode:', testMode);
     
-    const response = await fetch('https://api2.onairos.uk/email/verification', {
+    // Use the correct endpoint: /email/verify
+    const response = await fetch('https://api2.onairos.uk/email/verify', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
@@ -674,10 +676,14 @@ export const requestEmailVerification = async (email: string): Promise<{
     
     if (response.ok && result.success) {
       console.log('✅ Email verification requested successfully');
-      console.log('🔍 Testing mode: Code logged to server console, but accepts any code');
+      
+      const message = testMode 
+        ? 'Verification code sent to your email (testing mode: any code accepted)'
+        : result.message || 'Verification code sent to your email';
+      
       return {
         success: true,
-        message: result.message || 'Verification code sent to your email (testing mode: any code accepted)',
+        message,
       };
     } else {
       console.error('❌ Email verification request failed:', result.error);
@@ -695,49 +701,72 @@ export const requestEmailVerification = async (email: string): Promise<{
   }
 };
 
-export const verifyEmailCode = async (email: string, code: string): Promise<{
+export const verifyEmailCode = async (email: string, code: string, testMode = false): Promise<{
   success: boolean;
   message?: string;
   error?: string;
+  existingUser?: boolean;
 }> => {
   try {
     console.log('🔍 Verifying email code for:', email);
-    console.log('🔍 Development mode: All codes will pass through for now');
+    console.log('🔍 Test mode:', testMode);
+    
+    // In test mode, accept any code
+    if (testMode) {
+      console.log('🧪 Test mode: All codes will pass through');
+      // Simulate 30% chance of existing user in test mode
+      const simulateExistingUser = Math.random() < 0.3;
+      return {
+        success: true,
+        message: 'Email verified successfully (test mode: all codes accepted)',
+        existingUser: simulateExistingUser,
+      };
+    }
     
-    // For now, allow all codes to pass through
-    // Still make the API call to set up the routing, but don't rely on response
+    // Production mode: Make real API call with proper validation
     try {
-      const response = await fetch('https://api2.onairos.uk/email/verification', {
+      const response = await fetch('https://api2.onairos.uk/email/verify', {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
         },
-        body: JSON.stringify({ email, code, action: 'verify' }),
+        body: JSON.stringify({ email, code }),
       });
       
       const result = await response.json();
       console.log('📡 Email verification API response:', result);
+      
+      if (response.ok && result.success) {
+        console.log('✅ Email verification successful');
+        return {
+          success: true,
+          message: result.message || 'Email verified successfully',
+          existingUser: result.existingUser || false, // Backend should return this flag
+        };
+      } else {
+        console.error('❌ Email verification failed:', result.error);
+        return {
+          success: false,
+          error: result.error || 'Invalid verification code',
+        };
+      }
     } catch (apiError) {
-      console.warn('⚠️ Email verification API call failed, but continuing with bypass:', apiError);
+      console.error('❌ Email verification API call failed:', apiError);
+      return {
+        success: false,
+        error: 'Network error during verification',
+      };
     }
-    
-    // Always return success for now
-    console.log('✅ Email verification successful (bypass mode)');
-    return {
-      success: true,
-      message: 'Email verified successfully (development mode: all codes accepted)',
-    };
   } catch (error) {
     console.error('❌ Email verification error:', error);
-    // Even on error, return success for now
     return {
-      success: true,
-      message: 'Email verified successfully (development mode: all codes accepted)',
+      success: false,
+      error: error instanceof Error ? error.message : 'Unknown error',
     };
   }
 };
 
-export const checkEmailVerificationStatus = async (email: string): Promise<{
+export const checkEmailVerificationStatus = async (email: string, testMode = false): Promise<{
   success: boolean;
   isPending?: boolean;
   message?: string;
@@ -745,11 +774,21 @@ export const checkEmailVerificationStatus = async (email: string): Promise<{
 }> => {
   try {
     console.log('🔍 Checking email verification status for:', email);
-    console.log('🔍 Development mode: Always returning no pending verification');
+    console.log('🔍 Test mode:', testMode);
+    
+    // In test mode, always return no pending verification
+    if (testMode) {
+      console.log('🧪 Test mode: Always returning no pending verification');
+      return {
+        success: true,
+        isPending: false,
+        message: 'Status retrieved successfully (test mode)',
+      };
+    }
     
-    // Make API call to set up routing, but don't rely on response for now
+    // Production mode: Make real API call
     try {
-      const response = await fetch(`https://api2.onairos.uk/email/verification/status/${encodeURIComponent(email)}`, {
+      const response = await fetch(`https://api2.onairos.uk/email/verify/status/${encodeURIComponent(email)}`, {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
@@ -758,24 +797,33 @@ export const checkEmailVerificationStatus = async (email: string): Promise<{
       
       const result = await response.json();
       console.log('📡 Email verification status API response:', result);
+      
+      if (response.ok && result.success) {
+        console.log('✅ Email verification status retrieved');
+        return {
+          success: true,
+          isPending: result.isPending || false,
+          message: result.message || 'Status retrieved successfully',
+        };
+      } else {
+        console.error('❌ Email verification status failed:', result.error);
+        return {
+          success: false,
+          error: result.error || 'Failed to check verification status',
+        };
+      }
     } catch (apiError) {
-      console.warn('⚠️ Email verification status API call failed, but continuing with bypass:', apiError);
+      console.error('❌ Email verification status API call failed:', apiError);
+      return {
+        success: false,
+        error: 'Network error while checking status',
+      };
     }
-    
-    // For development, always return no pending verification
-    console.log('✅ Email verification status retrieved (bypass mode)');
-    return {
-      success: true,
-      isPending: false, // Always false so verification flow starts fresh
-      message: 'Status retrieved successfully (development mode)',
-    };
   } catch (error) {
     console.error('❌ Email verification status error:', error);
-    // Even on error, return success for development
     return {
-      success: true,
-      isPending: false,
-      message: 'Status retrieved successfully (development mode)',
+      success: false,
+      error: error instanceof Error ? error.message : 'Unknown error',
     };
   }
 };