Cherry Pick Without Conflict (ChatGPTNextWeb#201)

fix: fix auth key selection when using different model --- Ez A Professional Git Committer --- Co-authored-by: fredliang44 <[email protected]>
ryiann · Dec 24, 2023 · 86bac17 · 86bac17
1 parent dc7eb0d
commit 86bac17
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 15 deletions.
diff --git a/app/api/auth.ts b/app/api/auth.ts
@@ -1,7 +1,7 @@
 import { NextRequest } from "next/server";
 import { getServerSideConfig } from "../config/server";
 import md5 from "spark-md5";
-import { ACCESS_CODE_PREFIX } from "../constant";
+import { ACCESS_CODE_PREFIX, ModelProvider } from "../constant";
 
 function getIP(req: NextRequest) {
   let ip = req.ip ?? req.headers.get("x-real-ip");
@@ -30,7 +30,7 @@ function doubleHashForDisplay(hashedCode: string): string {
   return md5.hash(hashedCode);
 }
 
-export function auth(req: NextRequest) {
+export function auth(req: NextRequest, modelProvider: ModelProvider) {
   const authToken = req.headers.get("Authorization") ?? "";
 
   // check if it is openai api key or user token
@@ -62,12 +62,19 @@ export function auth(req: NextRequest) {
   // if user does not provide an api key, inject system api key
   if (!apiKey) {
     const serverConfig = getServerSideConfig();
-    const systemApiKey = serverConfig.isAzure
-      ? serverConfig.azureApiKey
-      : serverConfig.isGoogle
-      ? serverConfig.googleApiKey
-      : serverConfig.apiKey;
 
+    // const systemApiKey = serverConfig.isAzure
+    //   ? serverConfig.azureApiKey
+    //   : serverConfig.isGoogle
+    //   ? serverConfig.googleApiKey
+    //   : serverConfig.apiKey;
+
+    const systemApiKey =
+      modelProvider === ModelProvider.GeminiPro
+        ? serverConfig.googleApiKey
+        : serverConfig.isAzure
+        ? serverConfig.azureApiKey
+        : serverConfig.apiKey;
     if (systemApiKey) {
       console.log("[Auth] use system api key");
       req.headers.set("Authorization", `Bearer ${systemApiKey}`);

diff --git a/app/api/google/[...path]/route.ts b/app/api/google/[...path]/route.ts
@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import { auth } from "../../auth";
 import { getServerSideConfig } from "@/app/config/server";
-import { GEMINI_BASE_URL, Google } from "@/app/constant";
+import { GEMINI_BASE_URL, Google, ModelProvider } from "@/app/constant";
 
 async function handle(
   req: NextRequest,
@@ -39,7 +39,7 @@ async function handle(
     10 * 60 * 1000,
   );
 
-  const authResult = auth(req);
+  const authResult = auth(req, ModelProvider.GeminiPro);
   if (authResult.error) {
     return NextResponse.json(authResult, {
       status: 401,
@@ -50,6 +50,7 @@ async function handle(
   const token = bearToken.trim().replaceAll("Bearer ", "").trim();
 
   const key = token ? token : serverConfig.googleApiKey;
+
   if (!key) {
     return NextResponse.json(
       {
@@ -63,7 +64,6 @@ async function handle(
   }
 
   const fetchUrl = `${baseUrl}/${path}?key=${key}`;
-
   const fetchOptions: RequestInit = {
     headers: {
       "Content-Type": "application/json",

diff --git a/app/api/openai/[...path]/route.ts b/app/api/openai/[...path]/route.ts
@@ -1,6 +1,6 @@
 import { type OpenAIListModelResponse } from "@/app/client/platforms/openai";
 import { getServerSideConfig } from "@/app/config/server";
-import { OpenaiPath } from "@/app/constant";
+import { ModelProvider, OpenaiPath } from "@/app/constant";
 import { prettyObject } from "@/app/utils/format";
 import { NextRequest, NextResponse } from "next/server";
 import { auth } from "../../auth";
@@ -55,7 +55,7 @@ async function handle(
     }
     return false;
   }
-  
+
 
   const userAgent = req.headers.get("User-Agent");
   const isRealDevice = isRealDevicez(userAgent);
@@ -70,9 +70,9 @@ async function handle(
         status: 403,
       },
     );
-  }  
+  }
 
-  const authResult = auth(req);
+  const authResult = auth(req, ModelProvider.GPT);
   if (authResult.error) {
     return NextResponse.json(authResult, {
       status: 401,
@@ -102,4 +102,22 @@ export const GET = handle;
 export const POST = handle;
 
 export const runtime = "edge";
-export const preferredRegion = ['arn1', 'bom1', 'cdg1', 'cle1', 'cpt1', 'dub1', 'fra1', 'gru1', 'hnd1', 'iad1', 'icn1', 'kix1', 'lhr1', 'pdx1', 'sfo1', 'sin1', 'syd1'];
+export const preferredRegion = [
+  "arn1",
+  "bom1",
+  "cdg1",
+  "cle1",
+  "cpt1",
+  "dub1",
+  "fra1",
+  "gru1",
+  "hnd1",
+  "iad1",
+  "icn1",
+  "kix1",
+  "lhr1",
+  "pdx1",
+  "sfo1",
+  "sin1",
+  "syd1",
+];