From 20c81d0148f6a0eb2b8da882018e8ab933b42135 Mon Sep 17 00:00:00 2001
From: Klaas Reineke <klaas.reineke@outlook.com>
Date: Mon, 25 Mar 2024 18:16:20 +0100
Subject: [PATCH] Fixing manual merge

---
 app/api/auth.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/auth.ts b/app/api/auth.ts
index 109c3eacd..7f74e9c2f 100644
--- a/app/api/auth.ts
+++ b/app/api/auth.ts
@@ -46,7 +46,7 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) {
     };
   }
 
-/*
+  /*
   if (serverConfig.hideUserApiKey && !!apiKey) {
       return {
       error: true,
@@ -63,7 +63,7 @@ export function auth(req: NextRequest, modelProvider: ModelProvider) {
 
     if (serverApiKey) {
       console.log("[Auth] use system api key");
-      req.headers.set("Authorization", `Bearer ${systemApiKey}`);
+      req.headers.set("Authorization", `Bearer ${serverApiKey}`);
     } else {
       console.log("[Auth] admin did not provide an api key");
     }