diff --git a/src/popup/app/accounts/accountsLoginTwoFactorController.js b/src/popup/app/accounts/accountsLoginTwoFactorController.js index 717b392cdb..d958d1bfa4 100644 --- a/src/popup/app/accounts/accountsLoginTwoFactorController.js +++ b/src/popup/app/accounts/accountsLoginTwoFactorController.js @@ -67,11 +67,6 @@ }); }; - $scope.lostApp = function () { - $analytics.eventTrack('Selected Lost 2FA App'); - chrome.tabs.create({ url: 'https://help.bitwarden.com/article/lost-two-step-device/' }); - }; - $scope.sendEmail = function (doToast) { if ($scope.providerType !== constants.twoFactorProvider.email) { return; @@ -126,7 +121,7 @@ providerPriority = provider[0].priority; } } - return parseInt(providerType); + return providerType == null ? null : parseInt(providerType); } function init() { diff --git a/src/popup/app/accounts/accountsTwoFactorMethodsController.js b/src/popup/app/accounts/accountsTwoFactorMethodsController.js index 77cc5d5016..0e69338e21 100644 --- a/src/popup/app/accounts/accountsTwoFactorMethodsController.js +++ b/src/popup/app/accounts/accountsTwoFactorMethodsController.js @@ -2,7 +2,7 @@ .module('bit.accounts') .controller('accountsTwoFactorMethodsController', function ($scope, $state, $stateParams, constantsService, - utilsService, i18nService) { + utilsService, i18nService, $analytics) { $scope.i18n = i18nService; var constants = constantsService; @@ -49,6 +49,11 @@ }); }; + $scope.recover = function () { + $analytics.eventTrack('Selected Recover'); + chrome.tabs.create({ url: 'https://help.bitwarden.com/article/lost-two-step-device/' }); + }; + function add(type) { for (var i = 0; i < constants.twoFactorProviderInfo.length; i++) { if (constants.twoFactorProviderInfo[i].type === type) { diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html index f39f83af1e..0523f60d47 100644 --- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html +++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html @@ -106,7 +106,7 @@
- +

Loading...

@@ -130,3 +130,27 @@

+ +
+
+ +
Login Unavailable
+
+
+
+

+ This account has two-factor login enabled, however, none of the configured two-factor providers are + supported by this web browser. +

+

+ Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported + across web browsers (such as an authenticator app). +

+
+

+ Use another two-step login method +

+
+
diff --git a/src/popup/app/accounts/views/accountsTwoFactorMethods.html b/src/popup/app/accounts/views/accountsTwoFactorMethods.html index 06e6986e0b..d4327fd9c3 100644 --- a/src/popup/app/accounts/views/accountsTwoFactorMethods.html +++ b/src/popup/app/accounts/views/accountsTwoFactorMethods.html @@ -13,6 +13,13 @@ {{provider.name}} {{provider.description}} + + Recovery Code + + Lost access to all of your two-factor providers? Use your recovery code to disable + all two-factor providers from your account. + +