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

Merge pull request #3617 from H0llyW00dzZ/fixfixbug

Browse Source 
Fix [Bug] Issue ChatGPTNextWeb#3615
This commit is contained in:
Fred Liang 2023-12-25 03:47:16 +08:00 committed by GitHub
commit c0ce70ccc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/api/auth.ts
View File

@ -55,15 +55,18 @@ export function auth(req: NextRequest) {
// if user does not provide an api key, inject system api key // if user does not provide an api key, inject system api key
if (!apiKey) { if (!apiKey) {
const serverApiKey = serverConfig.isAzure const serverConfig = getServerSideConfig();
const systemApiKey = serverConfig.isAzure
? serverConfig.azureApiKey ? serverConfig.azureApiKey
: serverConfig.isGoogle
? serverConfig.googleApiKey
: serverConfig.apiKey; : serverConfig.apiKey;
if (serverApiKey) { if (systemApiKey) {
console.log("[Auth] use system api key"); console.log("[Auth] use system api key");
req.headers.set( req.headers.set(
"Authorization", "Authorization",
`${serverConfig.isAzure ? "" : "Bearer "}${serverApiKey}`, `Bearer ${systemApiKey}`,
); );
} else { } else {
console.log("[Auth] admin did not provide an api key"); console.log("[Auth] admin did not provide an api key");

2
app/config/server.ts
View File

@ -65,6 +65,7 @@ export const getServerSideConfig = () => {
} }
const isAzure = !!process.env.AZURE_URL; const isAzure = !!process.env.AZURE_URL;
const isGoogle = !!process.env.GOOGLE_API_KEY;
const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? ""; const apiKeyEnvVar = process.env.OPENAI_API_KEY ?? "";
const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim()); const apiKeys = apiKeyEnvVar.split(",").map((v) => v.trim());
@ -84,6 +85,7 @@ export const getServerSideConfig = () => {
azureApiKey: process.env.AZURE_API_KEY, azureApiKey: process.env.AZURE_API_KEY,
azureApiVersion: process.env.AZURE_API_VERSION, azureApiVersion: process.env.AZURE_API_VERSION,
isGoogle,
googleApiKey: process.env.GOOGLE_API_KEY, googleApiKey: process.env.GOOGLE_API_KEY,
googleUrl: process.env.GOOGLE_URL, googleUrl: process.env.GOOGLE_URL,