@onairos/react-native 3.1.16 → 3.1.17

package/src/services/googleAuthService.ts

@@ -1,279 +1,279 @@
-/**
- * Google Authentication Service
- * Handles Google Sign-In for user authentication and account creation
- */
-
-import { GoogleSignin, statusCodes } from '@react-native-google-signin/google-signin';
-import AsyncStorage from '@react-native-async-storage/async-storage';
-
-// 🔑 Using the same client ID configuration as platform auth
-let WEB_CLIENT_ID = '1030678346906-lovkuds2ouqmoc8eu5qpo98spa6edv4o.apps.googleusercontent.com';
-let IOS_CLIENT_ID = '1030678346906-lovkuds2ouqmoc8eu5qpo98spa6edv4o.apps.googleusercontent.com';
-
-/**
- * Update Google OAuth client IDs for custom configurations
- */
-export const updateGoogleClientIds = (config: {
-  webClientId?: string;
-  iosClientId?: string;
-}) => {
-  if (config.webClientId) {
-    WEB_CLIENT_ID = config.webClientId;
-  }
-  if (config.iosClientId) {
-    IOS_CLIENT_ID = config.iosClientId;
-  }
-  
-  console.log('✅ Google client IDs updated:', {
-    webClientId: WEB_CLIENT_ID,
-    iosClientId: IOS_CLIENT_ID
-  });
-};
-
-/**
- * Initialize Google Sign-In for user authentication
- */
-const initializeGoogleAuth = () => {
-  GoogleSignin.configure({
-    webClientId: WEB_CLIENT_ID,
-    iosClientId: IOS_CLIENT_ID,
-    
-    // Basic scopes for user authentication
-    scopes: [
-      'openid',
-      'profile',
-      'email'
-    ],
-    
-    // Enable offline access for refresh tokens
-    offlineAccess: true,
-    forceCodeForRefreshToken: true,
-    
-    // Clear settings to avoid conflicts
-    hostedDomain: '',
-    accountName: '',
-  });
-};
-
-/**
- * Sign in with Google and create/authenticate user account
- */
-export const signInWithGoogle = async () => {
-  try {
-    console.log('🔗 Initiating Google Sign-In for user authentication');
-    
-    // Initialize Google Sign-In
-    initializeGoogleAuth();
-    
-    // Check if Google Play Services are available
-    await GoogleSignin.hasPlayServices();
-    
-    // Sign out first to ensure fresh consent
-    try {
-      await GoogleSignin.signOut();
-      console.log('🔄 Signed out to ensure fresh consent');
-    } catch (signOutError) {
-      console.log('ℹ️ Sign out not needed or failed:', signOutError);
-    }
-    
-    // Sign in with Google
-    const userInfo = await GoogleSignin.signIn();
-    console.log('✅ Google Sign-In successful:', userInfo.data?.user?.email);
-    
-    const googleUser = userInfo.data?.user;
-    if (!googleUser || !googleUser.email) {
-      throw new Error('No user data received from Google');
-    }
-    
-    console.log('👤 Google user data:', {
-      email: googleUser.email,
-      name: googleUser.name,
-      photo: googleUser.photo,
-      id: googleUser.id
-    });
-    
-    // Get tokens for account creation
-    const tokens = await GoogleSignin.getTokens();
-    console.log('🔑 Got Google tokens');
-    
-    // Create user account on backend
-    const accountResult = await createUserAccount({
-      email: googleUser.email,
-      name: googleUser.name || googleUser.email.split('@')[0],
-      photoUrl: googleUser.photo || '',
-      googleId: googleUser.id,
-      accessToken: tokens.accessToken,
-      idToken: tokens.idToken
-    });
-    
-    if (accountResult.success) {
-      console.log('✅ User account created/authenticated successfully');
-      
-      // Store authentication data
-      await AsyncStorage.setItem('user_email', googleUser.email);
-      await AsyncStorage.setItem('user_name', googleUser.name || '');
-      await AsyncStorage.setItem('user_photo', googleUser.photo || '');
-      await AsyncStorage.setItem('auth_method', 'google');
-      
-      if (accountResult.token) {
-        await AsyncStorage.setItem('onairos_jwt_token', accountResult.token);
-        await AsyncStorage.setItem('auth_token', accountResult.token);
-      }
-      
-      return {
-        success: true,
-        user: {
-          email: googleUser.email,
-          name: googleUser.name,
-          photo: googleUser.photo,
-          id: googleUser.id
-        },
-        token: accountResult.token,
-        existingUser: accountResult.existingUser
-      };
-    } else {
-      throw new Error(accountResult.message || 'Failed to create user account');
-    }
-    
-  } catch (error: any) {
-    console.error('❌ Google Sign-In error:', error);
-    
-    // Handle specific Google Sign-In errors
-    if (error.code === statusCodes.SIGN_IN_CANCELLED) {
-      return {
-        success: false,
-        message: 'Google Sign-In was cancelled',
-        cancelled: true
-      };
-    } else if (error.code === statusCodes.IN_PROGRESS) {
-      return {
-        success: false,
-        message: 'Google Sign-In is already in progress'
-      };
-    } else if (error.code === statusCodes.PLAY_SERVICES_NOT_AVAILABLE) {
-      return {
-        success: false,
-        message: 'Google Play Services not available'
-      };
-    } else {
-      return {
-        success: false,
-        message: error.message || 'Google Sign-In failed'
-      };
-    }
-  }
-};
-
-/**
- * Create or authenticate user account on backend
- */
-const createUserAccount = async (userData: {
-  email: string;
-  name: string;
-  photoUrl: string;
-  googleId: string;
-  accessToken: string;
-  idToken: string;
-}) => {
-  try {
-    console.log('🔐 Creating/authenticating user account for:', userData.email);
-    
-    // Step 1: Create Enoch user first
-    console.log('🔐 Step 1: Creating Enoch user...');
-    try {
-      const enochRegisterResponse = await fetch('https://api2.onairos.uk/enoch/users/register', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-          email: userData.email,
-          name: userData.name,
-          photoUrl: userData.photoUrl
-        })
-      });
-      
-      console.log('📡 Enoch register response status:', enochRegisterResponse.status);
-      const enochResponseData = await enochRegisterResponse.json();
-      console.log('🔗 Enoch user creation response:', enochResponseData);
-    } catch (enochError) {
-      console.warn('⚠️ Enoch user creation failed (continuing):', enochError);
-    }
-    
-    // Step 2: Create Onairos account to get JWT token
-    console.log('🔐 Step 2: Creating Onairos account...');
-    const onairosSignupResponse = await fetch('https://api2.onairos.uk/register/enoch', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify({
-        email: userData.email,
-        username: userData.name,
-        name: userData.name,
-        googleAuth: true, // Flag to indicate Google authentication
-        googleId: userData.googleId,
-        photoUrl: userData.photoUrl
-      })
-    });
-    
-    console.log('📡 Onairos register response status:', onairosSignupResponse.status);
-    const onairosResponseData = await onairosSignupResponse.json();
-    console.log('🔗 Onairos account creation response:', onairosResponseData);
-    
-    if (onairosSignupResponse.ok && onairosResponseData.token) {
-      return {
-        success: true,
-        token: onairosResponseData.token,
-        existingUser: onairosResponseData.existingUser || false,
-        message: 'Account created/authenticated successfully'
-      };
-    } else {
-      return {
-        success: false,
-        message: onairosResponseData.message || 'Failed to create account'
-      };
-    }
-    
-  } catch (error: any) {
-    console.error('❌ Error creating user account:', error);
-    return {
-      success: false,
-      message: error.message || 'Failed to create user account'
-    };
-  }
-};
-
-/**
- * Check if user is already signed in with Google
- */
-export const isGoogleSignedIn = async () => {
-  try {
-    const currentUser = await GoogleSignin.getCurrentUser();
-    const isSignedIn = currentUser !== null;
-    if (isSignedIn) {
-      return {
-        isSignedIn: true,
-        user: currentUser?.user
-      };
-    }
-    return { isSignedIn: false };
-  } catch (error) {
-    console.error('❌ Error checking Google sign-in status:', error);
-    return { isSignedIn: false };
-  }
-};
-
-/**
- * Sign out from Google
- */
-export const signOutFromGoogle = async () => {
-  try {
-    await GoogleSignin.signOut();
-    console.log('✅ Google sign-out successful');
-    return true;
-  } catch (error) {
-    console.error('❌ Google sign-out error:', error);
-    return false;
-  }
-};
+/**
+ * Google Authentication Service
+ * Handles Google Sign-In for user authentication and account creation
+ */
+
+import { GoogleSignin, statusCodes } from '@react-native-google-signin/google-signin';
+import AsyncStorage from '@react-native-async-storage/async-storage';
+
+// 🔑 Using the same client ID configuration as platform auth
+let WEB_CLIENT_ID = '1030678346906-lovkuds2ouqmoc8eu5qpo98spa6edv4o.apps.googleusercontent.com';
+let IOS_CLIENT_ID = '1030678346906-lovkuds2ouqmoc8eu5qpo98spa6edv4o.apps.googleusercontent.com';
+
+/**
+ * Update Google OAuth client IDs for custom configurations
+ */
+export const updateGoogleClientIds = (config: {
+  webClientId?: string;
+  iosClientId?: string;
+}) => {
+  if (config.webClientId) {
+    WEB_CLIENT_ID = config.webClientId;
+  }
+  if (config.iosClientId) {
+    IOS_CLIENT_ID = config.iosClientId;
+  }
+  
+  console.log('✅ Google client IDs updated:', {
+    webClientId: WEB_CLIENT_ID,
+    iosClientId: IOS_CLIENT_ID
+  });
+};
+
+/**
+ * Initialize Google Sign-In for user authentication
+ */
+const initializeGoogleAuth = () => {
+  GoogleSignin.configure({
+    webClientId: WEB_CLIENT_ID,
+    iosClientId: IOS_CLIENT_ID,
+    
+    // Basic scopes for user authentication
+    scopes: [
+      'openid',
+      'profile',
+      'email'
+    ],
+    
+    // Enable offline access for refresh tokens
+    offlineAccess: true,
+    forceCodeForRefreshToken: true,
+    
+    // Clear settings to avoid conflicts
+    hostedDomain: '',
+    accountName: '',
+  });
+};
+
+/**
+ * Sign in with Google and create/authenticate user account
+ */
+export const signInWithGoogle = async () => {
+  try {
+    console.log('🔗 Initiating Google Sign-In for user authentication');
+    
+    // Initialize Google Sign-In
+    initializeGoogleAuth();
+    
+    // Check if Google Play Services are available
+    await GoogleSignin.hasPlayServices();
+    
+    // Sign out first to ensure fresh consent
+    try {
+      await GoogleSignin.signOut();
+      console.log('🔄 Signed out to ensure fresh consent');
+    } catch (signOutError) {
+      console.log('ℹ️ Sign out not needed or failed:', signOutError);
+    }
+    
+    // Sign in with Google
+    const userInfo = await GoogleSignin.signIn();
+    console.log('✅ Google Sign-In successful:', userInfo.data?.user?.email);
+    
+    const googleUser = userInfo.data?.user;
+    if (!googleUser || !googleUser.email) {
+      throw new Error('No user data received from Google');
+    }
+    
+    console.log('👤 Google user data:', {
+      email: googleUser.email,
+      name: googleUser.name,
+      photo: googleUser.photo,
+      id: googleUser.id
+    });
+    
+    // Get tokens for account creation
+    const tokens = await GoogleSignin.getTokens();
+    console.log('🔑 Got Google tokens');
+    
+    // Create user account on backend
+    const accountResult = await createUserAccount({
+      email: googleUser.email,
+      name: googleUser.name || googleUser.email.split('@')[0],
+      photoUrl: googleUser.photo || '',
+      googleId: googleUser.id,
+      accessToken: tokens.accessToken,
+      idToken: tokens.idToken
+    });
+    
+    if (accountResult.success) {
+      console.log('✅ User account created/authenticated successfully');
+      
+      // Store authentication data
+      await AsyncStorage.setItem('user_email', googleUser.email);
+      await AsyncStorage.setItem('user_name', googleUser.name || '');
+      await AsyncStorage.setItem('user_photo', googleUser.photo || '');
+      await AsyncStorage.setItem('auth_method', 'google');
+      
+      if (accountResult.token) {
+        await AsyncStorage.setItem('onairos_jwt_token', accountResult.token);
+        await AsyncStorage.setItem('auth_token', accountResult.token);
+      }
+      
+      return {
+        success: true,
+        user: {
+          email: googleUser.email,
+          name: googleUser.name,
+          photo: googleUser.photo,
+          id: googleUser.id
+        },
+        token: accountResult.token,
+        existingUser: accountResult.existingUser
+      };
+    } else {
+      throw new Error(accountResult.message || 'Failed to create user account');
+    }
+    
+  } catch (error: any) {
+    console.error('❌ Google Sign-In error:', error);
+    
+    // Handle specific Google Sign-In errors
+    if (error.code === statusCodes.SIGN_IN_CANCELLED) {
+      return {
+        success: false,
+        message: 'Google Sign-In was cancelled',
+        cancelled: true
+      };
+    } else if (error.code === statusCodes.IN_PROGRESS) {
+      return {
+        success: false,
+        message: 'Google Sign-In is already in progress'
+      };
+    } else if (error.code === statusCodes.PLAY_SERVICES_NOT_AVAILABLE) {
+      return {
+        success: false,
+        message: 'Google Play Services not available'
+      };
+    } else {
+      return {
+        success: false,
+        message: error.message || 'Google Sign-In failed'
+      };
+    }
+  }
+};
+
+/**
+ * Create or authenticate user account on backend
+ */
+const createUserAccount = async (userData: {
+  email: string;
+  name: string;
+  photoUrl: string;
+  googleId: string;
+  accessToken: string;
+  idToken: string;
+}) => {
+  try {
+    console.log('🔐 Creating/authenticating user account for:', userData.email);
+    
+    // Step 1: Create Enoch user first
+    console.log('🔐 Step 1: Creating Enoch user...');
+    try {
+      const enochRegisterResponse = await fetch('https://api2.onairos.uk/enoch/users/register', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          email: userData.email,
+          name: userData.name,
+          photoUrl: userData.photoUrl
+        })
+      });
+      
+      console.log('📡 Enoch register response status:', enochRegisterResponse.status);
+      const enochResponseData = await enochRegisterResponse.json();
+      console.log('🔗 Enoch user creation response:', enochResponseData);
+    } catch (enochError) {
+      console.warn('⚠️ Enoch user creation failed (continuing):', enochError);
+    }
+    
+    // Step 2: Create Onairos account to get JWT token
+    console.log('🔐 Step 2: Creating Onairos account...');
+    const onairosSignupResponse = await fetch('https://api2.onairos.uk/register/enoch', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        email: userData.email,
+        username: userData.name,
+        name: userData.name,
+        googleAuth: true, // Flag to indicate Google authentication
+        googleId: userData.googleId,
+        photoUrl: userData.photoUrl
+      })
+    });
+    
+    console.log('📡 Onairos register response status:', onairosSignupResponse.status);
+    const onairosResponseData = await onairosSignupResponse.json();
+    console.log('🔗 Onairos account creation response:', onairosResponseData);
+    
+    if (onairosSignupResponse.ok && onairosResponseData.token) {
+      return {
+        success: true,
+        token: onairosResponseData.token,
+        existingUser: onairosResponseData.existingUser || false,
+        message: 'Account created/authenticated successfully'
+      };
+    } else {
+      return {
+        success: false,
+        message: onairosResponseData.message || 'Failed to create account'
+      };
+    }
+    
+  } catch (error: any) {
+    console.error('❌ Error creating user account:', error);
+    return {
+      success: false,
+      message: error.message || 'Failed to create user account'
+    };
+  }
+};
+
+/**
+ * Check if user is already signed in with Google
+ */
+export const isGoogleSignedIn = async () => {
+  try {
+    const currentUser = await GoogleSignin.getCurrentUser();
+    const isSignedIn = currentUser !== null;
+    if (isSignedIn) {
+      return {
+        isSignedIn: true,
+        user: currentUser?.user
+      };
+    }
+    return { isSignedIn: false };
+  } catch (error) {
+    console.error('❌ Error checking Google sign-in status:', error);
+    return { isSignedIn: false };
+  }
+};
+
+/**
+ * Sign out from Google
+ */
+export const signOutFromGoogle = async () => {
+  try {
+    await GoogleSignin.signOut();
+    console.log('✅ Google sign-out successful');
+    return true;
+  } catch (error) {
+    console.error('❌ Google sign-out error:', error);
+    return false;
+  }
+};