diff --git a/backend/api/src/auth-google.ts b/backend/api/src/auth-google.ts index 53f16d76..4361d7d0 100644 --- a/backend/api/src/auth-google.ts +++ b/backend/api/src/auth-google.ts @@ -1,5 +1,6 @@ import {APIError, APIHandler} from './helpers/endpoint' -import {GOOGLE_CLIENT_ID, REDIRECT_URI} from "common/constants"; +import {GOOGLE_CLIENT_ID} from "common/constants"; +import {REDIRECT_URI} from "common/envs/constants"; export const authGoogle: APIHandler<'auth-google'> = async ( {code, codeVerifier}, diff --git a/common/src/constants.ts b/common/src/constants.ts index 2e696a70..28397d11 100644 --- a/common/src/constants.ts +++ b/common/src/constants.ts @@ -26,4 +26,3 @@ export const WEB_GOOGLE_CLIENT_ID = '253367029065-khkj31qt22l0vc3v754h09vhpg6t33 // export const ANDROID_GOOGLE_CLIENT_ID = '253367029065-s9sr5vqgkhc8f7p5s6ti6a4chqsrqgc4.apps.googleusercontent.com' export const GOOGLE_CLIENT_ID = WEB_GOOGLE_CLIENT_ID -export const REDIRECT_URI = `https://compassmeet.com/auth/callback` diff --git a/common/src/envs/constants.ts b/common/src/envs/constants.ts index 1a3b17b3..90482a05 100644 --- a/common/src/envs/constants.ts +++ b/common/src/envs/constants.ts @@ -58,11 +58,13 @@ console.debug(`Running in ${HOSTING_ENV} (${ENV})`,); // } export const DOMAIN = IS_LOCAL ? LOCAL_WEB_DOMAIN : ENV_CONFIG.domain -export const WEB_URL = IS_LOCAL ? `http://${LOCAL_WEB_DOMAIN}` : `https://www.${DOMAIN}` +export const WEB_URL = IS_LOCAL ? `http://${LOCAL_WEB_DOMAIN}` : `https://${DOMAIN}` export const BACKEND_DOMAIN = IS_LOCAL ? LOCAL_BACKEND_DOMAIN : ENV_CONFIG.backendDomain export const FIREBASE_CONFIG = ENV_CONFIG.firebaseConfig export const PROJECT_ID = ENV_CONFIG.firebaseConfig.projectId +export const REDIRECT_URI = `${WEB_URL}/auth/callback` + export const AUTH_COOKIE_NAME = `FBUSER_${PROJECT_ID.toUpperCase().replace( /-/g, '_' diff --git a/web/lib/firebase/users.ts b/web/lib/firebase/users.ts index 019d64e8..88cc848d 100644 --- a/web/lib/firebase/users.ts +++ b/web/lib/firebase/users.ts @@ -5,7 +5,8 @@ import {getAuth, GoogleAuthProvider, signInWithPopup} from 'firebase/auth' import {safeLocalStorage} from '../util/local' import {app} from './init' -import {GOOGLE_CLIENT_ID, REDIRECT_URI} from "common/constants"; +import {GOOGLE_CLIENT_ID} from "common/constants"; +import {REDIRECT_URI} from "common/envs/constants"; dayjs.extend(utc)