@budibase/worker 3.2.35 → 3.2.37

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "3.2.35",
+  "version": "3.2.37",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -114,5 +114,5 @@
       }
     }
   },
-  "gitHead": "b3b24c0789b35d089f69e9b56ddfc7462c09fc0e"
+  "gitHead": "39f78eda743e69d71d9a247f6dd63a44856b3c72"
 }

package/src/api/controllers/global/configs.ts

@@ -322,27 +322,27 @@ export async function save(
   }
 }
 
-async function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) {
+function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) {
   if (!oidcLogos) {
     return
   }
-  const newConfig: Record<string, string> = {}
-  const keys = Object.keys(oidcLogos.config || {})
-
-  for (const key of keys) {
-    if (!key.endsWith("Etag")) {
-      const etag = oidcLogos.config[`${key}Etag`]
-      const objectStoreUrl = await objectStore.getGlobalFileUrl(
-        oidcLogos.type,
-        key,
-        etag
-      )
-      newConfig[key] = objectStoreUrl
-    } else {
-      newConfig[key] = oidcLogos.config[key]
-    }
-  }
-  oidcLogos.config = newConfig
+  oidcLogos.config = Object.keys(oidcLogos.config || {}).reduce(
+    (acc: any, key: string) => {
+      if (!key.endsWith("Etag")) {
+        const etag = oidcLogos.config[`${key}Etag`]
+        const objectStoreUrl = objectStore.getGlobalFileUrl(
+          oidcLogos.type,
+          key,
+          etag
+        )
+        acc[key] = objectStoreUrl
+      } else {
+        acc[key] = oidcLogos.config[key]
+      }
+      return acc
+    },
+    {}
+  )
 }
 
 export async function find(ctx: UserCtx<void, FindConfigResponse>) {
@@ -370,7 +370,7 @@ export async function find(ctx: UserCtx<void, FindConfigResponse>) {
 
 async function handleConfigType(type: ConfigType, config: Config) {
   if (type === ConfigType.OIDC_LOGOS) {
-    await enrichOIDCLogos(config)
+    enrichOIDCLogos(config)
   } else if (type === ConfigType.AI) {
     await handleAIConfig(config)
   }
@@ -396,7 +396,7 @@ export async function publicOidc(ctx: Ctx<void, GetPublicOIDCConfigResponse>) {
     const oidcCustomLogos = await configs.getOIDCLogosDoc()
 
     if (oidcCustomLogos) {
-      await enrichOIDCLogos(oidcCustomLogos)
+      enrichOIDCLogos(oidcCustomLogos)
     }
 
     if (!oidcConfig) {
@@ -427,7 +427,7 @@ export async function publicSettings(
 
     // enrich the logo url - empty url means deleted
     if (config.logoUrl && config.logoUrl !== "") {
-      config.logoUrl = await objectStore.getGlobalFileUrl(
+      config.logoUrl = objectStore.getGlobalFileUrl(
         "settings",
         "logoUrl",
         config.logoUrlEtag
@@ -437,7 +437,7 @@ export async function publicSettings(
     // enrich the favicon url - empty url means deleted
     const faviconUrl =
       branding.faviconUrl && branding.faviconUrl !== ""
-        ? await objectStore.getGlobalFileUrl(
+        ? objectStore.getGlobalFileUrl(
             "settings",
             "faviconUrl",
             branding.faviconUrlEtag
@@ -522,7 +522,7 @@ export async function upload(ctx: UserCtx<void, UploadConfigFileResponse>) {
 
   ctx.body = {
     message: "File has been uploaded and url stored to config.",
-    url: await objectStore.getGlobalFileUrl(type, name, etag),
+    url: objectStore.getGlobalFileUrl(type, name, etag),
   }
 }