From f5ed1604aa0b3b60a8fcac1cecb03f75a0a65cdb Mon Sep 17 00:00:00 2001
From: Fred Liang <info@fredliang.cn>
Date: Mon, 25 Dec 2023 05:24:01 +0800
Subject: [PATCH] fix: fix removing bearer header
---
app/api/auth.ts | 6 ------
app/api/common.ts | 4 +++-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/app/api/auth.ts b/app/api/auth.ts
index 874401a32..16c8034eb 100644
--- 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
index 13cfab03c..8e029c35b 100644
--- 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(