From ed4e394308bc05f8063bc11b8bf2b7c8273c5b4a Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Tue, 9 Apr 2024 16:12:03 +0200
Subject: [PATCH] app-backend: separate config injection handling for protected
 and public bundle

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/app-backend/src/service/router.ts | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/plugins/app-backend/src/service/router.ts b/plugins/app-backend/src/service/router.ts
index 0a577002bd..eac3b7f82d 100644
--- a/plugins/app-backend/src/service/router.ts
+++ b/plugins/app-backend/src/service/router.ts
@@ -134,17 +134,6 @@ export async function createRouter(
 
   logger.info(`Serving static app content from ${appDistDir}`);
 
-  let injectedConfigPath: string | undefined;
-  if (!disableConfigInjection) {
-    const appConfigs = await readConfigs({
-      config,
-      appDistDir,
-      env: process.env,
-      schema: options.schema,
-    });
-
-    injectedConfigPath = await injectConfig({ appConfigs, logger, staticDir });
-  }
   const appConfigs = disableConfigInjection
     ? undefined
     : await readConfigs({
@@ -245,7 +234,6 @@ export async function createRouter(
       assetStore,
       staticFallbackHandler,
       appConfigs,
-      injectedConfigPath,
     }),
   );
 
@@ -281,7 +269,6 @@ async function createEntryPointRouter({
   staticFallbackHandler,
   appMode,
   appConfigs,
-  injectedConfigPath,
 }: {
   logger: Logger;
   rootDir: string;
@@ -289,13 +276,11 @@ async function createEntryPointRouter({
   staticFallbackHandler?: express.Handler;
   appMode: 'public' | 'protected';
   appConfigs?: AppConfig[];
-  injectedConfigPath?: string;
 }) {
   const staticDir = resolvePath(rootDir, 'static');
 
-  if (appConfigs) {
-    await injectConfig({ appConfigs, logger, staticDir });
-  }
+  const injectedConfigPath =
+    appConfigs && (await injectConfig({ appConfigs, logger, staticDir }));
 
   await injectAppMode({ appMode, rootDir });