diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 5a23b35..a78bc6e 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -36,6 +36,7 @@ services: - mongo:/data/db - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro environment: + - BASE_URL=https://example.com - MONGO_INITDB_ROOT_USERNAME=admin - MONGO_INITDB_ROOT_PASSWORD=admin-password - MONGO_USER=user diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml index a1ad2ea..46ea3b0 100644 --- a/docker-compose.testing.yml +++ b/docker-compose.testing.yml @@ -37,6 +37,7 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: + - BASE_URL=http://localhost:5173 - MONGO_URL=mongodb://user:user-password@db-test:27017/odyssey-test - DOCKER_NETWORK=linux-odyssey-players - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID} diff --git a/docker-compose.yml b/docker-compose.yml index c0afae7..e787faf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,7 @@ services: - ./packages:/app/packages - ./quests:/app/quests environment: + - BASE_URL=http://localhost:5173 - MONGO_URL=mongodb://db:27017/odyssey-test - DOCKER_NETWORK=linux-odyssey-players - HOST_PWD=${PWD} diff --git a/server/src/auth/googleStrategy.js b/server/src/auth/googleStrategy.js index 2edb2e2..adf27c0 100644 --- a/server/src/auth/googleStrategy.js +++ b/server/src/auth/googleStrategy.js @@ -43,7 +43,7 @@ export default enabled { clientID: config.google.clientID, clientSecret: config.google.clientSecret, - callbackURL: '/api/v1/auth/google/callback', + callbackURL: `${config.baseUrl}/api/v1/auth/google/callback`, scope: ['profile', 'email'], }, verify diff --git a/server/src/config.js b/server/src/config.js index 78377cd..9dd4f47 100644 --- a/server/src/config.js +++ b/server/src/config.js @@ -1,6 +1,6 @@ import { get } from './utils/env.js' -export default { +const config = { host: get('HOST', 'localhost'), port: get('PORT', 3000), db: get('MONGO_URL', 'mongodb://localhost:27017/odyssey-test'), @@ -15,3 +15,7 @@ export default { clientSecret: get('GOOGLE_CLIENT_SECRET', ''), }, } + +config.baseUrl = get('BASE_URL', `http://${config.host}:${config.port}`) + +export default config diff --git a/server/src/index.js b/server/src/index.js index e6cf522..b2b57f6 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -49,7 +49,7 @@ async function main() { app.use('/api/v1', apiRouter) server.listen(config.port, config.host, () => { - console.log(`Server listening at http://${config.host}:${config.port}`) + console.log(`Server listening at ${config.baseUrl}`) }) }