groot/automatisch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #805 from automatisch/revise-web-app-url

Browse Source 
feat: prioritize WEB_APP_URL
This commit is contained in:
Ömer Faruk Aydın
2022-12-16 23:12:09 +03:00
committed by GitHub
parent 9a55333ce8 5d24216124
commit d1245705de
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/backend/src/config/app.ts
View File

@@ -1,3 +1,4 @@
import { URL } from 'node:url';
import * as dotenv from 'dotenv'; import * as dotenv from 'dotenv';
dotenv.config(); dotenv.config();
@@ -38,14 +39,23 @@ const port = process.env.PORT || '3000';
const serveWebAppSeparately = const serveWebAppSeparately =
process.env.SERVE_WEB_APP_SEPARATELY === 'true' ? true : false; process.env.SERVE_WEB_APP_SEPARATELY === 'true' ? true : false;
let webAppUrl = `${protocol}://${host}:${port}`; let apiUrl = (new URL(`${protocol}://${host}:${port}`)).toString();
const webhookUrl = process.env.WEBHOOK_URL || webAppUrl; apiUrl = apiUrl.substring(0, apiUrl.length - 1);
if (serveWebAppSeparately) { // use apiUrl by default, which has less priority over the following cases
webAppUrl = process.env.WEB_APP_URL || 'http://localhost:3001'; let webAppUrl = apiUrl;
if (process.env.WEB_APP_URL) {
// use env. var. if provided
webAppUrl = (new URL(process.env.WEB_APP_URL)).toString();
webAppUrl = webAppUrl.substring(0, webAppUrl.length - 1);
} else if (serveWebAppSeparately) {
// no env. var. and serving separately, sign of development
webAppUrl = 'http://localhost:3001'
} }
const baseUrl = `${protocol}://${host}:${port}`; let webhookUrl = (new URL(process.env.WEBHOOK_URL || apiUrl)).toString();
webhookUrl = webhookUrl.substring(0, webhookUrl.length - 1);
const appEnv = process.env.APP_ENV || 'development'; const appEnv = process.env.APP_ENV || 'development';
@@ -75,7 +85,7 @@ const appConfig: AppConfig = {
enableBullMQDashboard: process.env.ENABLE_BULLMQ_DASHBOARD === 'true', enableBullMQDashboard: process.env.ENABLE_BULLMQ_DASHBOARD === 'true',
bullMQDashboardUsername: process.env.BULLMQ_DASHBOARD_USERNAME, bullMQDashboardUsername: process.env.BULLMQ_DASHBOARD_USERNAME,
bullMQDashboardPassword: process.env.BULLMQ_DASHBOARD_PASSWORD, bullMQDashboardPassword: process.env.BULLMQ_DASHBOARD_PASSWORD,
baseUrl, baseUrl: apiUrl,
webAppUrl, webAppUrl,
webhookUrl, webhookUrl,
telemetryEnabled: process.env.TELEMETRY_ENABLED === 'false' ? false : true, telemetryEnabled: process.env.TELEMETRY_ENABLED === 'false' ? false : true,