@onairos/react-native 3.0.70 → 3.0.72

package/src/services/platformAuthService.ts

@@ -1,29 +1,19 @@
 import { Platform, Linking } from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
-
-// Define types for platform auth configuration
-interface PlatformAuthConfig {
-  hasNativeSDK: boolean;
-  nativeSDKPackage?: string;
-  authEndpoint: string;
-  color: string;
-  clientId?: string;
-  redirectUri?: string;
-  scope?: string;
-  responseType?: string;
-}
+import type { PlatformAuthConfig } from '../types';
+import { makeAuthenticatedRequest, getApiConfig } from './apiKeyService';
 
 // Configuration for each platform's authentication
 let PLATFORM_AUTH_CONFIG: Record<string, PlatformAuthConfig> = {
   instagram: {
     hasNativeSDK: false, // Instagram uses OAuth WebView flow
-    authEndpoint: 'https://api2.onairos.uk/instagram/authorize',
+    authEndpoint: '/instagram/authorize',
     color: '#E1306C',
   },
   youtube: {
     hasNativeSDK: true, // Native Google Sign-In SDK enabled
     nativeSDKPackage: '@react-native-google-signin/google-signin',
-    authEndpoint: 'https://api2.onairos.uk/youtube/authorize',
+    authEndpoint: '/youtube/authorize',
     color: '#FF0000',
     clientId: '1030678346906-lovkuds2ouqmoc8eu5qpo98spa6edv4o.apps.googleusercontent.com',
     redirectUri: 'onairosevents://auth/callback',
@@ -32,17 +22,17 @@ let PLATFORM_AUTH_CONFIG: Record<string, PlatformAuthConfig> = {
   },
   reddit: {
     hasNativeSDK: false,
-    authEndpoint: 'https://api2.onairos.uk/reddit/authorize',
+    authEndpoint: '/reddit/authorize',
     color: '#FF4500',
   },
   pinterest: {
     hasNativeSDK: false,
-    authEndpoint: 'https://api2.onairos.uk/pinterest/authorize',
+    authEndpoint: '/pinterest/authorize',
     color: '#E60023',
   },
   email: {
     hasNativeSDK: false,
-    authEndpoint: 'https://api2.onairos.uk/gmail/authorize',
+    authEndpoint: '/gmail/authorize',
     color: '#4285F4',
   },
 };
@@ -123,34 +113,12 @@ export const initiateOAuth = async (platform: string, username: string, appName?
 
       console.log('📤 Sending Instagram OAuth request:', jsonData);
 
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), 30000); // 30 second timeout
-
-      let response: Response;
-      try {
-        response = await fetch('https://api2.onairos.uk/instagram/authorize', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'User-Agent': 'OnairosReactNative/1.0',
-          },
-          body: JSON.stringify(jsonData),
-          signal: controller.signal,
-        });
-      } catch (fetchError) {
-        clearTimeout(timeoutId);
-        
-        if (fetchError.name === 'AbortError') {
-          throw new Error(`Request timeout: Instagram OAuth server took too long to respond`);
-        }
-        
-        throw new Error(`Network error: ${fetchError.message || 'Failed to connect to Instagram OAuth server'}`);
-      }
-      
-      clearTimeout(timeoutId);
+      const response = await makeAuthenticatedRequest(PLATFORM_AUTH_CONFIG[platform].authEndpoint, {
+        method: 'POST',
+        body: JSON.stringify(jsonData),
+      });
 
       console.log('📡 Instagram OAuth response status:', response.status);
-      console.log('📡 Instagram OAuth response headers:', response.headers);
 
       if (!response.ok) {
         const errorText = await response.text();
@@ -187,35 +155,13 @@ export const initiateOAuth = async (platform: string, username: string, appName?
 
     console.log(`📤 Sending ${platform} OAuth request:`, jsonData);
 
-    // Make the request to get the OAuth URL with enhanced error handling
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 30000); // 30 second timeout
-
-    let response: Response;
-    try {
-      response = await fetch(PLATFORM_AUTH_CONFIG[platform].authEndpoint, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          'User-Agent': 'OnairosReactNative/1.0',
-        },
-        body: JSON.stringify(jsonData),
-        signal: controller.signal,
-      });
-    } catch (fetchError) {
-      clearTimeout(timeoutId);
-      
-      if (fetchError.name === 'AbortError') {
-        throw new Error(`Request timeout: ${platform} OAuth server took too long to respond`);
-      }
-      
-      throw new Error(`Network error: ${fetchError.message || 'Failed to connect to OAuth server'}`);
-    }
-    
-    clearTimeout(timeoutId);
+    // Make the authenticated request to get the OAuth URL
+    const response = await makeAuthenticatedRequest(PLATFORM_AUTH_CONFIG[platform].authEndpoint, {
+      method: 'POST',
+      body: JSON.stringify(jsonData),
+    });
 
     console.log(`📡 ${platform} OAuth response status:`, response.status);
