fix(Sync): Check if the local folder path has changed before syncing

fixes #2090

Signed-off-by: Marcel Klehr <[email protected]>

Author: marcelklehr

_locales/en/messages.json

@@ -131,6 +131,9 @@
   "Error044": {
     "message": "E044: Git push operation failed: {0}"
   },
+  "Error045": {
+    "message": "E045: Unexpected folder path. The local sync folder for this profile used to be at `{0}` but is now at `{1}`. Please make sure this is intended and set the local sync folder again in the profile settings."
+  },
   "LabelWebdavurl": {
     "message": "WebDAV URL"
   },
@@ -329,9 +332,6 @@
   "DescriptionFunddevelopment": {
     "message": "Work on floccus is fuelled by a voluntary subscription model. If you think what I do is worthwhile, and if you can spare a few coins each month without hardship, please support my work. Also, please consider giving floccus a rating on the addon store of your choice. Thank you!💙"
   },
-  "LabelSelect": {
-    "message": "Select"
-  },
   "LabelUntitledfolder": {
     "message": "Untitled folder"
   },

src/errors/Error.ts

@@ -379,4 +379,17 @@ export class GitPushError extends FloccusError {
     this.errorMessage = errorMessage
     Object.setPrototypeOf(this, GitPushError.prototype)
   }
+}
+
+export class UnexpectedFolderPathError extends FloccusError {
+  public originalPath: string
+  public newPath: string
+
+  constructor(originalPath: string, newPath: string) {
+    super(`E045: Unexpected folder path. The local sync folder for this profile used to be at '${originalPath}' but is now at '${newPath}'. Please make sure this is intended and set the local sync folder again in the profile settings.`)
+    this.code = 45
+    this.originalPath = originalPath
+    this.newPath = newPath
+    Object.setPrototypeOf(this, UnexpectedFolderPathError.prototype)
+  }
 }

src/lib/Account.ts

@@ -14,6 +14,8 @@ import { isTest } from './isTest'
 import { setUser, setContext, withScope, captureException } from '@sentry/browser'
 import AsyncLock from 'async-lock'
 import CachingTreeWrapper from './CachingTreeWrapper'
+import BrowserTree from './browser/BrowserTree'
+import { UnexpectedFolderPathError } from '../errors/Error'
 
 declare const DEBUG: boolean
 
@@ -184,6 +186,14 @@ export default class Account {
         await this.init()
       }
 
+      if (Capacitor.getPlatform() === 'web') {
+        const newPath = await BrowserTree.getPathFromLocalId(this.getData().localRoot)
+        const oldPath = this.getData().rootPath
+        if (oldPath && newPath !== oldPath) {
+          throw new UnexpectedFolderPathError(oldPath, newPath)
+        }
+      }
+
       if (this.server.onSyncStart) {
         const needLock = (strategy || this.getData().strategy) !== 'slave'
         let status

src/lib/browser/BrowserAccount.ts

@@ -10,7 +10,7 @@ import {
   HttpError,
   InconsistentBookmarksExistenceError, LockFileError,
   MissingItemOrderError,
-  ParseResponseError,
+  ParseResponseError, UnexpectedFolderPathError,
   UnknownFolderItemOrderError, UpdateBookmarkError
 } from '../../errors/Error'
 import {i18n} from '../native/I18n'
@@ -53,6 +53,7 @@ export default class BrowserAccount extends Account {
       accData.rootPath = await BrowserTree.getPathFromLocalId(node.id)
       await this.setData(accData)
     }
+    await this.setData({rootPath: await BrowserTree.getPathFromLocalId(accData.localRoot)})
     await this.storage.initMappings()
     await this.storage.initCache()
     this.localTree = new BrowserTree(this.storage, accData.localRoot)
@@ -122,6 +123,9 @@ export default class BrowserAccount extends Account {
     if (er instanceof GitPushError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.errorMessage])
     }
+    if (er instanceof UnexpectedFolderPathError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.originalPath, er.newPath])
+    }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }

src/lib/native/NativeAccount.ts

@@ -10,7 +10,7 @@ import {
   HttpError,
   InconsistentBookmarksExistenceError, LockFileError,
   MissingItemOrderError,
-  ParseResponseError,
+  ParseResponseError, UnexpectedFolderPathError,
   UnknownFolderItemOrderError, UpdateBookmarkError
 } from '../../errors/Error'
 import Logger from '../Logger'
@@ -100,6 +100,9 @@ export default class NativeAccount extends Account {
     if (er instanceof GitPushError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.errorMessage])
     }
+    if (er instanceof UnexpectedFolderPathError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.originalPath, er.newPath])
+    }
     if (er instanceof FloccusError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'))
     }

src/ui/store/actions.js

@@ -74,6 +74,9 @@ export const actionsDefinition = {
     if (oldData.localRoot !== data.localRoot) {
       await account.init()
     }
+    if (data.rootPath !== await BrowserTree.getPathFromLocalId(data.localRoot)) {
+      await account.init()
+    }
     if (oldData.bookmark_file !== data.bookmark_file) {
       await account.init()
     }