From 6c4f6dcd05210ba72a655af8183d41bb26843822 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 22 Jun 2026 16:39:08 +0300
Subject: [PATCH] mfa fixes

---
 src/components/login_form/login_form.js              |  2 +-
 .../settings_modal/tabs/security_tab/mfa.js          | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index d1164c562..a00db03cf 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -63,7 +63,7 @@ const LoginForm = {
             })
           })
           .catch((error) => {
-            if (error === 'mfa_required') {
+            if (error.errorData?.error === 'mfa_required') {
               this.requireMFA({ settings: error })
             } else if (error.identifier === 'password_reset_required') {
               this.$router.push({
diff --git a/src/components/settings_modal/tabs/security_tab/mfa.js b/src/components/settings_modal/tabs/security_tab/mfa.js
index 12c464719..b5c68120b 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa.js
+++ b/src/components/settings_modal/tabs/security_tab/mfa.js
@@ -95,7 +95,7 @@ const Mfa = {
 
       return generateMfaBackupCodes({
         credentials: useOAuthStore().token,
-      }).then((res) => {
+      }).then(({ data: res }) => {
         this.backupCodes.codes = res.codes
         this.backupCodes.inProgress = false
       })
@@ -122,7 +122,7 @@ const Mfa = {
       this.setupState.setupOTPState = 'prepare'
       mfaSetupOTP({
         credentials: useOAuthStore().token,
-      }).then((res) => {
+      }).then(({ data: res }) => {
         this.otpSettings = res
         this.setupState.setupOTPState = 'confirm'
       })
@@ -135,11 +135,9 @@ const Mfa = {
         password: this.currentPassword,
         credentials: useOAuthStore().token,
       }).then((res) => {
-        if (res.error) {
-          this.error = res.error
-          return
-        }
         this.completeSetup()
+      }).catch((error) => {
+        this.error = error
       })
     },
 
@@ -161,7 +159,7 @@ const Mfa = {
 
     // fetch settings from server
     async fetchSettings() {
-      const result = await settingsMFA({
+      const { data: result } = await settingsMFA({
         credentials: useOAuthStore().token,
       })
       if (result.error) return