Recovery Code
+Recovery Code
+ Two-step Login recovery code +
+Your two-step login recovery code:
+{{code}}
diff --git a/src/app/accounts/accountsLoginController.js b/src/app/accounts/accountsLoginController.js index 62e03187ab..5ad205f87c 100644 --- a/src/app/accounts/accountsLoginController.js +++ b/src/app/accounts/accountsLoginController.js @@ -7,6 +7,10 @@ angular $scope.twoFactorProviderConstants = constants.twoFactorProvider; $scope.rememberTwoFactor = { checked: false }; + if ($state.current.name.indexOf('twoFactor') > -1 && (!$scope.twoFactorProviders || !$scope.twoFactorProviders.length)) { + $state.go('frontend.login.info', { returnState: returnState }); + } + var returnState; if (!$state.params.returnState && $state.params.org) { returnState = { @@ -24,6 +28,15 @@ angular email: $state.params.email ? $state.params.email : rememberedEmail, rememberEmail: rememberedEmail !== null }; + + $timeout(function () { + $("#masterPassword").focus(); + }); + } + else { + $timeout(function () { + $("#email").focus(); + }); } var _email, @@ -90,6 +103,10 @@ angular $scope.twoFactorPromise.then(function () { $analytics.eventTrack('Logged In From Two-step'); loggedInGo(); + }, function () { + if ($scope.twoFactorProvider === constants.twoFactorProvider.u2f) { + init(); + } }); }; diff --git a/src/app/accounts/accountsRegisterController.js b/src/app/accounts/accountsRegisterController.js index 9adf37e4ba..5f3e242e44 100644 --- a/src/app/accounts/accountsRegisterController.js +++ b/src/app/accounts/accountsRegisterController.js @@ -2,7 +2,7 @@ angular .module('bit.accounts') .controller('accountsRegisterController', function ($scope, $location, apiService, cryptoService, validationService, - $analytics, $state) { + $analytics, $state, $timeout) { var params = $location.search(); var stateParams = $state.params; $scope.createOrg = stateParams.org; @@ -23,6 +23,16 @@ angular }; $scope.readOnlyEmail = stateParams.email !== null; + + $timeout(function () { + if ($scope.model.email) { + $("#name").focus(); + } + else { + $("#email").focus(); + } + }); + $scope.registerPromise = null; $scope.register = function (form) { var error = false; diff --git a/src/app/accounts/views/accountsLoginTwoFactor.html b/src/app/accounts/views/accountsLoginTwoFactor.html index 25ae4ddc50..c9120d4cbe 100644 --- a/src/app/accounts/views/accountsLoginTwoFactor.html +++ b/src/app/accounts/views/accountsLoginTwoFactor.html @@ -146,7 +146,7 @@
- Lost your authenticator app? - - Help me! - + In the event that you cannot access your account through your normal two-step login methods, you can use your + two-step login recovery code to disable all two-step providers on your account. + Learn more
bitwarden two-step login recovery code:
' + + '' + $scope.code + '
' + new Date() + '
'); + w.print(); + w.close(); + }; + + function formatString(s) { + if (!s) { + return null; + } + + return s.replace(/(.{4})/g, '$1 ').trim().toUpperCase(); + } + + $scope.close = function () { + $uibModalInstance.close(); + }; + }); diff --git a/src/app/settings/views/settingsTwoStep.html b/src/app/settings/views/settingsTwoStep.html index 78318063ed..9132abba17 100644 --- a/src/app/settings/views/settingsTwoStep.html +++ b/src/app/settings/views/settingsTwoStep.html @@ -4,10 +4,15 @@Your two-step login recovery code:
+{{code}}