-    console.log(`📡 ${platform} OAuth response headers:`, response.headers);
 
     if (!response.ok) {
       const errorText = await response.text();
@@ -837,42 +783,62 @@ export const requestEmailVerification = async (email: string, testMode = false):
 }> => {
   try {
     console.log('📧 Requesting email verification for:', email);
-    console.log('🔍 Test mode:', testMode);
-    
-    // Use the correct endpoint: /email/verify
-    const response = await fetch('https://api2.onairos.uk/email/verify', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ email }),
-    });
+    console.log('🧪 Test mode:', testMode);
     
-    const result = await response.json();
+    if (!email || !email.includes('@')) {
+      return {
+        success: false,
+        error: 'Valid email address is required',
+      };
+    }
     
-    if (response.ok && result.success) {
-      console.log('✅ Email verification requested successfully');
-      
-      const message = testMode 
-        ? 'Verification code sent to your email (testing mode: any code accepted)'
-        : result.message || 'Verification code sent to your email';
-      
+    // In test mode, always return success
+    if (testMode) {
+      console.log('🧪 Test mode: Always returning success');
       return {
         success: true,
-        message,
+        message: 'Email verification sent successfully (test mode)',
       };
-    } else {
-      console.error('❌ Email verification request failed:', result.error);
+    }
+    
+    // Production mode: Make real API call with API key authentication
+    try {
+      const response = await makeAuthenticatedRequest('/email/verification', {
+        method: 'POST',
+        body: JSON.stringify({
+          email,
+          action: 'request',
+        }),
+      });
+      
+      const result = await response.json();
+      console.log('📡 Email verification API response:', result);
+      
+      if (response.ok && result.success) {
+        console.log('✅ Email verification request sent');
+        return {
+          success: true,
+          message: result.message || 'Email verification sent successfully',
+        };
+      } else {
+        console.error('❌ Email verification request failed:', result.error);
+        return {
+          success: false,
+          error: result.error || 'Failed to send verification email',
+        };
+      }
+    } catch (apiError) {
+      console.error('❌ Email verification API call failed:', apiError);
       return {
         success: false,
-        error: result.error || 'Failed to send verification code',
+        error: 'Network error while sending verification email',
       };
     }
   } catch (error) {
     console.error('❌ Email verification request error:', error);
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Network error',
+      error: error instanceof Error ? error.message : 'Unknown error',
     };
   }
 };
@@ -885,28 +851,42 @@ export const verifyEmailCode = async (email: string, code: string, testMode = fa
 }> => {
   try {
     console.log('🔍 Verifying email code for:', email);
-    console.log('🔍 Test mode:', testMode);
+    console.log('🔑 Code length:', code.length);
+    console.log('🧪 Test mode:', testMode);
     
-    // In test mode, accept any code
+    if (!email || !email.includes('@')) {
+      return {
+        success: false,
+        error: 'Valid email address is required',
+      };
+    }
+    
+    if (!code || code.length < 4) {
+      return {
+        success: false,
+        error: 'Valid verification code is required',
+      };
+    }
+    
+    // In test mode, always return success
     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;
+      console.log('🧪 Test mode: Always returning success');
       return {
         success: true,
-        message: 'Email verified successfully (test mode: all codes accepted)',
-        existingUser: simulateExistingUser,
+        message: 'Email verification successful (test mode)',
+        existingUser: false,
       };
     }
     
-    // Production mode: Make real API call with proper validation
+    // Production mode: Make real API call with API key authentication
     try {
-      const response = await fetch('https://api2.onairos.uk/email/verify/confirm', {
+      const response = await makeAuthenticatedRequest('/email/verification', {
         method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ email, code }),
+        body: JSON.stringify({
+          email,
+          code,
+          action: 'verify',
+        }),
       });
       
       const result = await response.json();
@@ -916,21 +896,21 @@ export const verifyEmailCode = async (email: string, code: string, testMode = fa
         console.log('✅ Email verification successful');
         return {
           success: true,
-          message: result.message || 'Email verified successfully',
-          existingUser: result.existingUser || false, // Backend should return this flag
+          message: result.message || 'Email verification successful',
+          existingUser: result.existingUser || false,
         };
       } else {
         console.error('❌ Email verification failed:', result.error);
         return {
           success: false,
-          error: result.error || 'Invalid verification code',
+          error: result.error || 'Email verification failed',
         };
       }
     } catch (apiError) {
       console.error('❌ Email verification API call failed:', apiError);
       return {
         success: false,
-        error: 'Network error during verification',
+        error: 'Network error during email verification',
       };
     }
   } catch (error) {
@@ -962,13 +942,10 @@ export const checkEmailVerificationStatus = async (email: string, testMode = fal
       };
     }
     
