@onairos/react-native 3.0.38 → 3.0.39

package/src/components/onboarding/OAuthWebView.tsx

@@ -71,6 +71,11 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
   const handleNavigationStateChange = (navState: any) => {
     console.log(`Navigation state changed for ${platform}:`, navState.url);
     
+    // Don't process navigation changes while still loading the initial page
+    if (isLoading) {
+      return;
+    }
+    
     // Check for error states first
     if (navState.url.includes('error=') || navState.url.includes('access_denied')) {
       console.log('OAuth error detected:', navState.url);
@@ -78,138 +83,71 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
       return;
     }
     
-    // Check for the final redirect to onairos.uk domain (this means backend callback completed)
-    const isFinalRedirect = (
-      navState.url.includes('onairos.uk/Home') ||
-      navState.url.includes('onairos.uk/home') ||
-      navState.url.includes('onairos.uk/success') ||
-      navState.url.startsWith('https://onairos.uk/Home') ||
-      navState.url.includes('onairos.uk') && navState.url.includes('success')
-    );
-    
-    // Enhanced platform-specific success patterns
-    const platformSuccessPatterns: Record<string, RegExp[]> = {
-      reddit: [
-        /reddit\.com\/api\/v1\/authorize\?done=true/,
-        /reddit\.com\/api\/v1\/authorize\/success/,
-        /reddit\.com.*code=/
-      ],
-      pinterest: [
-        /pinterest\.com\/oauth\/success/,
-        /pinterest\.com\/oauth\/complete/,
-        /pinterest\.com.*code=/,
-        /api2\.onairos\.uk\/pinterest\/callback/,
-        /onairos\.uk.*pinterest/
-      ],
-      linkedin: [
-        /linkedin\.com\/oauth\/success/,
-        /linkedin\.com\/oauth\/complete/,
-        /linkedin\.com\/uas\/oauth2\/authorization\/success/,
-        /linkedin\.com.*code=/
-      ],
-      email: [/success/, /complete/],
-      instagram: [
-        /instagram\.com\/oauth\/authorize\?done=true/,
-        /instagram\.com\/oauth\/success/,
-        /instagram\.com.*code=/,
-        /api2\.onairos\.uk\/instagram\/callback/,
-        /onairos\.uk.*instagram/
-      ],
-      youtube: [
-        /accounts\.google\.com\/o\/oauth2\/approval/,
-        /youtube\.com\/oauth\/success/,
-        /accounts\.google\.com.*code=/,
-        /api2\.onairos\.uk\/youtube\/callback/
-      ]
-    };
-    
-    // Check for platform-specific success patterns
-    const isPlatformSuccess = platform && platformSuccessPatterns[platform] ?
-      platformSuccessPatterns[platform].some(pattern => pattern.test(navState.url)) :
-      false;
-    
-    // Check for callback URLs that might contain the authorization code
-    const isCallbackUrl = (
-      navState.url.includes('/callback') ||
-      navState.url.includes('code=') ||
-      navState.url.includes('token=') ||
-      navState.url.includes('access_token=') ||
-      navState.url.includes('api2.onairos.uk') ||
-      navState.url.includes('oauth_token=')
-    );
-    
-    // Extract authorization code or token if present
-    let authCode = null;
-    if (isCallbackUrl) {
-      console.log('Detected callback URL with possible code/token');
-      
-      // Try to extract code or token using different patterns
-      const codeMatch = navState.url.match(/code=([^&]+)/);
-      const tokenMatch = navState.url.match(/(?:token|access_token)=([^&]+)/);
-      const oauthTokenMatch = navState.url.match(/oauth_token=([^&]+)/);
-      
-      if (codeMatch && codeMatch[1]) {
-        authCode = decodeURIComponent(codeMatch[1]);
-        console.log('OAuth code extracted:', authCode);
-      } else if (tokenMatch && tokenMatch[1]) {
-        authCode = decodeURIComponent(tokenMatch[1]);
-        console.log('OAuth token extracted:', authCode);
-      } else if (oauthTokenMatch && oauthTokenMatch[1]) {
-        authCode = decodeURIComponent(oauthTokenMatch[1]);
-        console.log('OAuth token extracted:', authCode);
-      }
-      
-      // Call onSuccess with the extracted code/token
-      if (authCode) {
-        console.log(`Calling onSuccess for ${platform} with code:`, authCode);
+    // Special handling for Onairos login page (existing account check)
+    if (platform === 'onairos') {
+      // Check if user successfully logged in to Onairos
+      if (navState.url.includes('onairos.uk/Home') || 
+          navState.url.includes('onairos.uk/dashboard') ||
+          navState.url.includes('onairos.uk/profile')) {
+        console.log('Onairos login successful - existing account detected');
         
-        // Clear timeout since OAuth completed successfully
+        // Clear timeout since login completed successfully
         if (timeoutRef.current) {
           clearTimeout(timeoutRef.current);
         }
         
-        onSuccess(authCode);
-        
-        // Close the OAuth window after a short delay
-        setTimeout(() => {
-          if (onComplete) {
-            console.log('Calling onComplete to close OAuth window');
-            onComplete();
-          }
-        }, 1000);
+        onSuccess('onairos_login_success');
+        return;
+      }
+      
+      // If still on login page, don't close
+      if (navState.url.includes('onairos.uk/signin') || 
+          navState.url.includes('onairos.uk/login')) {
+        console.log('Still on Onairos login page, waiting for user to complete login');
         return;
       }
     }
     
-    // If we see the final redirect or platform-specific success, close the OAuth window
-    if (isFinalRedirect || isPlatformSuccess) {
-      console.log(`Detected success for ${platform}`);
+    // For platform OAuth flows, only close when we get the FINAL redirect from Onairos backend
+    // This happens AFTER the user has logged in and the backend has processed the OAuth callback
+    const isFinalOAuthRedirect = (
+      navState.url.includes('onairos.uk/Home') ||
+      navState.url.includes('onairos.uk/home') ||
+      navState.url.includes('onairos.uk/success') ||
+      navState.url.includes('onairos.uk/dashboard') ||
+      (navState.url.includes('onairos.uk') && navState.url.includes('complete'))
+    );
+    
+    // Only close when we get the final redirect from Onairos backend
+    if (isFinalOAuthRedirect) {
+      console.log(`Final OAuth redirect detected for ${platform} - user has completed login`);
       
-      // If we haven't already extracted a code/token, consider this a generic success
-      if (!authCode) {
-        console.log(`Calling onSuccess for ${platform} with generic success`);
-        onSuccess('success');
+      // Clear timeout since OAuth completed successfully
+      if (timeoutRef.current) {
+        clearTimeout(timeoutRef.current);
       }
       
-      // Close the OAuth window
-      if (onComplete) {
-        console.log('Calling onComplete to close OAuth window');
-        onComplete();
-      }
-    }
-    
-    // Handle specific redirect patterns that indicate completion
-    if (navState.url.includes('api2.onairos.uk') && 
-        (navState.url.includes('callback') || navState.url.includes('success'))) {
-      console.log(`Backend callback detected for ${platform}`);
-      onSuccess('backend_callback_success');
+      onSuccess('oauth_complete');
       
+      // Close the OAuth window after a short delay
       setTimeout(() => {
         if (onComplete) {
+          console.log('Calling onComplete to close OAuth window');
           onComplete();
         }
       }, 1500);
+      return;
     }
+    
+    // Log intermediate steps but don't close the WebView
+    if (navState.url.includes('/callback') || navState.url.includes('code=')) {
+      console.log(`OAuth callback detected for ${platform}, but waiting for final redirect from Onairos backend`);
+      // Don't close here - wait for the final redirect
+      return;
+    }
+    
+    // Log other navigation for debugging
+    console.log(`${platform} OAuth navigation:`, navState.url);
   };
 
   const handleLoadEnd = () => {