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

get private key if not available during sync

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-25 16:23:37 -04:00
parent f04908058f
commit 154427a0f3
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/services/syncService.js
View File

@@ -85,8 +85,34 @@ function initSyncService() {
var self = this;
self.apiService.getProfile(function (response) {
self.cryptoService.setOrgKeys(response.organizations).then(function () {
deferred.resolve();
self.cryptoService.getPrivateKey().then(function (privateKey) {
if (response.organizations && !privateKey) {
self.apiService.getKeys(function (keysResponse) {
if (keysResponse.privateKey) {
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 () {
deferred.reject();
@@ -103,7 +129,7 @@ function initSyncService() {
var folders = {};
for (var i = 0; i < response.data.length; i++) {
folders[response.data.id] = new FolderData(response.data[i], userId);
folders[response.data[i].id] = new FolderData(response.data[i], userId);
}
self.folderService.replace(folders, function () {