singlexyz/ChatGPT-Next-Web
1
0
Fork 0
forked from XiaoMo/ChatGPT-Next-Web
Code Pull Requests Activity

Merge pull request #3620 from fredliang44/main

Browse Source 
fix: fix issue cannot using gemini-pro with code auth
This commit is contained in:
Fred Liang 2023-12-25 04:09:53 +08:00 committed by GitHub
commit c82efceae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/api/auth.ts
View File

@ -16,11 +16,11 @@ function getIP(req: NextRequest) {
function parseApiKey(bearToken: string) { function parseApiKey(bearToken: string) {
const token = bearToken.trim().replaceAll("Bearer ", "").trim(); const token = bearToken.trim().replaceAll("Bearer ", "").trim();
const isOpenAiKey = !token.startsWith(ACCESS_CODE_PREFIX); const isApiKey = !token.startsWith(ACCESS_CODE_PREFIX);
return { return {
accessCode: isOpenAiKey ? "" : token.slice(ACCESS_CODE_PREFIX.length), accessCode: isApiKey ? "" : token.slice(ACCESS_CODE_PREFIX.length),
apiKey: isOpenAiKey ? token : "", apiKey: isApiKey ? token : "",
}; };
} }
@ -49,7 +49,7 @@ export function auth(req: NextRequest) {
if (serverConfig.hideUserApiKey && !!apiKey) { if (serverConfig.hideUserApiKey && !!apiKey) {
return { return {
error: true, error: true,
msg: "you are not allowed to access openai with your own api key", msg: "you are not allowed to access with your own api key",
}; };
} }
@ -64,10 +64,7 @@ export function auth(req: NextRequest) {
if (systemApiKey) { if (systemApiKey) {
console.log("[Auth] use system api key"); console.log("[Auth] use system api key");
req.headers.set( req.headers.set("Authorization", `Bearer ${systemApiKey}`);
"Authorization",
`Bearer ${systemApiKey}`,
);
} else { } else {
console.log("[Auth] admin did not provide an api key"); console.log("[Auth] admin did not provide an api key");
} }

7
app/api/google/[...path]/route.ts
View File

@ -39,6 +39,13 @@ async function handle(
10 * 60 * 1000, 10 * 60 * 1000,
); );
const authResult = auth(req);
if (authResult.error) {
return NextResponse.json(authResult, {
status: 401,
});
}
const bearToken = req.headers.get("Authorization") ?? ""; const bearToken = req.headers.get("Authorization") ?? "";
const token = bearToken.trim().replaceAll("Bearer ", "").trim(); const token = bearToken.trim().replaceAll("Bearer ", "").trim();