Refactor rootUrl

apps/api/src/environments/environment.prod.ts

@@ -1,4 +1,7 @@
+import { DEFAULT_HOST, DEFAULT_PORT } from '@ghostfolio/common/config';
+
 export const environment = {
   production: true,
+  rootUrl: `http://${DEFAULT_HOST}:${DEFAULT_PORT}`,
   version: `${require('../../../../package.json').version}`
 };

apps/api/src/environments/environment.ts

@@ -1,4 +1,7 @@
+import { DEFAULT_HOST } from '@ghostfolio/common/config';
+
 export const environment = {
   production: false,
+  rootUrl: `https://${DEFAULT_HOST}:4200`,
   version: 'dev'
 };

apps/api/src/main.ts

@@ -1,4 +1,8 @@
-import { STORYBOOK_PATH } from '@ghostfolio/common/config';
+import {
+  DEFAULT_HOST,
+  DEFAULT_PORT,
+  STORYBOOK_PATH
+} from '@ghostfolio/common/config';
 
 import {
   Logger,
@@ -75,8 +79,8 @@ async function bootstrap() {
 
   app.use(HtmlTemplateMiddleware);
 
-  const HOST = configService.get<string>('HOST') || '0.0.0.0';
+  const HOST = configService.get<string>('HOST') || DEFAULT_HOST;
-  const PORT = configService.get<number>('PORT') || 3333;
+  const PORT = configService.get<number>('PORT') || DEFAULT_PORT;
 
   await app.listen(PORT, HOST, () => {
     logLogo();

apps/api/src/middlewares/html-template.middleware.ts

@@ -2,7 +2,6 @@ import { environment } from '@ghostfolio/api/environments/environment';
 import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service';
 import {
   DEFAULT_LANGUAGE_CODE,
-  DEFAULT_ROOT_URL,
   STORYBOOK_PATH,
   SUPPORTED_LANGUAGE_CODES
 } from '@ghostfolio/common/config';
@@ -126,7 +125,7 @@ export const HtmlTemplateMiddleware = async (
   }
 
   const currentDate = format(new Date(), DATE_FORMAT);
-  const rootUrl = process.env.ROOT_URL || DEFAULT_ROOT_URL;
+  const rootUrl = process.env.ROOT_URL || environment.rootUrl;
 
   if (
     path.startsWith('/api/') ||

apps/api/src/services/configuration/configuration.service.ts

@@ -1,11 +1,13 @@
+import { environment } from '@ghostfolio/api/environments/environment';
 import { Environment } from '@ghostfolio/api/services/interfaces/environment.interface';
 import {
   CACHE_TTL_NO_CACHE,
+  DEFAULT_HOST,
+  DEFAULT_PORT,
   DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY,
   DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY,
   DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY,
-  DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT,
+  DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT
-  DEFAULT_ROOT_URL
 } from '@ghostfolio/common/config';
 
 import { Injectable } from '@nestjs/common';
@@ -49,11 +51,11 @@ export class ConfigurationService {
       GOOGLE_SHEETS_ACCOUNT: str({ default: '' }),
       GOOGLE_SHEETS_ID: str({ default: '' }),
       GOOGLE_SHEETS_PRIVATE_KEY: str({ default: '' }),
-      HOST: host({ default: '0.0.0.0' }),
+      HOST: host({ default: DEFAULT_HOST }),
       JWT_SECRET_KEY: str({}),
       MAX_ACTIVITIES_TO_IMPORT: num({ default: Number.MAX_SAFE_INTEGER }),
       MAX_CHART_ITEMS: num({ default: 365 }),
-      PORT: port({ default: 3333 }),
+      PORT: port({ default: DEFAULT_PORT }),
       PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY: num({
         default: DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY
       }),
@@ -71,7 +73,9 @@ export class ConfigurationService {
       REDIS_PASSWORD: str({ default: '' }),
       REDIS_PORT: port({ default: 6379 }),
       REQUEST_TIMEOUT: num({ default: ms('3 seconds') }),
-      ROOT_URL: url({ default: DEFAULT_ROOT_URL }),
+      ROOT_URL: url({
+        default: environment.rootUrl
+      }),
       STRIPE_PUBLIC_KEY: str({ default: '' }),
       STRIPE_SECRET_KEY: str({ default: '' }),
       TWITTER_ACCESS_TOKEN: str({ default: 'dummyAccessToken' }),

apps/client/src/index.html

@@ -46,7 +46,7 @@
       type="image/png"
     />
     <link
-      href="${rootUrl}/api/assets/${languageCode}/site.webmanifest"
+      href="../api/assets/${languageCode}/site.webmanifest"
       rel="manifest"
     />
   </head>

libs/common/src/lib/config.ts

@@ -48,13 +48,14 @@ export const PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE_PRIORITY_LOW =
 
 export const DEFAULT_CURRENCY = 'USD';
 export const DEFAULT_DATE_FORMAT_MONTH_YEAR = 'MMM yyyy';
+export const DEFAULT_HOST = '0.0.0.0';
 export const DEFAULT_LANGUAGE_CODE = 'en';
 export const DEFAULT_PAGE_SIZE = 50;
+export const DEFAULT_PORT = 3333;
 export const DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY = 1;
 export const DEFAULT_PROCESSOR_GATHER_HISTORICAL_MARKET_DATA_CONCURRENCY = 1;
 export const DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY = 1;
 export const DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT = 30000;
-export const DEFAULT_ROOT_URL = 'https://localhost:4200';
 
 // USX is handled separately
 export const DERIVED_CURRENCIES = [