From c0ca83193f68d18c28bb1a945c33b87ca2f9146b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 8 Mar 2022 08:51:31 +0100
Subject: [PATCH] prematurely 2fa switched before 2fa was set fix

---
 config/vuefilemanager.php                            |  2 +-
 resources/js/components/Others/Forms/SwitchInput.vue |  4 +++-
 resources/js/views/User/Password.vue                 | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php
index 0f8e7530..25c9889b 100644
--- a/config/vuefilemanager.php
+++ b/config/vuefilemanager.php
@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'version' => '2.0.0-Rc.1',
+    'version' => '2.0.0-Rc.2',
 
     'is_demo' => env('APP_DEMO', false),
 
diff --git a/resources/js/components/Others/Forms/SwitchInput.vue b/resources/js/components/Others/Forms/SwitchInput.vue
index c0258e26..e616174c 100644
--- a/resources/js/components/Others/Forms/SwitchInput.vue
+++ b/resources/js/components/Others/Forms/SwitchInput.vue
@@ -18,7 +18,7 @@
 <script>
 export default {
     name: 'SwitchInput',
-    props: ['label', 'name', 'state', 'info', 'input'],
+    props: ['label', 'name', 'state', 'info', 'input', 'isDisabled'],
     data() {
         return {
             isSwitched: undefined,
@@ -26,6 +26,8 @@ export default {
     },
     methods: {
         changeState() {
+			if (this.isDisabled) return
+
             this.isSwitched = !this.isSwitched
             this.$emit('input', this.isSwitched)
         },
diff --git a/resources/js/views/User/Password.vue b/resources/js/views/User/Password.vue
index e7ed52de..78e5d435 100644
--- a/resources/js/views/User/Password.vue
+++ b/resources/js/views/User/Password.vue
@@ -11,6 +11,8 @@
                 :is-last="!user.data.attributes.two_factor_authentication"
             >
                 <SwitchInput
+					@click.native="toggle2Fa"
+					:is-disabled="true"
                     v-model="user.data.attributes.two_factor_authentication"
                     class="switch"
                     :state="user.data.attributes.two_factor_authentication"
@@ -169,11 +171,6 @@ export default {
     computed: {
         ...mapGetters(['user']),
     },
-    watch: {
-        'user.data.attributes.two_factor_authentication': function (val) {
-            val ? this.enable2faPopup() : this.disable2faPopup()
-        },
-    },
     data() {
         return {
             passwordForm: {
@@ -186,6 +183,9 @@ export default {
         }
     },
     methods: {
+		toggle2Fa() {
+			this.user.data.attributes.two_factor_authentication ? this.disable2faPopup() : this.enable2faPopup()
+		},
         async resetPassword() {
             // Validate fields
             const isValid = await this.$refs.password.validate()