refactor: remove privileges in favor of SNJS protections

standardnotes · Jan 18, 2021 · 42a7cb4 · 42a7cb4
1 parent 75f02b4
commit 42a7cb4
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 434 deletions.
diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts
@@ -44,8 +44,6 @@ import {
   PanelResizer,
   PasswordWizard,
   PermissionsModal,
-  PrivilegesAuthModal,
-  PrivilegesManagementModal,
   RevisionPreviewModal,
   HistoryMenu,
   SyncResolutionMenu,
@@ -140,11 +138,6 @@ const startApplication: StartApplication = async function startApplication(
     .directive('panelResizer', () => new PanelResizer())
     .directive('passwordWizard', () => new PasswordWizard())
     .directive('permissionsModal', () => new PermissionsModal())
-    .directive('privilegesAuthModal', () => new PrivilegesAuthModal())
-    .directive(
-      'privilegesManagementModal',
-      () => new PrivilegesManagementModal()
-    )
     .directive('revisionPreviewModal', () => new RevisionPreviewModal())
     .directive('historyMenu', () => new HistoryMenu())
     .directive('syncResolutionMenu', () => new SyncResolutionMenu())

diff --git a/app/assets/javascripts/directives/views/index.ts b/app/assets/javascripts/directives/views/index.ts
@@ -8,8 +8,6 @@ export { MenuRow } from './menuRow';
 export { PanelResizer } from './panelResizer';
 export { PasswordWizard } from './passwordWizard';
 export { PermissionsModal } from './permissionsModal';
-export { PrivilegesAuthModal } from './privilegesAuthModal';
-export { PrivilegesManagementModal } from './privilegesManagementModal';
 export { RevisionPreviewModal } from './revisionPreviewModal';
 export { HistoryMenu } from './historyMenu';
 export { SyncResolutionMenu } from './syncResolutionMenu';
diff --git a/app/assets/javascripts/directives/views/privilegesAuthModal.ts b/app/assets/javascripts/directives/views/privilegesAuthModal.ts
diff --git a/app/assets/javascripts/directives/views/privilegesManagementModal.ts b/app/assets/javascripts/directives/views/privilegesManagementModal.ts
diff --git a/app/assets/javascripts/directives/views/sessionsModal.tsx b/app/assets/javascripts/directives/views/sessionsModal.tsx
@@ -5,6 +5,7 @@ import {
   RemoteSession,
   SessionStrings,
   UuidString,
+  isNullOrUndefined,
 } from '@standardnotes/snjs';
 import { autorun, IAutorunOptions, IReactionPublic } from 'mobx';
 import { render, FunctionComponent } from 'preact';
@@ -78,7 +79,9 @@ function useSessions(
     setSessions(sessionsDuringRevoke);
 
     const response = await responsePromise;
-    if ('error' in response) {
+    if (isNullOrUndefined(response)) {
+      setSessions(sessionsBeforeRevoke);
+    } else if ('error' in response) {
       if (response.error?.message) {
         setErrorMessage(response.error?.message);
       } else {

diff --git a/app/assets/javascripts/services/archiveManager.ts b/app/assets/javascripts/services/archiveManager.ts
@@ -1,5 +1,10 @@
 import { WebApplication } from '@/ui_models/application';
-import { EncryptionIntent, ProtectedAction, SNItem, ContentType, SNNote, BackupFile } from '@standardnotes/snjs';
+import {
+  EncryptionIntent,
+  ContentType,
+  SNNote,
+  BackupFile
+} from '@standardnotes/snjs';
 
 function zippableTxtName(name: string, suffix = ""): string {
   const sanitizedName = name
@@ -22,41 +27,26 @@ export class ArchiveManager {
   }
 
   public async downloadBackup(encrypted: boolean) {
-    const run = async () => {
-      const intent = encrypted
-        ? EncryptionIntent.FileEncrypted
-        : EncryptionIntent.FileDecrypted;
+    const intent = encrypted
+      ? EncryptionIntent.FileEncrypted
+      : EncryptionIntent.FileDecrypted;
 
-      const data = await this.application.createBackupFile(intent);
-      if (!data) {
-        return;
-      }
-      const blobData = new Blob(
-        [JSON.stringify(data, null, 2)],
-        { type: 'text/json' }
+    const data = await this.application.createBackupFile(intent);
+    if (!data) {
+      return;
+    }
+    const blobData = new Blob(
+      [JSON.stringify(data, null, 2)],
+      { type: 'text/json' }
+    );
+    if (encrypted) {
+      this.downloadData(
+        blobData,
+        `Standard Notes Encrypted Backup and Import File - ${this.formattedDate()}.txt`
       );
-      if (encrypted) {
-        this.downloadData(
-          blobData,
-          `Standard Notes Encrypted Backup and Import File - ${this.formattedDate()}.txt`
-        );
-      } else {
-        /** download as zipped plain text files */
-        this.downloadZippedDecryptedItems(data);
-      }
-    };
-
-    if (
-      await this.application.privilegesService!
-        .actionRequiresPrivilege(ProtectedAction.ManageBackups)
-    ) {
-      this.application.presentPrivilegesModal(
-        ProtectedAction.ManageBackups,
-        () => {
-          run();
-        });
     } else {
-      run();
+      /** download as zipped plain text files */
+      this.downloadZippedDecryptedItems(data);
     }
   }
 

diff --git a/app/assets/javascripts/ui_models/app_state.ts b/app/assets/javascripts/ui_models/app_state.ts
@@ -217,7 +217,7 @@ export class AppState {
     }
   }
 
-  async openEditor(noteUuid: string) {
+  async openEditor(noteUuid: string): Promise<void> {
     if (this.getActiveEditor()?.note?.uuid === noteUuid) {
       return;
     }
@@ -226,7 +226,7 @@ export class AppState {
     if (!note) {
       console.warn('Tried accessing a non-existant note of UUID ' + noteUuid);
       return;
-    };
+    }
 
     if (await this.application.authorizeNoteAccess(note)) {
       const activeEditor = this.getActiveEditor();

diff --git a/app/assets/javascripts/views/editor/editor-view.pug b/app/assets/javascripts/views/editor/editor-view.pug
@@ -80,8 +80,7 @@
                 )
               menu-row(
                 action='self.selectedMenuItem(true); self.toggleProtectNote()'
-                desc=`'Protecting a note will require credentials to view
-                  it (Manage Privileges via Account menu)'`,
+                desc=`'Protecting a note will require credentials to view it'`,
                 label="self.note.protected ? 'Unprotect' : 'Protect'"
                 )
               menu-row(