Merge pull request #3626 from fredliang44/main

fix: removing `bearer` from auth header when using azure
ChatGPTNextWeb · Dec 24, 2023 · bd1e311 · bd1e311
2 parents 771cc9e + c127db3
commit bd1e311
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/app/api/auth.ts b/app/api/auth.ts
@@ -57,12 +57,6 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) {
   if (!apiKey) {
     const serverConfig = getServerSideConfig();
 
-    // const systemApiKey = serverConfig.isAzure
-    //   ? serverConfig.azureApiKey
-    //   : serverConfig.isGoogle
-    //   ? serverConfig.googleApiKey
-    //   : serverConfig.apiKey;
-
     const systemApiKey =
       modelProvider === ModelProvider.GeminiPro
         ? serverConfig.googleApiKey

diff --git a/app/api/common.ts b/app/api/common.ts
@@ -9,7 +9,9 @@ const serverConfig = getServerSideConfig();
 export async function requestOpenai(req: NextRequest) {
   const controller = new AbortController();
 
-  const authValue = req.headers.get("Authorization") ?? "";
+  const authValue =
+    req.headers.get("Authorization")?.trim().replaceAll("Bearer ", "").trim() ??
+    "";
   const authHeaderName = serverConfig.isAzure ? "api-key" : "Authorization";
 
   let path = `${req.nextUrl.pathname}${req.nextUrl.search}`.replaceAll(