feat: prevent browser to invoke basic auth popup

Yidadaa · Yidadaa · commit c2b36cdffaa0 · 2023-05-21T00:06:28.000+08:00
diff --git a/app/api/common.ts b/app/api/common.ts
@@ -30,26 +30,30 @@ export async function requestOpenai(req: NextRequest) {
     controller.abort();
   }, 10 * 60 * 1000);
 
+  const fetchUrl = `${baseUrl}/${openaiPath}`;
+  const fetchOptions: RequestInit = {
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: authValue,
+      ...(process.env.OPENAI_ORG_ID && {
+        "OpenAI-Organization": process.env.OPENAI_ORG_ID,
+      }),
+    },
+    cache: "no-store",
+    method: req.method,
+    body: req.body,
+    signal: controller.signal,
+  };
+
   try {
-    return await fetch(`${baseUrl}/${openaiPath}`, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: authValue,
-        ...(process.env.OPENAI_ORG_ID && {
-          "OpenAI-Organization": process.env.OPENAI_ORG_ID,
-        }),
-      },
-      cache: "no-store",
-      method: req.method,
-      body: req.body,
-      signal: controller.signal,
-    });
-  } catch (err: unknown) {
-    if (err instanceof Error && err.name === "AbortError") {
-      console.log("Fetch aborted");
-    } else {
-      throw err;
+    const res = await fetch(fetchUrl, fetchOptions);
+
+    if (res.status === 401) {
+      // to prevent browser prompt for credentials
+      res.headers.delete("www-authenticate");
     }
+
+    return res;
   } finally {
     clearTimeout(timeoutId);
   }
