From 77ab83b43b958d80f304a04c049e7f75df8b9d1d Mon Sep 17 00:00:00 2001
From: Faruk AYDIN <omerfaruk26@gmail.com>
Date: Tue, 23 Nov 2021 11:16:57 +0100
Subject: [PATCH] chore: Use web app url instead of cors protocol, port and
 host

---
 packages/backend/.env-example      |  3 +--
 packages/backend/src/config/app.ts | 10 ++--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/backend/.env-example b/packages/backend/.env-example
index e15a64fd..0edc15f7 100644
--- a/packages/backend/.env-example
+++ b/packages/backend/.env-example
@@ -1,8 +1,7 @@
 HOST=localhost
 PROTOCOL=http
 PORT=3000
-CORS_PORT=3001
-CORS_PROTOCOL=https
+WEB_APP_URL=https://localhost:3001
 APP_ENV=development
 POSTGRES_DATABASE=automatisch_development
 POSTGRES_PORT=5432
diff --git a/packages/backend/src/config/app.ts b/packages/backend/src/config/app.ts
index 4f7dcea2..92e09e4f 100644
--- a/packages/backend/src/config/app.ts
+++ b/packages/backend/src/config/app.ts
@@ -5,8 +5,7 @@ type AppConfig = {
   host: string,
   protocol: string
   port: string,
-  corsPort: string,
-  corsProtocol: string,
+  webAppUrl: string,
   appEnv: string,
   postgresDatabase: string,
   postgresPort: number,
@@ -14,15 +13,13 @@ type AppConfig = {
   postgresUsername: string,
   postgresPassword: string,
   baseUrl?: string
-  webAppUrl?: string
 }
 
 const appConfig: AppConfig = {
   host: process.env.HOST || 'localhost',
   protocol: process.env.PROTOCOL || 'http',
   port: process.env.PORT || '3000',
-  corsPort: process.env.CORS_PORT || '3001',
-  corsProtocol: process.env.CORS_PROTOCOL || 'http',
+  webAppUrl: process.env.webAppUrl || 'https://localhost:3001',
   appEnv: process.env.APP_ENV || 'development',
   postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development',
   postgresPort: parseInt(process.env.POSTGRES_PORT) || 5432,
@@ -31,9 +28,6 @@ const appConfig: AppConfig = {
   postgresPassword: process.env.POSTGRESS_PASSWORD,
 }
 
-const webAppUrl = `${appConfig.corsProtocol}://${appConfig.host}:${appConfig.corsPort}`;
-appConfig.webAppUrl = webAppUrl;
-
 const baseUrl = `${appConfig.protocol}://${appConfig.host}:${appConfig.port}`;
 appConfig.baseUrl = baseUrl;