mirror of
https://github.com/bitwarden/browser
synced 2025-12-19 09:43:23 +00:00
refactor out callbacks from folderService
This commit is contained in:
Kyle Spearrin
@@ -25,92 +25,86 @@ function initFolderService() {
|
||||
});
|
||||
};
|
||||
|
||||
FolderService.prototype.get = function (id, callback) {
|
||||
if (!callback || typeof callback !== 'function') {
|
||||
throw 'callback function required';
|
||||
}
|
||||
FolderService.prototype.get = function (id) {
|
||||
var self = this;
|
||||
|
||||
this.userService.getUserId(function (userId) {
|
||||
var foldersKey = 'folders_' + userId;
|
||||
return self.userService.getUserIdPromise().then(function (userId) {
|
||||
return self.utilsService.getObjFromStorage('folders_' + userId);
|
||||
}).then(function (folders) {
|
||||
if (folders && id in folders) {
|
||||
return new Folder(folders[id]);
|
||||
}
|
||||
|
||||
chrome.storage.local.get(foldersKey, function (obj) {
|
||||
var folders = obj[foldersKey];
|
||||
if (folders && id in folders) {
|
||||
callback(new Folder(folders[id]));
|
||||
return;
|
||||
}
|
||||
|
||||
callback(null);
|
||||
});
|
||||
return null;
|
||||
});
|
||||
};
|
||||
|
||||
FolderService.prototype.getAll = function (callback) {
|
||||
if (!callback || typeof callback !== 'function') {
|
||||
throw 'callback function required';
|
||||
}
|
||||
FolderService.prototype.getAll = function () {
|
||||
var self = this;
|
||||
|
||||
this.userService.getUserId(function (userId) {
|
||||
var foldersKey = 'folders_' + userId;
|
||||
return self.userService.getUserIdPromise().then(function (userId) {
|
||||
return self.utilsService.getObjFromStorage('folders_' + userId);
|
||||
}).then(function (folders) {
|
||||
var response = [];
|
||||
for (var id in folders) {
|
||||
var folder = folders[id];
|
||||
response.push(new Folder(folder));
|
||||
}
|
||||
|
||||
chrome.storage.local.get(foldersKey, function (obj) {
|
||||
var folders = obj[foldersKey];
|
||||
var response = [];
|
||||
for (var id in folders) {
|
||||
var folder = folders[id];
|
||||
response.push(new Folder(folder));
|
||||
}
|
||||
|
||||
callback(response);
|
||||
});
|
||||
return response;
|
||||
});
|
||||
};
|
||||
|
||||
FolderService.prototype.getAllDecrypted = function () {
|
||||
var deferred = Q.defer();
|
||||
var self = this;
|
||||
if (this.decryptedFolderCache) {
|
||||
return Q(this.decryptedFolderCache);
|
||||
}
|
||||
|
||||
var deferred = Q.defer(),
|
||||
self = this,
|
||||
decFolders = [{
|
||||
id: null,
|
||||
name: self.i18nService.noneFolder
|
||||
}];
|
||||
|
||||
self.cryptoService.getKey().then(function (key) {
|
||||
if (!key) {
|
||||
deferred.reject();
|
||||
return;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (self.decryptedFolderCache) {
|
||||
deferred.resolve(self.decryptedFolderCache);
|
||||
return self.getAll();
|
||||
|
||||
}).then(function (folders) {
|
||||
if (folders === true) {
|
||||
return;
|
||||
}
|
||||
|
||||
var promises = [];
|
||||
var decFolders = [{
|
||||
id: null,
|
||||
name: self.i18nService.noneFolder
|
||||
}];
|
||||
self.getAll(function (folders) {
|
||||
for (var i = 0; i < folders.length; i++) {
|
||||
/* jshint ignore:start */
|
||||
promises.push(folders[i].decrypt().then(function (folder) {
|
||||
decFolders.push(folder);
|
||||
}));
|
||||
/* jshint ignore:end */
|
||||
}
|
||||
for (var i = 0; i < folders.length; i++) {
|
||||
/* jshint ignore:start */
|
||||
promises.push(folders[i].decrypt().then(function (folder) {
|
||||
decFolders.push(folder);
|
||||
}));
|
||||
/* jshint ignore:end */
|
||||
}
|
||||
|
||||
Q.all(promises).then(function () {
|
||||
if (decFolders.length > 0) {
|
||||
self.decryptedFolderCache = decFolders;
|
||||
}
|
||||
deferred.resolve(decFolders);
|
||||
});
|
||||
});
|
||||
return Q.all(promises);
|
||||
}).then(function (stop) {
|
||||
if (stop === true) {
|
||||
return;
|
||||
}
|
||||
|
||||
self.decryptedFolderCache = decFolders;
|
||||
deferred.resolve(self.decryptedFolderCache);
|
||||
});
|
||||
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
FolderService.prototype.saveWithServer = function (folder) {
|
||||
var deferred = Q.defer();
|
||||
|
||||
var self = this,
|
||||
var deferred = Q.defer(),
|
||||
self = this,
|
||||
request = new FolderRequest(folder);
|
||||
|
||||
if (!folder.id) {
|
||||
@@ -128,53 +122,45 @@ function initFolderService() {
|
||||
folder.id = response.id;
|
||||
self.userService.getUserId(function (userId) {
|
||||
var data = new FolderData(response, userId);
|
||||
self.upsert(data, function () {
|
||||
deferred.resolve(folder);
|
||||
});
|
||||
return self.upsert(data);
|
||||
}).then(function () {
|
||||
deferred.resolve(folder);
|
||||
});
|
||||
}
|
||||
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
FolderService.prototype.upsert = function (folder, callback) {
|
||||
if (!callback || typeof callback !== 'function') {
|
||||
throw 'callback function required';
|
||||
}
|
||||
FolderService.prototype.upsert = function (folder) {
|
||||
var self = this,
|
||||
key = null;
|
||||
|
||||
var self = this;
|
||||
return self.userService.getUserIdPromise(function (userId) {
|
||||
key = 'folders_' + userId;
|
||||
return self.utilsService.getObjFromStorage(key);
|
||||
}).then(function (folders) {
|
||||
if (!folders) {
|
||||
folders = {};
|
||||
}
|
||||
|
||||
self.userService.getUserId(function (userId) {
|
||||
var foldersKey = 'folders_' + userId;
|
||||
|
||||
chrome.storage.local.get(foldersKey, function (obj) {
|
||||
var folders = obj[foldersKey];
|
||||
if (!folders) {
|
||||
folders = {};
|
||||
if (folder.constructor === Array) {
|
||||
for (var i = 0; i < folder.length; i++) {
|
||||
folders[folder[i].id] = folder[i];
|
||||
}
|
||||
}
|
||||
else {
|
||||
folders[folder.id] = folder;
|
||||
}
|
||||
|
||||
if (folder.constructor === Array) {
|
||||
for (var i = 0; i < folder.length; i++) {
|
||||
folders[folder[i].id] = folder[i];
|
||||
}
|
||||
}
|
||||
else {
|
||||
folders[folder.id] = folder;
|
||||
}
|
||||
|
||||
obj[foldersKey] = folders;
|
||||
|
||||
chrome.storage.local.set(obj, function () {
|
||||
self.decryptedFolderCache = null;
|
||||
callback();
|
||||
});
|
||||
});
|
||||
return self.utilsService.saveObjToStorage(key, ciphers);
|
||||
}).then(function () {
|
||||
self.decryptedFolderCache = null;
|
||||
});
|
||||
};
|
||||
|
||||
FolderService.prototype.replace = function (folders) {
|
||||
var self = this;
|
||||
self.userService.getUserIdPromise().then(function (userId) {
|
||||
return self.userService.getUserIdPromise().then(function (userId) {
|
||||
return self.utilsService.saveObjToStorage('folders_' + userId, folders);
|
||||
}).then(function () {
|
||||
self.decryptedFolderCache = null;
|
||||
@@ -188,62 +174,53 @@ function initFolderService() {
|
||||
});
|
||||
};
|
||||
|
||||
FolderService.prototype.delete = function (id, callback) {
|
||||
if (!callback || typeof callback !== 'function') {
|
||||
throw 'callback function required';
|
||||
}
|
||||
|
||||
var self = this;
|
||||
FolderService.prototype.delete = function (id) {
|
||||
var self = this,
|
||||
key = null;
|
||||
|
||||
// TODO: Delete folder reference for associated ciphers
|
||||
|
||||
self.userService.getUserId(function (userId) {
|
||||
var foldersKey = 'folders_' + userId;
|
||||
return self.userService.getUserIdPromise().then(function () {
|
||||
key = 'folders_' + userId;
|
||||
return self.utilsService.getObjFromStorage(key);
|
||||
}).then(function (folders) {
|
||||
if (!folders) {
|
||||
return null;
|
||||
}
|
||||
|
||||
chrome.storage.local.get(foldersKey, function (obj) {
|
||||
var folders = obj[foldersKey];
|
||||
if (!folders) {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
|
||||
if (id.constructor === Array) {
|
||||
for (var i = 0; i < id.length; i++) {
|
||||
if (id[i] in folders) {
|
||||
delete folders[id[i]];
|
||||
}
|
||||
if (id.constructor === Array) {
|
||||
for (var i = 0; i < id.length; i++) {
|
||||
if (id[i] in folders) {
|
||||
delete folders[id[i]];
|
||||
}
|
||||
}
|
||||
else if (id in folders) {
|
||||
delete folders[id];
|
||||
}
|
||||
else {
|
||||
callback();
|
||||
return;
|
||||
}
|
||||
}
|
||||
else if (id in folders) {
|
||||
delete folders[id];
|
||||
}
|
||||
else {
|
||||
return null;
|
||||
}
|
||||
|
||||
obj[foldersKey] = folders;
|
||||
chrome.storage.local.set(obj, function () {
|
||||
self.decryptedFolderCache = null;
|
||||
callback();
|
||||
});
|
||||
});
|
||||
return folders;
|
||||
}).then(function (folders) {
|
||||
if (!folders) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return self.utilsService.saveObjToStorage(key, folders);
|
||||
}).then(function (clearCache) {
|
||||
if (clearCache !== false) {
|
||||
self.decryptedFolderCache = null;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
FolderService.prototype.deleteWithServer = function (id) {
|
||||
var deferred = Q.defer();
|
||||
|
||||
var self = this;
|
||||
self.apiService.deleteFolder(id, function () {
|
||||
self.delete(id, function () {
|
||||
deferred.resolve();
|
||||
});
|
||||
}, function (response) {
|
||||
handleError(response, deferred);
|
||||
return self.apiService.deleteFolder(id).then(function () {
|
||||
return self.delete(id);
|
||||
});
|
||||
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
function handleError(error, deferred) {
|
||||
|
||||
Reference in New Issue
Block a user