From aa28118d75bf55365e5cab9a7df0fd30bc4e96b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Fri, 21 Jan 2022 09:55:11 +0100
Subject: [PATCH] refactoring

---
 public/mix-manifest.json             | 13 +++++--
 resources/js/views/User/Password.vue | 52 ++++++++++++++++------------
 2 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index b7cb3708..6c9ef265 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -72,7 +72,7 @@
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=d9af0efad2af2679954b",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=8577d4c771602671b38a",
     "/chunks/settings.js": "/chunks/settings.js?id=9900b7eb6fe245a852c5",
-    "/chunks/settings-password.js": "/chunks/settings-password.js?id=cbf4584f8fefdeb7b20f",
+    "/chunks/settings-password.js": "/chunks/settings-password.js?id=1aeaaad4a4c6b719d31e",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=84f35e2124d825cc5039",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=aafc9cd6aa47b01bc25a",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
@@ -829,5 +829,14 @@
     "/chunks/settings.4da40f5fec3b7d81d945.hot-update.js": "/chunks/settings.4da40f5fec3b7d81d945.hot-update.js",
     "/chunks/settings.b6ad682da66d3b2069ed.hot-update.js": "/chunks/settings.b6ad682da66d3b2069ed.hot-update.js",
     "/chunks/settings.3ecffd8e41b9e910f512.hot-update.js": "/chunks/settings.3ecffd8e41b9e910f512.hot-update.js",
-    "/chunks/settings-password.07cfa125159d6148dbaa.hot-update.js": "/chunks/settings-password.07cfa125159d6148dbaa.hot-update.js"
+    "/chunks/settings-password.07cfa125159d6148dbaa.hot-update.js": "/chunks/settings-password.07cfa125159d6148dbaa.hot-update.js",
+    "/chunks/settings-password.18b0c43022769dc1cb22.hot-update.js": "/chunks/settings-password.18b0c43022769dc1cb22.hot-update.js",
+    "/chunks/settings.5ab27b0ef0ca93adbc7c.hot-update.js": "/chunks/settings.5ab27b0ef0ca93adbc7c.hot-update.js",
+    "/chunks/settings.77884f5ef1dfb7a40cde.hot-update.js": "/chunks/settings.77884f5ef1dfb7a40cde.hot-update.js",
+    "/chunks/settings.92e675d4f90fa609a065.hot-update.js": "/chunks/settings.92e675d4f90fa609a065.hot-update.js",
+    "/chunks/settings-password.9fddbc8c88a398ced25d.hot-update.js": "/chunks/settings-password.9fddbc8c88a398ced25d.hot-update.js",
+    "/chunks/settings-password.cdbacf8b06f926fe9eef.hot-update.js": "/chunks/settings-password.cdbacf8b06f926fe9eef.hot-update.js",
+    "/chunks/settings-password.99d05980b1b5c75a85be.hot-update.js": "/chunks/settings-password.99d05980b1b5c75a85be.hot-update.js",
+    "/chunks/settings-password.f17cc28dabf217ef8900.hot-update.js": "/chunks/settings-password.f17cc28dabf217ef8900.hot-update.js",
+    "/chunks/settings.661e4bf254c7fc781c02.hot-update.js": "/chunks/settings.661e4bf254c7fc781c02.hot-update.js"
 }
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index f6b4aa5a..4bd28c01 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -114,11 +114,7 @@
 		},
 		watch: {
 			'user.data.attributes.two_factor_authentication': function (val) {
-				if (val) {
-					this.open2faPopup()
-				} else {
-					this.disable()
-				}
+				val ? this.enable2faPopup() : this.disable2faPopup()
 			}
 		},
 		data() {
@@ -179,22 +175,6 @@
 						}
 					})
 			},
-			disable() {
-				axios
-					.delete('/user/two-factor-authentication')
-					.then(() => {
-						this.$store.commit('CHANGE_TWO_FACTOR_AUTHENTICATION_STATE', false)
-					})
-					.catch(() => {
-						this.$isSomethingWrong()
-					})
-					.finally(() => {
-						events.$emit('toaster', {
-							type: 'success',
-							message: this.$t('popup_2fa.toaster_disabled'),
-						})
-					})
-			},
 			getPersonalAccessTokens() {
 				axios.get('/api/user/tokens')
 					.then(response => {
@@ -210,7 +190,7 @@
 					}
 				})
 			},
-			open2faPopup() {
+			enable2faPopup() {
 				events.$emit('popup:open', {
 					name: 'confirm-password',
 					options: {
@@ -218,6 +198,14 @@
 					}
 				})
 			},
+			disable2faPopup() {
+				events.$emit('popup:open', {
+					name: 'confirm-password',
+					options: {
+						action: 'disable-2fa',
+					}
+				})
+			},
 			confirmDeleteToken(token) {
 				events.$emit('confirm:open', {
 					title: this.$t('popup_delete_personal_token.title'),
@@ -269,6 +257,26 @@
 				if (args.options.action === 'two-factor-qr-setup') {
 					events.$emit('popup:open', {name: 'two-factor-qr-setup'})
 				}
+
+				// Get 2fa qr code
+				if (args.options.action === 'disable-2fa') {
+					axios
+						.delete('/user/two-factor-authentication')
+						.then(() => {
+							this.$store.commit('CHANGE_TWO_FACTOR_AUTHENTICATION_STATE', false)
+						})
+						.catch(() => {
+							this.$isSomethingWrong()
+						})
+						.finally(() => {
+							this.$closePopup()
+
+							events.$emit('toaster', {
+								type: 'success',
+								message: this.$t('popup_2fa.toaster_disabled'),
+							})
+						})
+				}
 			})
 
 			events.$on('reload-personal-access-tokens', () => this.getPersonalAccessTokens())