mirror/ChatGPT-Next-Web
2
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2024-11-27 08:53:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5562 from ChatGPTNextWeb/hotfix-google-api

Browse Source 
hotfix for `x-goog-api-key`
This commit is contained in:
Lloyd Zhou 2024-09-29 15:57:20 +08:00 committed by GitHub
commit 452fc86ad1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/google.ts
View File

@ -23,7 +23,8 @@ export async function handle(
}); });
} }
const bearToken = req.headers.get("Authorization") ?? ""; const bearToken =
req.headers.get("x-goog-api-key") || req.headers.get("Authorization") || "";
const token = bearToken.trim().replaceAll("Bearer ", "").trim(); const token = bearToken.trim().replaceAll("Bearer ", "").trim();
const apiKey = token ? token : serverConfig.googleApiKey; const apiKey = token ? token : serverConfig.googleApiKey;
@ -92,7 +93,7 @@ async function request(req: NextRequest, apiKey: string) {
10 * 60 * 1000, 10 * 60 * 1000,
); );
const fetchUrl = `${baseUrl}${path}${ const fetchUrl = `${baseUrl}${path}${
req?.nextUrl?.searchParams?.get("alt") === "sse" ? "&alt=sse" : "" req?.nextUrl?.searchParams?.get("alt") === "sse" ? "?alt=sse" : ""
}`; }`;
console.log("[Fetch Url] ", fetchUrl); console.log("[Fetch Url] ", fetchUrl);
@ -100,8 +101,8 @@ async function request(req: NextRequest, apiKey: string) {
headers: { headers: {
"Content-Type": "application/json", "Content-Type": "application/json",
"Cache-Control": "no-store", "Cache-Control": "no-store",
"x-google-api-key": "x-goog-api-key":
req.headers.get("x-google-api-key") || req.headers.get("x-goog-api-key") ||
(req.headers.get("Authorization") ?? "").replace("Bearer ", ""), (req.headers.get("Authorization") ?? "").replace("Bearer ", ""),
}, },
method: req.method, method: req.method,