apiKey migration

jackschedel · Feb 10, 2024 · 63ec8fa · 63ec8fa
1 parent 18639ea
commit 63ec8fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -22,6 +22,10 @@ function App() {
   const setHideSideMenu = useStore((state) => state.setHideSideMenu);
   const hideSideMenu = useStore((state) => state.hideSideMenu);
   const bottomMessageRef = useStore((state) => state.bottomMessageRef);
+  const setApiAuth = useStore((state) => state.setApiAuth);
+  const apiAuth = useStore((state) => state.apiAuth);
+  const apiKey = useStore((state) => state.apiKey);
+  const setApiKey = useStore((state) => state.setApiKey);
 
   const initialiseNewChat = useInitialiseNewChat();
   const addChat = useAddChat();
@@ -30,6 +34,13 @@ function App() {
   const copyCodeBlock = useCopyCodeBlock();
   const { handleSubmit } = useSubmit();
 
+  if (apiKey && !apiAuth[0].apiKey) {
+    let old = apiAuth;
+    old[0].apiKey = apiKey;
+    setApiAuth(old);
+    setApiKey('');
+  }
+
   const handleGenerate = () => {
     if (useStore.getState().generating) return;
     const updatedChats: ChatInterface[] = JSON.parse(

diff --git a/src/hooks/useSubmit.ts b/src/hooks/useSubmit.ts
@@ -104,9 +104,7 @@ const useSubmit = () => {
       if (!apiKey || apiKey.length === 0) {
         // official endpoint
         if (apiEndpoint === officialAPIEndpoint) {
-          const error = new Error(t('noApiKeyWarning') as string);
-          setError(error.message);
-          throw error;
+          throw new Error(t('noApiKeyWarning') as string);
         }
 
         // other endpoints
@@ -232,7 +230,6 @@ const useSubmit = () => {
       }
     } catch (e: unknown) {
       setError((e as Error).message);
-      throw e;
     }
     setGenerating(false);
   };

diff --git a/src/store/auth-slice.ts b/src/store/auth-slice.ts
@@ -4,6 +4,7 @@ import { ModelDefinition } from '@type/chat';
 import { StoreSlice } from './store';
 
 export interface AuthSlice {
+  apiKey?: string;
   firstVisit: boolean;
   apiAuth: EndpointAuth[];
   modelDefs: ModelDefinition[];
@@ -44,12 +45,6 @@ export const createAuthSlice: StoreSlice<AuthSlice> = (set) => ({
       apiKey: apiKey,
     }));
   },
-  setApiEndpoint: (apiEndpoint: string) => {
-    set((prev: AuthSlice) => ({
-      ...prev,
-      apiEndpoint: apiEndpoint,
-    }));
-  },
   setFirstVisit: (firstVisit: boolean) => {
     set((prev: AuthSlice) => ({
       ...prev,