bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-03-02 03:21:19 +00:00
Code Issues Releases Wiki Activity

refactoring with promises throughout

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-16 23:47:50 -04:00
parent 2fcf3ff129
commit ac4d5836b2
11 changed files with 94 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/services/folderService.js
View File

@@ -13,26 +13,12 @@ function initFolderService() {
id: folder.id
};
var deferred = Q.defer();
encryptWithPromise(folder.name).then(function (cs) {
return cryptoService.encrypt(folder.name).then(function (cs) {
model.name = cs;
deferred.resolve(model);
return model;
});
return deferred.promise;
};
function encryptWithPromise(plaintextString) {
var deferred = Q.defer();
cryptoService.encrypt(plaintextString, function (cipherString) {
deferred.resolve(cipherString);
});
return deferred.promise;
}
FolderService.prototype.get = function (id, callback) {
if (!callback || typeof callback !== 'function') {
throw 'callback function required';
@@ -101,10 +87,8 @@ function initFolderService() {
return deferred.promise;
};
FolderService.prototype.saveWithServer = function (folder, callback) {
if (!callback || typeof callback !== 'function') {
throw 'callback function required';
}
FolderService.prototype.saveWithServer = function (folder) {
var deferred = Q.defer();
var self = this,
request = new FolderRequest(folder);
@@ -121,10 +105,12 @@ function initFolderService() {
userService.getUserId(function (userId) {
var data = new FolderData(response, userId);
self.upsert(data, function () {
callback(folder);
deferred.resolve(folder);
});
});
}
return deferred.promise;
};
FolderService.prototype.upsert = function (folder, callback) {