-    // Production mode: Make real API call
+    // Production mode: Make real API call with API key authentication
     try {
-      const response = await fetch(`https://api2.onairos.uk/email/verify/status/${encodeURIComponent(email)}`, {
+      const response = await makeAuthenticatedRequest(`/email/verify/status/${encodeURIComponent(email)}`, {
         method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-        },
       });
       
       const result = await response.json();
@@ -1014,41 +991,45 @@ export const disconnectPlatform = async (platform: string, username: string): Pr
   error?: string;
 }> => {
   try {
-    console.log(`🔌 Disconnecting ${platform} for user:`, username);
+    console.log('🔌 Disconnecting platform:', platform, 'for user:', username);
     
-    const response = await fetch('https://api2.onairos.uk/revoke', {
+    if (!platform || !username) {
+      return {
+        success: false,
+        error: 'Platform and username are required',
+      };
+    }
+    
+    // Make authenticated API call to disconnect platform
+    const response = await makeAuthenticatedRequest('/revoke', {
       method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
       body: JSON.stringify({
-        Info: {
-          connection: platform.charAt(0).toUpperCase() + platform.slice(1), // Capitalize platform name
-          username: username,
-        },
+        platform,
+        username,
       }),
     });
     
     const result = await response.json();
+    console.log('📡 Platform disconnect API response:', result);
     
     if (response.ok && result.success) {
-      console.log(`✅ ${platform} disconnected successfully`);
+      console.log('✅ Platform disconnected successfully');
       return {
         success: true,
-        message: result.message || `${platform} disconnected successfully`,
+        message: result.message || 'Platform disconnected successfully',
       };
     } else {
-      console.error(`❌ ${platform} disconnection failed:`, result.error);
+      console.error('❌ Platform disconnect failed:', result.error);
       return {
         success: false,
-        error: result.error || `Failed to disconnect ${platform}`,
+        error: result.error || 'Failed to disconnect platform',
       };
     }
   } catch (error) {
-    console.error(`❌ ${platform} disconnection error:`, error);
+    console.error('❌ Platform disconnect error:', error);
     return {
       success: false,
-      error: error instanceof Error ? error.message : 'Network error',
+      error: error instanceof Error ? error.message : 'Platform disconnect failed',
     };
   }
 };

package/src/types.ts

@@ -20,9 +20,33 @@ export interface TestModeOptions {
   skipRealConnections?: boolean; // Allow mock platform connections
 }
 
+export interface ApiKeyConfig {
+  apiKey: string;
+  environment?: 'production' | 'staging' | 'development';
+  enableLogging?: boolean;
+}
+
+export interface ApiKeyValidationResult {
+  isValid: boolean;
+  error?: string;
+  permissions?: string[];
+  rateLimits?: {
+    remaining: number;
+    resetTime: number;
+  };
+}
+
+export interface OnairosConfig {
+  apiKey: string;
+  environment?: 'production' | 'staging' | 'development';
+  enableLogging?: boolean;
+  timeout?: number;
+  retryAttempts?: number;
+}
+
 export interface UniversalOnboardingProps {
   visible: boolean;
-  onClose: () => void;
+  onClose: (result?: any) => void;
   AppName: string;
   appIcon?: any; // Optional app icon (React Native ImageSourcePropType)
   requestData: {
@@ -35,17 +59,19 @@ export interface UniversalOnboardingProps {
     sentiment_analysis?: DataRequest;
     [key: string]: DataTier | DataRequest | undefined;
   };
-  returnLink: string;
+  returnLink?: string;
+  prefillUrl?: string;
   onComplete: (apiUrl: string, token: string, data: any) => void;
   embedd?: boolean;
   debug?: boolean;
-  test?: boolean | TestModeOptions; // Enhanced test mode with options
+  testMode?: TestModeOptions | boolean;
   buttonType?: 'default' | 'pill';
   buttonForm?: 'signup' | 'login';
   preferredPlatform?: string;
   inferenceData?: any; // Data used for AI inference API requests
   auto?: boolean; // If true, use inferenceData for automatic API requests
   partner?: string; // Partner identifier (e.g., "couplebible")
+  config?: OnairosConfig; // Add API configuration
 }
 
 export interface ConnectionStatus {
@@ -148,6 +174,17 @@ export interface PlatformConfig {
   description?: string;
 }
 
+export interface PlatformAuthConfig {
+  hasNativeSDK: boolean;
+  nativeSDKPackage?: string;
+  authEndpoint: string;
+  color: string;
+  clientId?: string;
+  redirectUri?: string;
+  scope?: string;
+  responseType?: string;
+}
+
 export interface ApiResponse<T> {
   success: boolean;
   data?: T;