From 30f054a6282c15de999a9bfbb95797f5ab6e5ee6 Mon Sep 17 00:00:00 2001
From: Maksim Pechnikov <parallel588@gmail.com>
Date: Sat, 8 Jun 2019 15:33:49 +0300
Subject: [PATCH] add abortMFA

---
 src/components/mfa_form/recovery_form.js  |  2 +-
 src/components/mfa_form/recovery_form.vue |  3 +++
 src/components/mfa_form/totp_form.js      |  2 +-
 src/components/mfa_form/totp_form.vue     |  3 +++
 src/modules/auth_flow.js                  | 14 +++++++++-----
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/components/mfa_form/recovery_form.js b/src/components/mfa_form/recovery_form.js
index af069f0342..fbe9b437a9 100644
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@@ -14,7 +14,7 @@ export default {
     ...mapState({ instance: 'instance' })
   },
   methods: {
-    ...mapMutations({ requireTOTP: 'authFlow/requireTOTP' }),
+    ...mapMutations('authFlow', ['requireTOTP', 'abortMFA']),
     ...mapActions({ login: 'authFlow/login' }),
     clearError () { this.error = false },
     submit () {
diff --git a/src/components/mfa_form/recovery_form.vue b/src/components/mfa_form/recovery_form.vue
index 4a5a517eb3..806746f476 100644
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@@ -17,6 +17,9 @@
             <a href="#" @click.prevent="requireTOTP">
               {{$t('login.enter_two_factor_code')}}
             </a>
+            <a href="#" @click.prevent="abortMFA">
+              {{$t('general.cancel')}}
+            </a>
           </div>
           <button type='submit' class='btn btn-default'>
             {{$t('general.verify')}}
diff --git a/src/components/mfa_form/totp_form.js b/src/components/mfa_form/totp_form.js
index 2e1b7ce4ec..6c94fe52bf 100644
--- a/src/components/mfa_form/totp_form.js
+++ b/src/components/mfa_form/totp_form.js
@@ -13,7 +13,7 @@ export default {
     ...mapState({ instance: 'instance' })
   },
   methods: {
-    ...mapMutations({ requireRecovery: 'authFlow/requireRecovery' }),
+    ...mapMutations('authFlow', ['requireRecovery', 'abortMFA']),
     ...mapActions({ login: 'authFlow/login' }),
     clearError () { this.error = false },
     submit () {
diff --git a/src/components/mfa_form/totp_form.vue b/src/components/mfa_form/totp_form.vue
index d4a7c84a32..d39caa6d1a 100644
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@@ -21,6 +21,9 @@
             <a href="#" @click.prevent="requireRecovery">
               {{$t('login.enter_recovery_code')}}
             </a>
+            <a href="#" @click.prevent="abortMFA">
+              {{$t('general.cancel')}}
+            </a>
           </div>
           <button type='submit' class='btn btn-default'>
             {{$t('general.verify')}}
diff --git a/src/modules/auth_flow.js b/src/modules/auth_flow.js
index d51e7116d5..86328cf3f6 100644
--- a/src/modules/auth_flow.js
+++ b/src/modules/auth_flow.js
@@ -13,6 +13,12 @@ const state = {
   initStrategy: PASSWORD_STRATEGY // default strategy from config
 }
 
+const resetState = (state) => {
+  state.strategy = state.initStrategy
+  state.settings = {}
+  state.app = null
+}
+
 // getters
 const getters = {
   app: (state, getters) => {
@@ -60,10 +66,8 @@ const mutations = {
   requireTOTP (state) {
     state.strategy = TOTP_STRATEGY
   },
-  reset (state) {
-    state.strategy = state.initStrategy
-    state.settings = {}
-    state.app = null
+  abortMFA (state) {
+    resetState(state)
   }
 }
 
@@ -72,7 +76,7 @@ const actions = {
   async login ({state, dispatch, commit}, {access_token}) {
     commit('setToken', access_token, { root: true })
     await dispatch('loginUser', access_token, { root: true })
-    commit('reset')
+    resetState(state)
   }
 }