web: fix app asking password on auto backups with encryption off

streetwriters · May 16, 2024 · e5795bc · e5795bc
1 parent 9be52a6
commit e5795bc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/apps/web/src/common/index.ts b/apps/web/src/common/index.ts
@@ -77,12 +77,19 @@ export async function introduceFeatures() {
 
 export const DEFAULT_CONTEXT = { colors: [], tags: [], notebook: {} };
 
-export async function createBackup(rescueMode = false) {
+export async function createBackup(
+  options: {
+    rescueMode?: boolean;
+    noVerify?: boolean;
+  } = {}
+) {
+  const { rescueMode, noVerify } = options;
   const { isLoggedIn } = useUserStore.getState();
   const { encryptBackups, toggleEncryptBackups } = useSettingStore.getState();
   if (!isLoggedIn && encryptBackups) toggleEncryptBackups();
 
-  const verified = rescueMode || encryptBackups || (await verifyAccount());
+  const verified =
+    rescueMode || encryptBackups || noVerify || (await verifyAccount());
   if (!verified) {
     showToast("error", "Could not create a backup: user verification failed.");
     return false;

diff --git a/apps/web/src/common/notices.ts b/apps/web/src/common/notices.ts
@@ -177,7 +177,7 @@ function isIgnored(key: keyof typeof NoticesData) {
 let openedToast: { hide: () => void } | null = null;
 async function saveBackup() {
   if (IS_DESKTOP_APP) {
-    await createBackup();
+    await createBackup({ noVerify: true });
   } else if (isUserPremium() && !IS_TESTING) {
     if (openedToast !== null) return;
     openedToast = showToast(

diff --git a/apps/web/src/components/announcements/body.jsx b/apps/web/src/components/announcements/body.jsx
@@ -307,7 +307,7 @@ function CalltoAction({ action, variant, sx, dismissAnnouncement }) {
             break;
           }
           case "backup": {
-            await createBackup(true);
+            await createBackup();
             break;
           }
           default: {

diff --git a/apps/web/src/views/recovery.tsx b/apps/web/src/views/recovery.tsx
@@ -458,7 +458,7 @@ function BackupData(props: BaseRecoveryComponentProps<"backup">) {
           "Please wait while we create a backup file for you to download."
       }}
       onSubmit={async () => {
-        await createBackup(true);
+        await createBackup({ rescueMode: true });
         navigate("new");
       }}
     >