From 423d425950cfb76bd84d5a4c106040e40b2b9bb0 Mon Sep 17 00:00:00 2001 From: MartinBraquet Date: Tue, 28 Oct 2025 18:42:37 +0100 Subject: [PATCH] Roolback --- web/lib/firebase/users.ts | 108 +++++++++++++++++++------------------- 1 file changed, 53 insertions(+), 55 deletions(-) diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts index 629c14d6..5abbd567 100644 --- a/web/lib/firebase/users.ts +++ b/web/lib/firebase/users.ts @@ -1,12 +1,10 @@ import {type User} from 'common/user' import dayjs from 'dayjs' import utc from 'dayjs/plugin/utc' -import {getAuth, GoogleAuthProvider, OAuthProvider, signInWithCredential, signInWithPopup, signInWithRedirect} from 'firebase/auth' +import {getAuth, GoogleAuthProvider, OAuthProvider, signInWithPopup} from 'firebase/auth' import {safeLocalStorage} from '../util/local' import {app} from './init' -import {SocialLogin} from "@capgo/capacitor-social-login"; -import {Capacitor} from "@capacitor/core"; dayjs.extend(utc) @@ -45,63 +43,63 @@ export function writeReferralInfo( } } -export function isAndroidWebView() { - try { - // Detect if Android bridge exists - return typeof (window as any).AndroidBridge?.isNativeApp === 'function'; - } catch { - return false; - } -} +// export function isAndroidWebView() { +// try { +// // Detect if Android bridge exists +// return typeof (window as any).AndroidBridge?.isNativeApp === 'function'; +// } catch { +// return false; +// } +// } -export async function googleNativeLogin() { - console.log('Platform:', Capacitor.getPlatform()) - console.log('URL origin:', window.location.origin) +// export async function googleNativeLogin() { +// console.log('Platform:', Capacitor.getPlatform()) +// console.log('URL origin:', window.location.origin) +// +// await SocialLogin.initialize({ +// google: { +// webClientId: '253367029065-khkj31qt22l0vc3v754h09vhpg6t33ad.apps.googleusercontent.com', // Required for Android and Web +// // iOSClientId: 'YOUR_IOS_CLIENT_ID', // Required for iOS +// // iOSServerClientId: 'YOUR_WEB_CLIENT_ID', // Required for iOS offline mode and server authorization (same as webClientId) +// mode: 'online', // 'online' or 'offline' +// } +// }); +// console.log('Done initializing SocialLogin') +// +// // Run the native Google OAuth +// const result: any = await SocialLogin.login({provider: 'google', options: {}}) +// +// console.log('result', result) +// +// // Extract the tokens from the native result +// const idToken = result?.result?.idToken +// const accessToken = result?.result?.accessToken?.token +// +// if (!idToken) { +// throw new Error('No idToken returned from Google login') +// } +// +// // Create a Firebase credential from the Google tokens +// const credential = GoogleAuthProvider.credential(idToken, accessToken) +// +// // Sign in with Firebase using the credential +// const userCredential = await signInWithCredential(auth, credential) +// +// console.log('Firebase user:', userCredential.user) +// +// return userCredential +// } - await SocialLogin.initialize({ - google: { - webClientId: '253367029065-khkj31qt22l0vc3v754h09vhpg6t33ad.apps.googleusercontent.com', // Required for Android and Web - // iOSClientId: 'YOUR_IOS_CLIENT_ID', // Required for iOS - // iOSServerClientId: 'YOUR_WEB_CLIENT_ID', // Required for iOS offline mode and server authorization (same as webClientId) - mode: 'online', // 'online' or 'offline' - } - }); - console.log('Done initializing SocialLogin') - - // Run the native Google OAuth - const result: any = await SocialLogin.login({provider: 'google', options: {}}) - - console.log('result', result) - - // Extract the tokens from the native result - const idToken = result?.result?.idToken - const accessToken = result?.result?.accessToken?.token - - if (!idToken) { - throw new Error('No idToken returned from Google login') - } - - // Create a Firebase credential from the Google tokens - const credential = GoogleAuthProvider.credential(idToken, accessToken) - - // Sign in with Firebase using the credential - const userCredential = await signInWithCredential(auth, credential) - - console.log('Firebase user:', userCredential.user) - - return userCredential -} - -export const isRunningInAPK = () => typeof window !== 'undefined' && (window as any).IS_APK === true +// export const isRunningInAPK = () => typeof window !== 'undefined' && (window as any).IS_APK === true export async function firebaseLogin() { - if (isAndroidWebView()) { - console.log('Running in APK') - return await googleNativeLogin() - // return await signInWithRedirect(auth, new GoogleAuthProvider()) - } - console.log('Running in web') + // if (isAndroidWebView()) { + // console.log('Running in APK') + // return await googleNativeLogin() + // return await signInWithRedirect(auth, new GoogleAuthProvider()) + // } + // console.log('Running in web') const provider = new GoogleAuthProvider() return signInWithPopup(auth, provider).then(async (result) => { return result