enforcePassword

Author: mymindstorm

src/components/Popup/MainBody.vue

@@ -60,6 +60,15 @@ export default Vue.extend({
   computed,
   methods: {
     showInfo(page: string) {
+      if (page === "AddMethodPage") {
+        if (
+          this.$store.state.menu.enforcePassword &&
+          !this.$store.state.accounts.encryption.getEncryptionStatus()
+        ) {
+          page = "SetPasswordPage";
+        }
+      }
+
       this.$store.commit("style/showInfo");
       this.$store.commit("currentView/changeView", page);
     },

src/components/Popup/MainHeader.vue

@@ -104,6 +104,14 @@ export default Vue.extend({
       return;
     },
     async beginCapture() {
+      if (
+        this.$store.state.menu.enforcePassword &&
+        !this.$store.state.accounts.encryption.getEncryptionStatus()
+      ) {
+        this.$store.commit("style/showInfo");
+        this.$store.commit("currentView/changeView", "SetPasswordPage");
+        return;
+      }
       // Insert content script
       await new Promise(
         (resolve: () => void, reject: (reason: Error) => void) => {

src/components/Popup/SetPasswordPage.vue

@@ -10,9 +10,20 @@
       v-model="confirm"
       v-on:keyup.enter="changePassphrase()"
     />
-    <div id="security-save" v-on:click="changePassphrase()">{{ i18n.ok }}</div>
-    <div id="security-remove" v-on:click="removePassphrase()">
-      {{ i18n.remove }}
+    <div v-show="!enforcePassword">
+      <div id="security-save" v-on:click="changePassphrase()">
+        {{ i18n.ok }}
+      </div>
+      <div id="security-remove" v-on:click="removePassphrase()">
+        {{ i18n.remove }}
+      </div>
+    </div>
+    <div
+      class="button-small"
+      v-show="enforcePassword"
+      v-on:click="changePassphrase()"
+    >
+      {{ i18n.ok }}
     </div>
   </div>
 </template>
@@ -26,6 +37,11 @@ export default Vue.extend({
       confirm: ""
     };
   },
+  computed: {
+    enforcePassword: function() {
+      return this.$store.state.menu.enforcePassword;
+    }
+  },
   methods: {
     async removePassphrase() {
       await this.$store.dispatch("accounts/changePassphrase", "");

src/store/Menu.ts

@@ -11,6 +11,8 @@ export class Menu implements IModule {
         autolock: Number(localStorage.autolock) || 0,
         backupDisabled: await ManagedStorage.get("disableBackup"),
         exportDisabled: await ManagedStorage.get("disableExport"),
+        enforcePassword: await ManagedStorage.get("enforcePassword"),
+        enforceAutolock: await ManagedStorage.get("enforceAutolock"),
         storageArea: await ManagedStorage.get("storageArea"),
         feedbackURL: await ManagedStorage.get("feedbackURL")
       },