Merge remote-tracking branch 'origin/master'

ChatAnyTeam · Aug 15, 2024 · a102bed · a102bed
2 parents cd8bca4 + 2b0f867
commit a102bed
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/api/mj/[...path]/route.ts b/app/api/mj/[...path]/route.ts
@@ -59,10 +59,10 @@ async function handle(
     });
   }
 
-  const bearToken = req.headers.get("Authorization") ?? "";
-  const token = bearToken.trim().replaceAll("Bearer ", "").trim();
+  const bearToken = req.headers.get("Authorization")?.trim() ?? "";
+  const token = bearToken.startsWith("Bearer ") ? bearToken.slice(7).trim() : bearToken;
 
-  const key = token ? token : serverConfig.mjpApiKey;
+  const key = serverConfig.mjpApiKey || token;
 
   if (!key) {
     return NextResponse.json(