@onairos/react-native 3.0.65 → 3.0.67

package/src/components/UniversalOnboarding.tsx

@@ -22,7 +22,7 @@ import Icon from 'react-native-vector-icons/MaterialIcons';
 import { PlatformList } from './PlatformList';
 import { PinInput } from './PinInput';
 import { TrainingModal } from './TrainingModal';
-import { DataRequestModal } from './DataRequestModal';
+import { DataRequestScreen } from './DataRequestScreen';
 import { OAuthWebView } from './onboarding/OAuthWebView';
 import { useConnections } from '../hooks/useConnections';
 import { COLORS, DEEP_LINK_CONFIG } from '../constants';
@@ -80,7 +80,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
   const [email, setEmail] = useState<string>('');
   const [verificationCode, setVerificationCode] = useState<string>('');
   const [isVerifyingCode, setIsVerifyingCode] = useState<boolean>(false);
-  const [showDataRequestModal, setShowDataRequestModal] = useState<boolean>(false);
+
   const [isExistingUser, setIsExistingUser] = useState<boolean>(false);
   
   // Add refs for cleanup and code inputs
@@ -90,7 +90,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
 
   // Add state for showing additional platforms
   const [showAllPlatforms, setShowAllPlatforms] = useState<boolean>(false);
-  const [showTestDataRequest, setShowTestDataRequest] = useState<boolean>(false);
+
 
   // Parse test mode options
   const testModeOptions = typeof test === 'object' ? test : {};
@@ -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;
         
@@ -598,7 +598,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
           // Flow 1: Existing User → Data Request → Close (return API URL)
           console.log('🧪 Test Flow 1: Existing User → Show Data Request');
           setIsExistingUser(true);
-          setShowDataRequestModal(true);
+          setStep('dataRequest');
           return;
         } else if (isNewUserFlow) {
           // Flow 2: New User → Platform Connect → PIN → Training
@@ -610,19 +610,19 @@ 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) {
-          console.log('👤 Existing user detected, showing data request modal');
-          setShowDataRequestModal(true);
+          console.log('👤 Existing user detected, showing data request screen');
+          setStep('dataRequest');
         } else {
           console.log('🆕 New user, proceeding to platform connection');
           // Safely set username from email prefix
@@ -715,7 +715,6 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
 
   const handleDataRequestAccept = useCallback(() => {
     console.log('Data request accepted for existing user');
-    setShowDataRequestModal(false);
     
     // Complete onboarding for existing user
     onComplete('https://api2.onairos.uk', 'existing-session-token', {
@@ -728,7 +727,6 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
 
   const handleDataRequestDecline = useCallback(() => {
     console.log('Data request declined');
-    setShowDataRequestModal(false);
     handleClose();
   }, [handleClose]);
 
@@ -846,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}>
@@ -1031,14 +1031,14 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
                         <View style={styles.testModeContainer}>
                           <Text style={styles.testModeTitle}>🧪 Test Mode - 2 Main Flows</Text>
                           
-                          <TouchableOpacity 
-                            style={styles.testExistingUserButton}
-                            onPress={() => {
-                              // Flow 1: Existing User
-                              setIsExistingUser(true);
-                              setShowDataRequestModal(true);
-                            }}
-                          >
+                                                     <TouchableOpacity 
+                             style={styles.testExistingUserButton}
+                             onPress={() => {
+                               // Flow 1: Existing User
+                               setIsExistingUser(true);
+                               setStep('dataRequest');
+                             }}
+                           >
                             <Icon name="person" size={20} color="#28a745" />
                             <Text style={styles.testExistingUserButtonText}>
                               Flow 1: Existing User (Email → Code → Data Request → Close)
@@ -1060,11 +1060,11 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
 
                           <TouchableOpacity 
                             style={styles.testDataRequestButton}
-                            onPress={() => setShowTestDataRequest(true)}
+                            onPress={() => setStep('dataRequest')}
                           >
                             <Icon name="preview" size={20} color={COLORS.primary} />
                             <Text style={styles.testDataRequestButtonText}>
-                              Preview Data Request Modal
+                              Preview Data Request Screen
                             </Text>
                           </TouchableOpacity>
                         </View>
@@ -1145,6 +1145,16 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
                     test={isTestMode}
                   />
                 )}
+
+                {step === 'dataRequest' && (
+                  <DataRequestScreen
+                    onAccept={handleDataRequestAccept}
+                    onDecline={handleDataRequestDecline}
+                    requestData={requestData || {}}
+                    AppName={AppName}
+                    appIcon={appIcon}
+                  />
+                )}
                 
                 {step === 'oauth' && oauthUrl && (
                   <OAuthWebView
@@ -1167,30 +1177,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
         </View>
       </TouchableWithoutFeedback>
       
-      {/* Data Request Modal for existing users */}
-      {showDataRequestModal && requestData && (
-        <DataRequestModal
-          visible={showDataRequestModal}
-          onClose={handleDataRequestDecline}
-          onAccept={handleDataRequestAccept}
-          requestData={requestData}
-          AppName={AppName}
-        />
-      )}
-      
-      {/* Test mode data request modal */}
-      {showTestDataRequest && requestData && (
-        <DataRequestModal
-          visible={showTestDataRequest}
-          onClose={() => setShowTestDataRequest(false)}
-          onAccept={() => {
-            setShowTestDataRequest(false);
-            Alert.alert('Test Mode', 'This is a preview of the data request. In actual implementation, this would proceed with the data sharing agreement.');
-          }}
-          requestData={requestData}
-          AppName={`${AppName} (Test Preview)`}
-        />
-      )}
+
     </Modal>
   );
 };

package/src/index.ts

@@ -110,6 +110,7 @@ export { PlatformList } from './components/PlatformList';
 export { PinInput } from './components/PinInput';
 export { TrainingModal } from './components/TrainingModal';
 export { EmailVerificationModal } from './components/EmailVerificationModal';
+export { DataRequestScreen } from './components/DataRequestScreen';
 export { Overlay } from './components/Overlay';
 export { UniversalOnboarding } from './components/UniversalOnboarding';
 export { OnairosButton } from './components/OnairosButton';

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',
     };
   }
 };