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

Refactor redirect url

Browse Source
This commit is contained in:
MartinBraquet
2025-10-30 20:37:12 +01:00
parent 98ab8971b4
commit 31718f1c4d
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/api/src/auth-google.ts
View File

@@ -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},

1
common/src/constants.ts
View File

@@ -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`

4
common/src/envs/constants.ts
View File

@@ -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,
'_'

3
web/lib/firebase/users.ts
View File

@@ -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)