From 7bc4dad52c2184eb729d6c1c091edb950aa97417 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 2 Aug 2023 16:57:48 +0200
Subject: [PATCH] app-backend: move reading of static config to createRouter

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/app-backend/src/service/appPlugin.ts | 10 +---------
 plugins/app-backend/src/service/router.ts    | 11 +++++++++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugins/app-backend/src/service/appPlugin.ts b/plugins/app-backend/src/service/appPlugin.ts
index 7f521acfb9..9ba2ea6d6c 100644
--- a/plugins/app-backend/src/service/appPlugin.ts
+++ b/plugins/app-backend/src/service/appPlugin.ts
@@ -53,22 +53,14 @@ export const appPlugin = createBackendPlugin({
       async init({ logger, config, database, httpRouter }) {
         const appPackageName =
           config.getOptionalString('app.packageName') ?? 'app';
-        const disableConfigInjection = config.getOptionalBoolean(
-          'app.disableConfigInjection',
-        );
-        const disableStaticFallbackCache = config.getOptionalBoolean(
-          'app.disableStaticFallbackCache',
-        );
-
         const winstonLogger = loggerToWinstonLogger(logger);
 
         const router = await createRouter({
           logger: winstonLogger,
           config,
-          database: disableStaticFallbackCache ? undefined : database,
+          database,
           appPackageName,
           staticFallbackHandler,
-          disableConfigInjection,
         });
         httpRouter.use(router);
       },
diff --git a/plugins/app-backend/src/service/router.ts b/plugins/app-backend/src/service/router.ts
index 4e94138439..40e291c19d 100644
--- a/plugins/app-backend/src/service/router.ts
+++ b/plugins/app-backend/src/service/router.ts
@@ -92,6 +92,13 @@ export async function createRouter(
 ): Promise<express.Router> {
   const { config, logger, appPackageName, staticFallbackHandler } = options;
 
+  const disableConfigInjection =
+    options.disableConfigInjection ??
+    config.getOptionalBoolean('app.disableConfigInjection');
+  const disableStaticFallbackCache = config.getOptionalBoolean(
+    'app.disableStaticFallbackCache',
+  );
+
   const appDistDir = resolvePackagePath(appPackageName, 'dist');
   const staticDir = resolvePath(appDistDir, 'static');
 
@@ -107,7 +114,7 @@ export async function createRouter(
 
   logger.info(`Serving static app content from ${appDistDir}`);
 
-  if (!options.disableConfigInjection) {
+  if (!disableConfigInjection) {
     const appConfigs = await readConfigs({
       config,
       appDistDir,
@@ -131,7 +138,7 @@ export async function createRouter(
     }),
   );
 
-  if (options.database) {
+  if (options.database && !disableStaticFallbackCache) {
     const store = await StaticAssetsStore.create({
       logger,
       database: options.database,