fix: shortcircuit preHandler hook for user defined assets

SoftwareBrothers · May 30, 2024 · 8e67920 · 8e67920
1 parent 3939e6f
commit 8e67920
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/authentication/protected-routes.handler.ts b/src/authentication/protected-routes.handler.ts
@@ -7,9 +7,15 @@ export const withProtectedRoutesHandler = (
 ): void => {
   const { rootPath } = admin.options;
 
-  fastifyApp.addHook('preHandler', async (request, reply) => {
-    const buildComponentRoute = AdminRouter.routes.find((r) => r.action === 'bundleComponents')?.path
-    if (AdminRouter.assets.find((asset) => request.url.match(asset.path))) {
+  fastifyApp.addHook("preHandler", async (request, reply) => {
+    const buildComponentRoute = AdminRouter.routes.find(
+      (r) => r.action === "bundleComponents"
+    )?.path;
+    const assets = [
+      ...AdminRouter.assets.map((a) => a.path),
+      ...Object.values(admin.options?.assets ?? {}).flat(),
+    ];
+    if (assets.find((a) => request.url.match(a))) {
       return;
     } else if (buildComponentRoute && request.url.match(buildComponentRoute)) {
       return;