@onairos/react-native 3.0.70 → 3.0.72

package/src/components/onboarding/OAuthWebView.tsx

@@ -32,6 +32,8 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
 }) => {
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
+  const [errorMessage, setErrorMessage] = useState<string>('');
+  const [isRetryable, setIsRetryable] = useState(true);
   const [retryCount, setRetryCount] = useState(0);
   const webViewRef = useRef<WebView>(null);
   const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -74,91 +76,140 @@ 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);
-      setError('Authentication was cancelled or failed. Please try again.');
+  const onNavigationStateChange = (navState: any) => {
+    const currentUrl = navState.url;
+    console.log('🌐 Navigation state changed:', {
+      url: currentUrl,
+      canGoBack: navState.canGoBack,
+      canGoForward: navState.canGoForward,
+      loading: navState.loading,
+      title: navState.title,
+    });
+
+    // Don't process if still loading
+    if (navState.loading) {
       return;
     }
-    
-    // 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');
+
+    // Check if this URL indicates OAuth completion
+    if (isOAuthComplete(currentUrl)) {
+      console.log('🎉 OAuth completion detected!');
+      
+      // Extract the result
+      const result = extractOAuthResult(currentUrl);
+      
+      if (result.success) {
+        console.log('✅ OAuth completed successfully:', result);
         
-        // Clear timeout since login completed successfully
+        // Clear timeout
         if (timeoutRef.current) {
           clearTimeout(timeoutRef.current);
+          timeoutRef.current = null;
         }
         
-        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;
+        // Call success callback
+        if (onSuccess && result.code) {
+          onSuccess(result.code);
+        }
+        
+        // Close the WebView
+        if (onComplete) {
+          onComplete();
+        }
+      } else {
+        console.error('❌ OAuth failed:', result.error);
+        
+        // Clear timeout
+        if (timeoutRef.current) {
+          clearTimeout(timeoutRef.current);
+          timeoutRef.current = null;
+        }
+        
+        // Set error state
+        setError('OAuth authentication failed');
+        setErrorMessage(result.error || 'Authentication failed');
+        setIsRetryable(true);
       }
     }
     
-    // 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`);
+    // Additional check for Gmail specific patterns
+    if (platform === 'email' || platform === 'gmail') {
+      const gmailPatterns = [
+        'onairos.uk/Home',
+        'onairos.uk/home',
+        'https://onairos.uk/Home',
+        'https://onairos.uk/home',
+      ];
       
-      // Clear timeout since OAuth completed successfully
-      if (timeoutRef.current) {
-        clearTimeout(timeoutRef.current);
-      }
-      
-      onSuccess('oauth_complete');
-      
-      // Close the OAuth window after a short delay
-      setTimeout(() => {
-      if (onComplete) {
-        console.log('Calling onComplete to close OAuth window');
-        onComplete();
+      for (const pattern of gmailPatterns) {
+        if (currentUrl.includes(pattern)) {
+          console.log('✅ Gmail OAuth success detected via home page redirect');
+          
+          // Clear timeout
+          if (timeoutRef.current) {
+            clearTimeout(timeoutRef.current);
+            timeoutRef.current = null;
+          }
+          
+          // Call success callback with Gmail-specific code
+          if (onSuccess) {
+            onSuccess('gmail_success');
+          }
+          
+          // Close the WebView
+          if (onComplete) {
+            onComplete();
+          }
+          
+          return;
+        }
       }
-      }, 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;
-    }
+    // Check for error URLs
+    const errorPatterns = [
+      'error=',
+      'error_description=',
+      'access_denied',
+      'user_cancelled',
+      'cancelled',
+      'denied',
+    ];
     
-    // Log other navigation for debugging
-    console.log(`${platform} OAuth navigation:`, navState.url);
+    for (const pattern of errorPatterns) {
+      if (currentUrl.includes(pattern)) {
+        console.log('❌ OAuth error detected in URL:', pattern);
+        
+        // Clear timeout
+        if (timeoutRef.current) {
+          clearTimeout(timeoutRef.current);
+          timeoutRef.current = null;
+        }
+        
+        // Parse error details
+        try {
+          const urlObj = new URL(currentUrl);
+          const params = new URLSearchParams(urlObj.search);
+          const errorDescription = params.get('error_description') || params.get('error') || 'Authentication failed';
+          
+          setError('OAuth authentication failed');
+          setErrorMessage(errorDescription);
+          setIsRetryable(true);
+        } catch (parseError) {
+          setError('OAuth authentication failed');
+          setErrorMessage('Authentication failed');
+          setIsRetryable(true);
+        }
+        
+        return;
+      }
+    }
   };
 
   const handleLoadEnd = () => {
     setIsLoading(false);
     setError(null);
+    setErrorMessage('');
   };
 
   const handleError = (syntheticEvent: any) => {
@@ -272,6 +323,8 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
   const handleRetry = () => {
     console.log('Manual retry requested');
     setError(null);
+    setErrorMessage('');
+    setIsRetryable(true);
     setIsLoading(true);
     setRetryCount(0);
     
@@ -320,6 +373,116 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
     }
   };
 
+  // Check if URL indicates OAuth completion
+  const isOAuthComplete = (url: string): boolean => {
+    // Gmail OAuth completion patterns
+    const gmailSuccessPatterns = [
+      'https://onairos.uk/Home',
+      'https://onairos.uk/home',
+      'onairos.uk/Home',
+      'onairos.uk/home',
+      process.env.APP_HOME_URL,
+    ].filter(Boolean);
+    
+    // Check for success redirect patterns
+    for (const pattern of gmailSuccessPatterns) {
+      if (url.includes(pattern)) {
+        console.log('✅ OAuth success detected via redirect to:', pattern);
+        return true;
+      }
+    }
+    
+    // Check for traditional OAuth callback patterns
+    const callbackPatterns = [
+      'code=',
+      'access_token=',
+      'oauth_token=',
+      'authorization_code=',
+      'auth_code=',
+      'token=',
+      'callback',
+      'success',
+      'complete',
+      'connected',
+      'authorized',
+    ];
+    
+    for (const pattern of callbackPatterns) {
+      if (url.includes(pattern)) {
+        console.log('✅ OAuth success detected via callback pattern:', pattern);
+        return true;
+      }
+    }
+    
+    // Check for error patterns
+    const errorPatterns = [
+      'error=',
+      'error_description=',
+      'oauth_error=',
+      'auth_error=',
+      'access_denied',
+      'user_cancelled',
+      'cancelled',
+      'denied',
+    ];
+    
+    for (const pattern of errorPatterns) {
+      if (url.includes(pattern)) {
+        console.log('❌ OAuth error detected via pattern:', pattern);
+        return false;
+      }
+    }
+    
+    return false;
+  };
+
+  // Extract OAuth result from URL
+  const extractOAuthResult = (url: string): { success: boolean; code?: string; error?: string } => {
+    try {
+      const urlObj = new URL(url);
+      const params = new URLSearchParams(urlObj.search);
+      
+      // Check for error first
+      const error = params.get('error') || params.get('error_description') || params.get('oauth_error');
+      if (error) {
+        return { success: false, error };
+      }
+      
+      // Check for success indicators
+      const code = params.get('code') || params.get('authorization_code') || params.get('auth_code');
+      const accessToken = params.get('access_token') || params.get('oauth_token') || params.get('token');
+      
+      if (code || accessToken) {
+        return { success: true, code: code || accessToken };
+      }
+      
+      // Check for success redirect to home page (Gmail pattern)
+      const gmailSuccessPatterns = [
+        'https://onairos.uk/Home',
+        'https://onairos.uk/home',
+        'onairos.uk/Home',
+        'onairos.uk/home',
+      ];
+      
+      for (const pattern of gmailSuccessPatterns) {
+        if (url.includes(pattern)) {
+          console.log('✅ Gmail OAuth success detected via home page redirect');
+          return { success: true, code: 'gmail_home_redirect' };
+        }
+      }
+      
+      // If we reached here and isOAuthComplete returned true, assume success
+      if (isOAuthComplete(url)) {
+        return { success: true, code: 'oauth_complete' };
+      }
+      
+      return { success: false, error: 'OAuth completion not detected' };
+    } catch (error) {
+      console.error('Error parsing OAuth URL:', error);
+      return { success: false, error: 'Invalid OAuth callback URL' };
+    }
+  };
+
   if (error) {
     return (
       <SafeAreaView style={styles.container}>
@@ -340,7 +503,7 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
         <View style={styles.errorContainer}>
           <Icon name="error-outline" size={48} color="#FF6B6B" />
           <Text style={styles.errorTitle}>Connection Error</Text>
-          <Text style={styles.errorMessage}>{error}</Text>
+          <Text style={styles.errorMessage}>{errorMessage || error}</Text>
           
           {/* Help text based on error type */}
           {error.includes('internet') || error.includes('network') ? (
@@ -375,10 +538,12 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
           )}
           
           <View style={styles.buttonContainer}>
-            <TouchableOpacity style={styles.retryButton} onPress={handleRetry}>
-              <Icon name="refresh" size={20} color="#fff" style={styles.buttonIcon} />
-              <Text style={styles.retryButtonText}>Retry</Text>
-            </TouchableOpacity>
+            {isRetryable && (
+              <TouchableOpacity style={styles.retryButton} onPress={handleRetry}>
+                <Icon name="refresh" size={20} color="#fff" style={styles.buttonIcon} />
+                <Text style={styles.retryButtonText}>Retry</Text>
+              </TouchableOpacity>
+            )}
             <TouchableOpacity style={styles.browserButton} onPress={handleOpenInBrowser}>
               <Icon name="open-in-browser" size={20} color="#666" style={styles.buttonIcon} />
               <Text style={styles.browserButtonText}>Open in Browser</Text>
@@ -428,7 +593,7 @@ export const OAuthWebView: React.FC<OAuthWebViewProps> = ({
       <WebView
         ref={webViewRef}
         source={{ uri: url }}
-        onNavigationStateChange={handleNavigationStateChange}
+        onNavigationStateChange={onNavigationStateChange}
         onLoadEnd={handleLoadEnd}
         onError={handleError}
         onHttpError={(syntheticEvent) => {

package/src/index.ts

@@ -14,11 +14,17 @@ export type {
   TrainingModalProps,
   OAuthWebViewProps,
   PlatformConfig,
+  PlatformAuthConfig,
   ApiResponse,
   CredentialsResult,
   OverlayProps,
   BiometricOptions,
   PinRequirements,
+  OnairosConfig,
+  ApiKeyConfig,
+  ApiKeyValidationResult,
+  TestModeOptions,
+  DataRequest,
 } from './types';
 
 export type { EmailVerificationModalProps } from './components/EmailVerificationModal';
@@ -80,8 +86,21 @@ export {
   verifyEmailCode,
   checkEmailVerificationStatus,
   disconnectPlatform,
+  initiateOAuth,
 } from './services/platformAuthService';
 
+// API Key Service - Initialize SDK with API key
+export { 
+  initializeApiKey, 
+  validateApiKey, 
+  getApiConfig, 
+  getApiKey, 
+  isApiKeyInitialized,
+  resetApiKeyService,
+  getAuthHeaders,
+  makeAuthenticatedRequest,
+} from './services/apiKeyService';
+
 // Export API and Services
 export { onairosApi } from './api';
 export { OAuthService } from './services/oauthService';