GithubProxy/ChatGPT-Next-Web
1
0
Fork 1
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-05-23 22:20:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: gemini authentication error

Browse Source
This commit is contained in:
Hk-Gosuto 2023-12-30 11:36:45 +08:00
parent 2a9b36f626
commit 98b5ace66e
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/auth.ts
View File

@ -28,7 +28,12 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) {
const authToken = req.headers.get("Authorization") ?? ""; const authToken = req.headers.get("Authorization") ?? "";
// check if it is openai api key or user token // check if it is openai api key or user token
const { accessCode, apiKey } = parseApiKey(authToken); let { accessCode, apiKey } = parseApiKey(authToken);
if (modelProvider === ModelProvider.GeminiPro) {
const googleAuthToken = req.headers.get("x-goog-api-key") ?? "";
apiKey = googleAuthToken.trim().replaceAll("Bearer ", "").trim();
}
const hashedCode = md5.hash(accessCode ?? "").trim(); const hashedCode = md5.hash(accessCode ?? "").trim();

7
app/client/api.ts
View File

@ -180,11 +180,7 @@ export function getHeaders(ignoreHeaders?: boolean) {
}; };
} }
const isAzure = accessStore.provider === ServiceProvider.Azure; const isAzure = accessStore.provider === ServiceProvider.Azure;
const authHeader = isGoogle let authHeader = isAzure ? "api-key" : "Authorization";
? "x-goog-api-key"
: isAzure
? "api-key"
: "Authorization";
const apiKey = isGoogle const apiKey = isGoogle
? accessStore.googleApiKey ? accessStore.googleApiKey
: isAzure : isAzure
@ -197,6 +193,7 @@ export function getHeaders(ignoreHeaders?: boolean) {
// use user's api key first // use user's api key first
if (validString(apiKey)) { if (validString(apiKey)) {
authHeader = isGoogle ? "x-goog-api-key" : authHeader;
headers[authHeader] = makeBearer(apiKey); headers[authHeader] = makeBearer(apiKey);
} else if ( } else if (
accessStore.enabledAccessControl() && accessStore.enabledAccessControl() &&