2fa page updates

This commit is contained in:
Kyle Spearrin 2018-01-18 16:25:15 -05:00
parent 43f563d187
commit 493508e467
5 changed files with 9 additions and 13 deletions

View File

@ -977,5 +977,8 @@
}, },
"clear": { "clear": {
"message": "Clear" "message": "Clear"
},
"2faNewWindowMessage": {
"message": "Complete your two-step login request using the new tab."
} }
} }

View File

@ -77,14 +77,12 @@ angular
$scope.loginPromise = authService.logIn(email, masterPassword, $scope.providerType, token, $scope.remember.checked); $scope.loginPromise = authService.logIn(email, masterPassword, $scope.providerType, token, $scope.remember.checked);
$scope.loginPromise.then(function () { $scope.loginPromise.then(function () {
$analytics.eventTrack('Logged In From Two-step'); $analytics.eventTrack('Logged In From Two-step');
$state.go('tabs.vault', { animation: 'in-slide-left', syncOnLoad: true }).then(function(){ $state.go('tabs.vault', { animation: 'in-slide-left', syncOnLoad: true }).then(function () {
if (sendSuccessToTab) { if (sendSuccessToTab) {
$timeout(function() { $timeout(function () {
BrowserApi.tabSendMessage(sendSuccessToTab, { BrowserApi.tabSendMessage(sendSuccessToTab, {
command: '2faPageData', command: '2faPageData',
data: { data: { type: 'success' }
type: 'success'
}
}); });
}, 1000); }, 1000);
} }

View File

@ -2,7 +2,7 @@ angular
.module('bit.accounts') .module('bit.accounts')
.controller('accountsTwoFactorMethodsController', function ($scope, $state, $stateParams, constantsService, .controller('accountsTwoFactorMethodsController', function ($scope, $state, $stateParams, constantsService,
utilsService, i18nService, $analytics) { utilsService, i18nService, $analytics, platformUtilsService) {
$scope.i18n = i18nService; $scope.i18n = i18nService;
var constants = constantsService; var constants = constantsService;

View File

@ -55,8 +55,8 @@
<div id="duoFrameWrapper" ng-if="!showNewWindowMessage"> <div id="duoFrameWrapper" ng-if="!showNewWindowMessage">
<iframe id="duo_iframe"></iframe> <iframe id="duo_iframe"></iframe>
</div> </div>
<div ng-if="showNewWindowMessage"> <div ng-if="showNewWindowMessage" class="two-factor-key-page">
<div class="two-step-window-message">Complete your two-step login request using the new window.</div> <p>{{i18n.2faNewWindowMessage}}</p>
</div> </div>
<div class="list"> <div class="list">
<div class="list-section"> <div class="list-section">

View File

@ -587,11 +587,6 @@
} }
} }
.two-step-window-message {
text-align: center;
margin: 30px 0 20px 0;
}
#duoFrameWrapper { #duoFrameWrapper {
background: ~"url('../images/loading.svg') 0 0 no-repeat"; background: ~"url('../images/loading.svg') 0 0 no-repeat";
width: 100%; width: 100%;