dynamic loading of cors urls

thirdweb-dev · Jan 11, 2024 · 177b47f · 177b47f
1 parent ada171e
commit 177b47f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/server/middleware/cors/cors.ts b/src/server/middleware/cors/cors.ts
@@ -4,6 +4,7 @@ import {
   FastifyRequest,
   HookHandlerDoneFunction,
 } from "fastify";
+import { getConfig } from "../../../utils/cache/getConfig";
 import {
   addAccessControlRequestHeadersToVaryHeader,
   addOriginToVaryHeader,
@@ -101,13 +102,18 @@ const defaultOptions = {
   strictPreflight: true,
 };
 
-export const fastifyCors = (
+export const fastifyCors = async (
   fastify: FastifyInstance,
   req: FastifyRequest,
   reply: FastifyReply,
   opts: FastifyCorsOptions,
   next: HookHandlerDoneFunction,
 ) => {
+  const config = await getConfig();
+
+  const originArray = config.accessControlAllowOrigin.split(",") as string[];
+  opts.origin = originArray;
+
   let hideOptionsRoute = true;
   if (opts.hideOptionsRoute !== undefined) {
     hideOptionsRoute = opts.hideOptionsRoute;

diff --git a/src/server/middleware/cors/index.ts b/src/server/middleware/cors/index.ts
@@ -1,19 +1,13 @@
 import { FastifyInstance } from "fastify";
-import { getConfig } from "../../../utils/cache/getConfig";
 import { fastifyCors } from "./cors";
 
 export const withCors = async (server: FastifyInstance) => {
-  const config = await getConfig();
-
-  const originArray = config.accessControlAllowOrigin.split(",") as string[];
-
   server.addHook("preHandler", (request, reply, next) => {
     fastifyCors(
       server,
       request,
       reply,
       {
-        origin: originArray,
         credentials: true,
       },
       next,