Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-07-10 12:55:16 +02:00
Code Issues Projects Releases Wiki Activity

handle user upgrade path for lock options gracefully with a log out prompt. Fixed log out bug on lock page.

Browse Source
This commit is contained in:
Kyle Spearrin 2016-10-26 00:56:46 -04:00
parent eff7e5431b
commit a462f728d3
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/popup/app/lock/lockController.js
View File

@ -7,21 +7,19 @@
$('#master-password').focus(); $('#master-password').focus();
$scope.logOut = function () { $scope.logOut = function () {
loginService.logOut(function () { SweetAlert.swal({
SweetAlert.swal({ title: 'Log Out',
title: 'Log Out', text: 'Are you sure you want to log out?',
text: 'Are you sure you want to log out?', showCancelButton: true,
showCancelButton: true, confirmButtonText: 'Yes',
confirmButtonText: 'Yes', cancelButtonText: 'Cancel'
cancelButtonText: 'Cancel' }, function (confirmed) {
}, function (confirmed) { if (confirmed) {
if (confirmed) { loginService.logOut(function () {
loginService.logOut(function () { $analytics.eventTrack('Logged Out');
$analytics.eventTrack('Logged Out'); $state.go('home');
$state.go('home'); });
}); }
}
});
}); });
}; };

24
src/popup/app/settings/settingsController.js
View File

@ -34,7 +34,29 @@
} }
chrome.storage.local.set(obj, function () { chrome.storage.local.set(obj, function () {
cryptoService.toggleKey(function () { }); cryptoService.getKeyHash(false, function (keyHash) {
if (keyHash) {
cryptoService.toggleKey(function () { });
}
else {
SweetAlert.swal({
title: 'Logging out',
text: 'You\'ve recently updated to v1.2.0. You must re-log in to change your lock options.' +
'Do you want to log out now?',
showCancelButton: true,
confirmButtonText: 'Yes',
cancelButtonText: 'Cancel'
}, function (confirmed) {
if (confirmed) {
cryptoService.toggleKey(function () { });
loginService.logOut(function () {
$analytics.eventTrack('Logged Out');
$state.go('home');
});
}
});
}
});
}); });
}; };