From dda64b301efd93ecfb0ee972e3a941a8b337fa6a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Fri, 23 Jun 2017 12:39:56 -0400 Subject: [PATCH] 2fa cleanup --- src/app/accounts/accountsLoginController.js | 1 + .../accountsTwoFactorMethodsController.js | 35 ++--- .../views/accountsLoginTwoFactor.html | 14 +- .../views/accountsTwoFactorMethods.html | 3 +- src/app/constants.js | 39 ++++++ src/app/settings/settingsTwoStepController.js | 123 ++++-------------- src/app/settings/views/settingsTwoStep.html | 22 +--- src/images/two-factor/authapp.png | Bin 0 -> 6054 bytes src/images/two-factor/duo.png | Bin 0 -> 1211 bytes src/images/two-factor/fido.png | Bin 0 -> 4810 bytes src/images/two-factor/gmail.png | Bin 0 -> 2675 bytes src/images/two-factor/yubico.png | Bin 0 -> 1624 bytes 12 files changed, 90 insertions(+), 147 deletions(-) create mode 100644 src/images/two-factor/authapp.png create mode 100644 src/images/two-factor/duo.png create mode 100644 src/images/two-factor/fido.png create mode 100644 src/images/two-factor/gmail.png create mode 100644 src/images/two-factor/yubico.png diff --git a/src/app/accounts/accountsLoginController.js b/src/app/accounts/accountsLoginController.js index 645d7f004fc..8f280ede416 100644 --- a/src/app/accounts/accountsLoginController.js +++ b/src/app/accounts/accountsLoginController.js @@ -4,6 +4,7 @@ angular .controller('accountsLoginController', function ($scope, $rootScope, $cookies, apiService, cryptoService, authService, $state, constants, $analytics, $uibModal, $timeout, $window) { $scope.state = $state; + $scope.twoFactorProviderConstants = constants.twoFactorProvider; var returnState; if (!$state.params.returnState && $state.params.org) { diff --git a/src/app/accounts/accountsTwoFactorMethodsController.js b/src/app/accounts/accountsTwoFactorMethodsController.js index 50fd0a34a39..5b0ce661755 100644 --- a/src/app/accounts/accountsTwoFactorMethodsController.js +++ b/src/app/accounts/accountsTwoFactorMethodsController.js @@ -7,41 +7,34 @@ $scope.providers = []; if (providers.hasOwnProperty(constants.twoFactorProvider.authenticator)) { - $scope.providers.push({ - id: constants.twoFactorProvider.authenticator, - name: 'Authenticator App' - }); + add(constants.twoFactorProvider.authenticator); } if (providers.hasOwnProperty(constants.twoFactorProvider.yubikey)) { - $scope.providers.push({ - id: constants.twoFactorProvider.yubikey, - name: 'YubiKey' - }); + add(constants.twoFactorProvider.yubikey); } if (providers.hasOwnProperty(constants.twoFactorProvider.email)) { - $scope.providers.push({ - id: constants.twoFactorProvider.email, - name: 'Email' - }); + add(constants.twoFactorProvider.email); } if (providers.hasOwnProperty(constants.twoFactorProvider.duo)) { - $scope.providers.push({ - id: constants.twoFactorProvider.duo, - name: 'Duo' - }); + add(constants.twoFactorProvider.duo); } if (providers.hasOwnProperty(constants.twoFactorProvider.u2f)) { - $scope.providers.push({ - id: constants.twoFactorProvider.u2f, - name: 'FIDO U2F Security Key' - }); + add(constants.twoFactorProvider.u2f); } $scope.choose = function (provider) { - $uibModalInstance.close(provider.id); + $uibModalInstance.close(provider.type); }; $scope.close = function () { $uibModalInstance.dismiss('close'); }; + + function add(type) { + for (var i = 0; i < constants.twoFactorProviderInfo.length; i++) { + if (constants.twoFactorProviderInfo[i].type === type) { + $scope.providers.push(constants.twoFactorProviderInfo[i]); + } + } + } }); diff --git a/src/app/accounts/views/accountsLoginTwoFactor.html b/src/app/accounts/views/accountsLoginTwoFactor.html index 90b4804b58d..b5bd7a402a0 100644 --- a/src/app/accounts/views/accountsLoginTwoFactor.html +++ b/src/app/accounts/views/accountsLoginTwoFactor.html @@ -1,8 +1,9 @@ -
-
+ -
@@ -30,7 +31,8 @@
-
+ +
@@ -58,7 +60,7 @@
-
+
@@ -85,7 +87,7 @@
-
+
diff --git a/src/app/accounts/views/accountsTwoFactorMethods.html b/src/app/accounts/views/accountsTwoFactorMethods.html index c1a7c596768..6d8f64000f0 100644 --- a/src/app/accounts/views/accountsTwoFactorMethods.html +++ b/src/app/accounts/views/accountsTwoFactorMethods.html @@ -2,9 +2,10 @@
-