pleroma-fe

commit: 8d2e63a8e4b51deb7efb1d4fbbd5e20dfb924e73
parent: 1db3c785d805bfe1e7bb09f2d85875448cb03f9a
Author: lain <lain@soykaf.club>
Date:   Mon, 17 Jun 2019 07:33:39 +0000

Merge branch 'fix-mfa' into 'develop'

fix MFA crashing on user-settings page

See merge request pleroma/pleroma-fe!834
Diffstat:
M
src/components/user_settings/mfa.js
3
+++
M
src/components/user_settings/mfa.vue
2
+-

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/components/user_settings/mfa.js b/src/components/user_settings/mfa.js
@@ -7,6 +7,7 @@ import { mapState } from 'vuex'
 const Mfa = {
   data: () => ({
     settings: { // current settings of MFA
+      available: false,
       enabled: false,
       totp: false
     },
@@ -139,7 +140,9 @@ const Mfa = {
     // fetch settings from server
     async fetchSettings () {
       let result = await this.backendInteractor.fetchSettingsMFA()
+      if (result.error) return
       this.settings = result.settings
+      this.settings.available = true
       return result
     }
   },
diff --git a/src/components/user_settings/mfa.vue b/src/components/user_settings/mfa.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="setting-item mfa-settings" v-if="readyInit">
+<div class="setting-item mfa-settings" v-if="readyInit && settings.available">
 
   <div class="mfa-heading">
     <h2>{{$t('settings.mfa.title')}}</h2>