mirror/Compass
1
0
Fork 0
mirror of https://github.com/CompassConnections/Compass.git synced 2026-03-04 14:59:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
MartinBraquet
2025-10-30 16:48:52 +01:00
parent b121d61852
commit 6e537f4cdf
2 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
web/pages/_app.tsx
View File

@@ -13,7 +13,7 @@ import {initTracking} from 'web/lib/service/analytics'
import WebPush from "web/lib/service/web-push";
import AndroidPush from "web/lib/service/android-push";
import {GoogleAuthProvider, signInWithCredential} from "firebase/auth";
import {auth} from "web/lib/firebase/users";
import {auth, GOOGLE_CLIENT_ID} from "web/lib/firebase/users";
// See https://nextjs.org/docs/basic-features/font-optimization#google-fonts
// and if you add a font, you must add it to tailwind config as well for it to work.
@@ -67,16 +67,39 @@ function MyApp({Component, pageProps}: AppProps<PageProps>) {
useEffect(() => {
async function oauthRedirect(event: any) {
const {idToken, accessToken} = event
// Create a Firebase credential from the Google tokens
const credential = GoogleAuthProvider.credential(idToken, accessToken)
console.log('Received oauthRedirect event:', event);
const detail = event.data
console.log('OAuth data:', detail);
if (!detail) {
console.error('No detail found in event');
return;
}
const url = new URL(detail);
// Sign in with Firebase using the credential
const userCredential = await signInWithCredential(auth, credential)
const code = url.searchParams.get('code');
if (!code) {
console.error('No code found in URL');
return;
}
console.log('Firebase user:', userCredential.user)
const codeVerifier = localStorage.getItem('pkce_verifier');
return userCredential
const body = new URLSearchParams({
client_id: GOOGLE_CLIENT_ID,
code,
code_verifier: codeVerifier!,
redirect_uri: 'com.compassmeet://auth',
grant_type: 'authorization_code',
});
console.log('Body:', body);
const tokenResponse = await fetch('https://oauth2.googleapis.com/token', {
method: 'POST',
headers: {'Content-Type': 'application/x-www-form-urlencoded'},
body: body,
});
const tokens = await tokenResponse.json();
console.log('Tokens:', tokens);
}
// Expose globally for native bridge

37
web/pages/auth/callback.tsx
View File

@@ -10,22 +10,27 @@ export default function GoogleAuthCallback() {
console.log('/auth/callback code', code);
if (code) {
const codeVerifier = localStorage.getItem('pkce_verifier');
const body = new URLSearchParams({
client_id: GOOGLE_CLIENT_ID,
code,
code_verifier: codeVerifier!,
redirect_uri: 'com.compassmeet://auth',
grant_type: 'authorization_code',
});
console.log('Body:', body);
const tokenResponse = await fetch('https://oauth2.googleapis.com/token', {
method: 'POST',
headers: {'Content-Type': 'application/x-www-form-urlencoded'},
body: body,
});
const tokens = await tokenResponse.json();
console.log('Tokens:', tokens);
// Send code back to the native app
const deepLink = `com.compassmeet://auth?code=${encodeURIComponent(code)}&state=${encodeURIComponent(state || '')}`;
window.location.href = deepLink;
//
// const codeVerifier = localStorage.getItem('pkce_verifier');
// const body = new URLSearchParams({
// client_id: GOOGLE_CLIENT_ID,
// code,
// code_verifier: codeVerifier!,
// redirect_uri: 'com.compassmeet://auth',
// grant_type: 'authorization_code',
// });
// console.log('Body:', body);
// const tokenResponse = await fetch('https://oauth2.googleapis.com/token', {
// method: 'POST',
// headers: {'Content-Type': 'application/x-www-form-urlencoded'},
// body: body,
// });
// const tokens = await tokenResponse.json();
// console.log('Tokens:', tokens);
// Send code back to the native app
// const deepLink = `com.compassmeet://auth?tokens=${encodeURIComponent(tokens)}}`;