diff --git a/app/api/common.ts b/app/api/common.ts
index fcb3d923649..a75f2de5cfa 100644
--- a/app/api/common.ts
+++ b/app/api/common.ts
@@ -112,16 +112,16 @@ export async function requestOpenai(req: NextRequest) {
try {
const res = await fetch(fetchUrl, fetchOptions);
- // Extract the OpenAI-Organization header from the response
- const openaiOrganizationHeader = res.headers.get("OpenAI-Organization");
-
- // Check if serverConfig.openaiOrgId is defined and not an empty string
- if (serverConfig.openaiOrgId && serverConfig.openaiOrgId.trim() !== "") {
- // If openaiOrganizationHeader is present, log it; otherwise, log that the header is not present
- console.log("[Org ID]", openaiOrganizationHeader);
- } else {
- console.log("[Org ID] is not set up.");
- }
+ // Extract the OpenAI-Organization header from the response
+ const openaiOrganizationHeader = res.headers.get("OpenAI-Organization");
+
+ // Check if serverConfig.openaiOrgId is defined and not an empty string
+ if (serverConfig.openaiOrgId && serverConfig.openaiOrgId.trim() !== "") {
+ // If openaiOrganizationHeader is present, log it; otherwise, log that the header is not present
+ console.log("[Org ID]", openaiOrganizationHeader);
+ } else {
+ console.log("[Org ID] is not set up.");
+ }
// to prevent browser prompt for credentials
const newHeaders = new Headers(res.headers);
@@ -129,6 +129,7 @@ export async function requestOpenai(req: NextRequest) {
// to disable nginx buffering
newHeaders.set("X-Accel-Buffering", "no");
+
// Conditionally delete the OpenAI-Organization header from the response if [Org ID] is undefined or empty (not setup in ENV)
// Also, this is to prevent the header from being sent to the client
if (!serverConfig.openaiOrgId || serverConfig.openaiOrgId.trim() === "") {
@@ -141,6 +142,7 @@ export async function requestOpenai(req: NextRequest) {
// The browser will try to decode the response with brotli and fail
newHeaders.delete("content-encoding");
+
return new Response(res.body, {
status: res.status,
statusText: res.statusText,
diff --git a/app/client/platforms/google.ts b/app/client/platforms/google.ts
index b6eb8d3dfab..a786f5275f4 100644
--- a/app/client/platforms/google.ts
+++ b/app/client/platforms/google.ts
@@ -120,9 +120,7 @@ export class GeminiProApi implements LLMApi {
if (!baseUrl) {
baseUrl = isApp
- ? DEFAULT_API_HOST +
- "/api/proxy/google/" +
- Google.ChatPath(modelConfig.model)
+ ? DEFAULT_API_HOST + "/api/proxy/google/" + Google.ChatPath(modelConfig.model)
: this.path(Google.ChatPath(modelConfig.model));
}
@@ -141,7 +139,7 @@ export class GeminiProApi implements LLMApi {
() => controller.abort(),
REQUEST_TIMEOUT_MS,
);
-
+
if (shouldStream) {
let responseText = "";
let remainText = "";
diff --git a/app/components/auth.tsx b/app/components/auth.tsx
index 5c8b4fc00b1..57118349bac 100644
--- a/app/components/auth.tsx
+++ b/app/components/auth.tsx
@@ -50,33 +50,33 @@ export function AuthPage() {
);
}}
/>
- {/*{!accessStore.hideUserApiKey ? (*/}
- {/* <>*/}
- {/*