code refactor

src/store/index.js

@@ -29,6 +29,7 @@ import {
 } from './mutations.js';
 
 import user from './user.js';
+import twoFactorAuth from './twoFactorAuth.js';
 import token from './token.js';
 import exchangeRates from './exchangeRates.js';
 import account from './account.js';
@@ -264,6 +265,11 @@ const stores = {
         updateUserProfile: user.updateUserProfile,
         clearUserInfoState: user.clearUserInfoState,
         resetState: user.resetState,
+        get2FAStatus: twoFactorAuth.get2FAStatus,
+        enable2FA: twoFactorAuth.enable2FA,
+        confirmEnable2FA: twoFactorAuth.confirmEnable2FA,
+        disable2FA: twoFactorAuth.disable2FA,
+        regenerate2FARecoveryCode: twoFactorAuth.regenerate2FARecoveryCode,
         getAllTokens: token.getAllTokens,
         refreshTokenAndRevokeOldToken: token.refreshTokenAndRevokeOldToken,
         revokeToken: token.revokeToken,

src/store/twoFactorAuth.js

@@ -0,0 +1,148 @@
+import userState from '../lib/userstate.js';
+import services from '../lib/services.js';
+import logger from '../lib/logger.js';
+import utils from '../lib/utils.js';
+
+function get2FAStatus() {
+    return new Promise((resolve, reject) => {
+        services.get2FAStatus().then(response => {
+            const data = response.data;
+
+            if (!data || !data.success || !data.result || !utils.isBoolean(data.result.enable)) {
+                reject({ message: 'Unable to get current two factor authentication status' });
+                return;
+            }
+
+            resolve(data.result);
+        }).catch(error => {
+            logger.error('failed to get 2fa status', error);
+
+            if (error.response && error.response.data && error.response.data.errorMessage) {
+                reject({ error: error.response.data });
+            } else if (!error.processed) {
+                reject({ message: 'Unable to get current two factor authentication status' });
+            } else {
+                reject(error);
+            }
+        });
+    });
+}
+
+function enable2FA() {
+    return new Promise((resolve, reject) => {
+        services.enable2FA().then(response => {
+            const data = response.data;
+
+            if (!data || !data.success || !data.result || !data.result.qrcode || !data.result.secret) {
+                reject({ message: 'Unable to enable two factor authentication' });
+                return;
+            }
+
+            resolve(data.result);
+        }).catch(error => {
+            logger.error('failed to request to enable 2fa', error);
+
+            if (error.response && error.response.data && error.response.data.errorMessage) {
+                reject({ error: error.response.data });
+            } else if (!error.processed) {
+                reject({ message: 'Unable to enable two factor authentication' });
+            } else {
+                reject(error);
+            }
+        });
+    });
+}
+
+function confirmEnable2FA(context, { secret, passcode }) {
+    return new Promise((resolve, reject) => {
+        services.confirmEnable2FA({
+            secret: secret,
+            passcode: passcode
+        }).then(response => {
+            const data = response.data;
+
+            if (!data || !data.success || !data.result || !data.result.token) {
+                reject({ message: 'Unable to enable two factor authentication' });
+                return;
+            }
+
+            if (data.result.token) {
+                userState.updateToken(data.result.token);
+            }
+
+            resolve(data.result);
+        }).catch(error => {
+            logger.error('failed to confirm to enable 2fa', error);
+
+            if (error.response && error.response.data && error.response.data.errorMessage) {
+                reject({ error: error.response.data });
+            } else if (!error.processed) {
+                reject({ message: 'Unable to enable two factor authentication' });
+            } else {
+                reject(error);
+            }
+        });
+    });
+}
+
+function disable2FA(context, { password }) {
+    return new Promise((resolve, reject) => {
+        services.disable2FA({
+            password: password
+        }).then(response => {
+            const data = response.data;
+
+            if (!data || !data.success || !data.result) {
+                reject({ message: 'Unable to disable two factor authentication' });
+                return;
+            }
+
+            resolve(data.result);
+        }).catch(error => {
+            logger.error('failed to disable 2fa', error);
+
+            if (error.response && error.response.data && error.response.data.errorMessage) {
+                reject({ error: error.response.data });
+            } else if (!error.processed) {
+                reject({ message: 'Unable to disable two factor authentication' });
+            } else {
+                reject(error);
+            }
+        });
+    });
+}
+
+function regenerate2FARecoveryCode(context, { password }) {
+    return new Promise((resolve, reject) => {
+        services.regenerate2FARecoveryCode({
+            password: password
+        }).then(response => {
+            const data = response.data;
+
+            if (!data || !data.success || !data.result || !data.result.recoveryCodes || !data.result.recoveryCodes.length) {
+                reject({ message: 'Unable to regenerate two factor authentication backup codes' });
+                return;
+            }
+
+            resolve(data.result);
+        }).catch(error => {
+            logger.error('failed to regenerate 2fa recovery code', error);
+
+            if (error.response && error.response.data && error.response.data.errorMessage) {
+                reject({ error: error.response.data });
+            } else if (!error.processed) {
+                reject({ message: 'Unable to regenerate two factor authentication backup codes' });
+            } else {
+                reject(error);
+            }
+        });
+    });
+}
+
+export default {
+    get2FAStatus,
+    enable2FA,
+    confirmEnable2FA,
+    disable2FA,
+    regenerate2FARecoveryCode
+}

src/views/mobile/users/TwoFactorAuth.vue

@@ -102,25 +102,14 @@ export default {
 
         self.loading = true;
 
-        self.$services.get2FAStatus().then(response => {
+        self.$store.dispatch('get2FAStatus').then(response => {
-            const data = response.data;
+            self.status = response.enable;
-
-            if (!data || !data.success || !data.result || !self.$utilities.isBoolean(data.result.enable)) {
-                self.$toast('Unable to get current two factor authentication status');
-                router.back();
-                return;
-            }
-
-            self.status = data.result.enable;
             self.loading = false;
         }).catch(error => {
-            self.$logger.error('failed to get 2fa status', error);
+            self.loading = false;
 
-            if (error.response && error.response.data && error.response.data.errorMessage) {
+            if (!error.processed) {
-                self.$toast({ error: error.response.data });
+                self.$toast(error.message || error);
-                router.back();
-            } else if (!error.processed) {
-                self.$toast('Unable to get current two factor authentication status');
                 router.back();
             }
         });
@@ -135,30 +124,20 @@ export default {
             self.enabling = true;
             self.$showLoading(() => self.enabling);
 
-            self.$services.enable2FA().then(response => {
+            self.$store.dispatch('enable2FA').then(response => {
                 self.enabling = false;
                 self.$hideLoading();
-                const data = response.data;
 
-                if (!data || !data.success || !data.result || !data.result.qrcode || !data.result.secret) {
+                self.new2FAQRCode = response.qrcode;
-                    self.$toast('Unable to enable two factor authentication');
+                self.new2FASecret = response.secret;
-                    return;
-                }
-
-                self.new2FAQRCode = data.result.qrcode;
-                self.new2FASecret = data.result.secret;
 
                 self.showInputPasscodeSheetForEnable = true;
             }).catch(error => {
-                self.$logger.error('failed to request to enable 2fa', error);
-
                 self.enabling = false;
                 self.$hideLoading();
 
-                if (error.response && error.response.data && error.response.data.errorMessage) {
+                if (!error.processed) {
-                    self.$toast({error: error.response.data});
+                    self.$toast(error.message || error);
-                } else if (!error.processed) {
-                    self.$toast('Unable to enable two factor authentication');
                 }
             });
         },
@@ -168,18 +147,12 @@ export default {
             self.enableConfirming = true;
             self.$showLoading(() => self.enableConfirming);
 
-            self.$services.confirmEnable2FA({
+            self.$store.dispatch('confirmEnable2FA', {
                 secret: self.new2FASecret,
                 passcode: self.currentPasscodeForEnable
             }).then(response => {
                 self.enableConfirming = false;
                 self.$hideLoading();
-                const data = response.data;
-
-                if (!data || !data.success || !data.result || !data.result.token) {
-                    self.$toast('Unable to enable two factor authentication');
-                    return;
-                }
 
                 self.new2FAQRCode = '';
                 self.new2FASecret = '';
@@ -187,22 +160,16 @@ export default {
                 self.status = true;
                 self.showInputPasscodeSheetForEnable = false;
 
-                self.$user.updateToken(data.result.token);
+                if (response.recoveryCodes && response.recoveryCodes.length) {
-
+                    self.currentBackupCode = response.recoveryCodes.join('\n');
-                if (data.result.recoveryCodes && data.result.recoveryCodes.length) {
-                    self.currentBackupCode = data.result.recoveryCodes.join('\n');
                     self.showBackupCodeSheet = true;
                 }
             }).catch(error => {
-                self.$logger.error('failed to confirm to enable 2fa', error);
-
                 self.enableConfirming = false;
                 self.$hideLoading();
 
-                if (error.response && error.response.data && error.response.data.errorMessage) {
+                if (!error.processed) {
-                    self.$toast({error: error.response.data});
+                    self.$toast(error.message || error);
-                } else if (!error.processed) {
-                    self.$toast('Unable to enable two factor authentication');
                 }
             });
         },
@@ -218,31 +185,21 @@ export default {
             self.disabling = true;
             self.$showLoading(() => self.disabling);
 
-            self.$services.disable2FA({
+            self.$store.dispatch('disable2FA', {
                 password: password
-            }).then(response => {
+            }).then(() => {
                 self.disabling = false;
                 self.$hideLoading();
-                const data = response.data;
-
-                if (!data || !data.success || !data.result) {
-                    self.$toast('Unable to disable two factor authentication');
-                    return;
-                }
 
                 self.status = false;
                 self.showInputPasswordSheetForDisable = false;
                 self.$toast('Two factor authentication has been disabled');
             }).catch(error => {
-                self.$logger.error('failed to disable 2fa', error);
-
                 self.disabling = false;
                 self.$hideLoading();
 
-                if (error.response && error.response.data && error.response.data.errorMessage) {
+                if (!error.processed) {
-                    self.$toast({error: error.response.data});
+                    self.$toast(error.message || error);
-                } else if (!error.processed) {
-                    self.$toast('Unable to disable two factor authentication');
                 }
             });
         },
@@ -258,32 +215,22 @@ export default {
             self.regenerating = true;
             self.$showLoading(() => self.regenerating);
 
-            self.$services.regenerate2FARecoveryCode({
+            self.$store.dispatch('regenerate2FARecoveryCode', {
                 password: password
             }).then(response => {
                 self.regenerating = false;
                 self.$hideLoading();
-                const data = response.data;
-
-                if (!data || !data.success || !data.result || !data.result.recoveryCodes || !data.result.recoveryCodes.length) {
-                    self.$toast('Unable to regenerate two factor authentication backup codes');
-                    return;
-                }
 
                 self.showInputPasswordSheetForRegenerate = false;
 
-                self.currentBackupCode = data.result.recoveryCodes.join('\n');
+                self.currentBackupCode = response.recoveryCodes.join('\n');
                 self.showBackupCodeSheet = true;
             }).catch(error => {
-                self.$logger.error('failed to regenerate 2fa recovery code', error);
-
                 self.regenerating = false;
                 self.$hideLoading();
 
-                if (error.response && error.response.data && error.response.data.errorMessage) {
+                if (!error.processed) {
-                    self.$toast({error: error.response.data});
+                    self.$toast(error.message || error);
-                } else if (!error.processed) {
-                    self.$toast('Unable to regenerate two factor authentication backup codes');
                 }
             });
         },