From 5b12e1c85c61873f6689a19ff99f5a270053440c Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Wed, 24 Feb 2021 16:18:39 -0500
Subject: [PATCH] Show errors on 2fa disable

Fixes #4156
---
 app/src/components/v-error/v-error.vue             | 8 ++++++--
 app/src/interfaces/_system/tfa-setup/tfa-setup.vue | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/components/v-error/v-error.vue b/app/src/components/v-error/v-error.vue
index 8e5d27c8be..e8425d225a 100644
--- a/app/src/components/v-error/v-error.vue
+++ b/app/src/components/v-error/v-error.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="v-error">
-		<output>Code: {{ code }}</output>
+		<output>[{{ code }}] {{ message }}</output>
 		<v-icon
 			v-tooltip="$t('copy_details')"
 			v-if="showCopy"
@@ -28,11 +28,15 @@ export default defineComponent({
 			return props.error?.response?.data?.errors?.[0]?.extensions?.code || 'UNKNOWN';
 		});
 
+		const message = computed(() => {
+			return props.error?.response?.data?.errors?.[0]?.message || props.error.message;
+		});
+
 		const copied = ref(false);
 
 		const showCopy = computed(() => !!navigator.clipboard?.writeText);
 
-		return { code, copyError, showCopy, copied };
+		return { code, copyError, showCopy, copied, message };
 
 		async function copyError() {
 			const error = props.error?.response?.data || props.error;
diff --git a/app/src/interfaces/_system/tfa-setup/tfa-setup.vue b/app/src/interfaces/_system/tfa-setup/tfa-setup.vue
index af3f74179d..c1306853b8 100644
--- a/app/src/interfaces/_system/tfa-setup/tfa-setup.vue
+++ b/app/src/interfaces/_system/tfa-setup/tfa-setup.vue
@@ -49,6 +49,7 @@
 				</v-card-title>
 				<v-card-text>
 					<v-input type="text" :placeholder="$t('otp')" v-model="otp" :nullable="false" />
+					<v-error v-if="error" :error="error" />
 				</v-card-text>
 				<v-card-actions>
 					<v-button class="disable" :loading="loading" @click="disableTFA" :disabled="otp.length !== 6">