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

folder save fixes

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-17 09:07:36 -04:00
parent ec3f0b25f6
commit 1b66b255f3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/services/apiService.js
View File

@ -213,6 +213,8 @@ function initApiService() {
}, function (jqXHR) { }, function (jqXHR) {
handleError(deferred.reject, jqXHR, true, self); handleError(deferred.reject, jqXHR, true, self);
}); });
return deferred.promise;
}; };
ApiService.prototype.putFolder = function (id, folderRequest) { ApiService.prototype.putFolder = function (id, folderRequest) {
@ -237,6 +239,8 @@ function initApiService() {
}, function (jqXHR) { }, function (jqXHR) {
handleError(deferred.reject, jqXHR, true, self); handleError(deferred.reject, jqXHR, true, self);
}); });
return deferred.promise;
}; };
ApiService.prototype.deleteFolder = function (id) { ApiService.prototype.deleteFolder = function (id) {
@ -259,6 +263,8 @@ function initApiService() {
}, function (jqXHR) { }, function (jqXHR) {
handleError(deferred.reject, jqXHR, true, self); handleError(deferred.reject, jqXHR, true, self);
}); });
return deferred.promise;
}; };
// Cipher APIs // Cipher APIs

6
src/services/folderService.js
View File

@ -120,7 +120,7 @@ function initFolderService() {
function apiSuccess(response) { function apiSuccess(response) {
folder.id = response.id; folder.id = response.id;
self.userService.getUserId(function (userId) { self.userService.getUserIdPromise().then(function (userId) {
var data = new FolderData(response, userId); var data = new FolderData(response, userId);
return self.upsert(data); return self.upsert(data);
}).then(function () { }).then(function () {
@ -135,7 +135,7 @@ function initFolderService() {
var self = this, var self = this,
key = null; key = null;
return self.userService.getUserIdPromise(function (userId) { return self.userService.getUserIdPromise().then(function (userId) {
key = 'folders_' + userId; key = 'folders_' + userId;
return self.utilsService.getObjFromStorage(key); return self.utilsService.getObjFromStorage(key);
}).then(function (folders) { }).then(function (folders) {
@ -152,7 +152,7 @@ function initFolderService() {
folders[folder.id] = folder; folders[folder.id] = folder;
} }
return self.utilsService.saveObjToStorage(key, ciphers); return self.utilsService.saveObjToStorage(key, folders);
}).then(function () { }).then(function () {
self.decryptedFolderCache = null; self.decryptedFolderCache = null;
}); });