Merge pull request ChatGPTNextWeb#2867 from Yidadaa/bugfix-0919

aidscooler · Sep 18, 2023 · ebcb2e7 · ebcb2e7
2 parents 2ba0929 + f1e7db6
commit ebcb2e7
Showing 1 changed file with 32 additions and 20 deletions.
diff --git a/app/store/sync.ts b/app/store/sync.ts
@@ -22,27 +22,29 @@ export interface WebDavConfig {
 
 export type SyncStore = GetStoreState<typeof useSyncStore>;
 
-export const useSyncStore = createPersistStore(
-  {
-    provider: ProviderType.WebDAV,
-    useProxy: true,
-    proxyUrl: corsPath(ApiPath.Cors),
-
-    webdav: {
-      endpoint: "",
-      username: "",
-      password: "",
-    },
-
-    upstash: {
-      endpoint: "",
-      username: STORAGE_KEY,
-      apiKey: "",
-    },
+const DEFAULT_SYNC_STATE = {
+  provider: ProviderType.WebDAV,
+  useProxy: true,
+  proxyUrl: corsPath(ApiPath.Cors),
+
+  webdav: {
+    endpoint: "",
+    username: "",
+    password: "",
+  },
 
-    lastSyncTime: 0,
-    lastProvider: "",
+  upstash: {
+    endpoint: "",
+    username: STORAGE_KEY,
+    apiKey: "",
   },
+
+  lastSyncTime: 0,
+  lastProvider: "",
+};
+
+export const useSyncStore = createPersistStore(
+  DEFAULT_SYNC_STATE,
   (set, get) => ({
     coundSync() {
       const config = get()[get().provider];
@@ -108,6 +110,16 @@ export const useSyncStore = createPersistStore(
   }),
   {
     name: StoreKey.Sync,
-    version: 1,
+    version: 1.1,
+
+    migrate(persistedState, version) {
+      const newState = persistedState as typeof DEFAULT_SYNC_STATE;
+
+      if (version < 1.1) {
+        newState.upstash.username = STORAGE_KEY;
+      }
+
+      return newState as any;
+    },
   },
 );