From 8bf5aa77e3f2ab8f209b877c4ceaa66e91e28876 Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Sun, 25 Apr 2021 15:20:51 +0200 Subject: [PATCH] AppConfig: Move default for rendererOrigin to config file As we only use rendererOrigin in the frontend config service, where domain will be used if it is not defined, it makes more sense to move this default behavior to the app config directly. That makes it easier to understand what this variable contains and that it defaults to domain. Signed-off-by: Philip Molares --- src/config/app.config.ts | 5 ++++- src/frontend-config/frontend-config.service.ts | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/config/app.config.ts b/src/config/app.config.ts index c1af96dce..52e593032 100644 --- a/src/config/app.config.ts +++ b/src/config/app.config.ts @@ -20,7 +20,10 @@ export interface AppConfig { const schema = Joi.object({ domain: Joi.string().label('HD_DOMAIN'), - rendererOrigin: Joi.string().optional().label('HD_RENDERER_ORIGIN'), + rendererOrigin: Joi.string() + .default(Joi.ref('domain')) + .optional() + .label('HD_RENDERER_ORIGIN'), port: Joi.number().default(3000).optional().label('PORT'), loglevel: Joi.string() .valid(...Object.values(Loglevel)) diff --git a/src/frontend-config/frontend-config.service.ts b/src/frontend-config/frontend-config.service.ts index 6bb39e4b1..5cb3d7fec 100644 --- a/src/frontend-config/frontend-config.service.ts +++ b/src/frontend-config/frontend-config.service.ts @@ -133,9 +133,7 @@ export class FrontendConfigService { private getIframeCommunication(): IframeCommunicationDto { return { editorOrigin: new URL(this.appConfig.domain), - rendererOrigin: this.appConfig.rendererOrigin - ? new URL(this.appConfig.rendererOrigin) - : new URL(this.appConfig.domain), + rendererOrigin: new URL(this.appConfig.rendererOrigin), }; }