bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 08:43:33 +00:00
Code Issues Releases Wiki Activity

more promise/utils helper conversions

Browse Source
This commit is contained in:
Kyle Spearrin
2017-10-17 12:22:50 -04:00
parent 0fdee0f13b
commit 999689cf7e
5 changed files with 98 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@
cryptoService.hashPassword($scope.masterPassword, key, function (keyHash) {
cryptoService.getKeyHash(function (storedKeyHash) {
if (storedKeyHash && keyHash && storedKeyHash === keyHash) {
cryptoService.setKey(key, function () {
cryptoService.setKey(key).then(function () {
chrome.runtime.sendMessage({ command: 'unlocked' });
$state.go('tabs.current');
});

2
src/popup/app/services/authService.js
View File

@@ -41,7 +41,7 @@
}
tokenService.setTokens(response.accessToken, response.refreshToken, function () {
cryptoService.setKey(key, function () {
cryptoService.setKey(key).then(function () {
cryptoService.setKeyHash(hashedPassword, function () {
userService.setUserIdAndEmail(tokenService.getUserId(), tokenService.getEmail(),
function () {

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

@@ -33,7 +33,7 @@
chrome.storage.local.set(obj, function () {
cryptoService.getKeyHash(function (keyHash) {
if (keyHash) {
cryptoService.toggleKey(function () { });
cryptoService.toggleKey();
}
else {
SweetAlert.swal({
@@ -44,7 +44,7 @@
cancelButtonText: i18nService.cancel
}, function (confirmed) {
if (confirmed) {
cryptoService.toggleKey(function () { });
cryptoService.toggleKey();
chrome.runtime.sendMessage({ command: 'logout' });
}
});