From 06c84a9cf347ad841a0630999e12432b5e01866b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 16 Jun 2019 20:33:40 +0300
Subject: [PATCH] fix MFA crashing on user-settings page
---
src/components/user_settings/mfa.js | 3 +++
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
index 2acee862..d44a3ab7 100644
--- 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
index ded426dd..1f1be60d 100644
--- 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>