Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-22 11:45:59 +01:00
Code Issues Projects Releases Wiki Activity

bug fixes around fetching keys for org sync

Browse Source
This commit is contained in:
Kyle Spearrin 2017-04-26 11:59:31 -04:00
parent a20881383e
commit 1ce4b5443b
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/services/syncService.js
View File

@ -84,35 +84,41 @@ function initSyncService() {
var deferred = Q.defer(); var deferred = Q.defer();
var self = this; var self = this;
function setKeys(hasPrivateKey, response, d) {
if (response.organizations && response.organizations.length && !hasPrivateKey) {
self.apiService.getKeys(function (keysResponse) {
if (keysResponse.privateKey) {
self.cryptoService.setEncPrivateKey(keysResponse.privateKey).then(function () {
return self.cryptoService.setOrgKeys(response.organizations);
}, function () {
d.reject();
}).then(function () {
d.resolve();
}, function () {
d.reject();
});
}
else {
d.resolve();
}
}, function () {
d.reject();
});
}
else {
self.cryptoService.setOrgKeys(response.organizations).then(function () {
d.resolve();
}, function () {
d.reject();
});
}
}
self.apiService.getProfile(function (response) { self.apiService.getProfile(function (response) {
self.cryptoService.getPrivateKey().then(function (privateKey) { self.cryptoService.getPrivateKey().then(function (privateKey) {
if (response.organizations && !privateKey) { setKeys(!!privateKey, response, deferred);
self.apiService.getKeys(function (keysResponse) { }, function () {
if (keysResponse.privateKey) { setKeys(false, response, deferred);
self.cryptoService.setEncPrivateKey(keysResponse.privateKey).then(function () {
return self.cryptoService.setOrgKeys(response.organizations);
}, function () {
deferred.reject();
}).then(function () {
deferred.resolve();
}, function () {
deferred.reject();
});
}
else {
deferred.resolve();
}
}, function () {
deferred.reject();
});
}
else {
self.cryptoService.setOrgKeys(response.organizations).then(function () {
deferred.resolve();
}, function () {
deferred.reject();
});
}
}); });
}, function () { }, function () {
deferred.reject(); deferred.reject();