From 1b66b255f362dbc728b1898e6baff8c06cc4318c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 17 Oct 2017 09:07:36 -0400
Subject: [PATCH] folder save fixes

---
 src/services/apiService.js    | 6 ++++++
 src/services/folderService.js | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/services/apiService.js b/src/services/apiService.js
index e4415b7fc7..002b596e0f 100644
--- a/src/services/apiService.js
+++ b/src/services/apiService.js
@@ -213,6 +213,8 @@ function initApiService() {
         }, function (jqXHR) {
             handleError(deferred.reject, jqXHR, true, self);
         });
+
+        return deferred.promise;
     };
 
     ApiService.prototype.putFolder = function (id, folderRequest) {
@@ -237,6 +239,8 @@ function initApiService() {
         }, function (jqXHR) {
             handleError(deferred.reject, jqXHR, true, self);
         });
+
+        return deferred.promise;
     };
 
     ApiService.prototype.deleteFolder = function (id) {
@@ -259,6 +263,8 @@ function initApiService() {
         }, function (jqXHR) {
             handleError(deferred.reject, jqXHR, true, self);
         });
+
+        return deferred.promise;
     };
 
     // Cipher APIs
diff --git a/src/services/folderService.js b/src/services/folderService.js
index a53c12e331..be9a221271 100644
--- a/src/services/folderService.js
+++ b/src/services/folderService.js
@@ -120,7 +120,7 @@ function initFolderService() {
 
         function apiSuccess(response) {
             folder.id = response.id;
-            self.userService.getUserId(function (userId) {
+            self.userService.getUserIdPromise().then(function (userId) {
                 var data = new FolderData(response, userId);
                 return self.upsert(data);
             }).then(function () {
@@ -135,7 +135,7 @@ function initFolderService() {
         var self = this,
             key = null;
 
-        return self.userService.getUserIdPromise(function (userId) {
+        return self.userService.getUserIdPromise().then(function (userId) {
             key = 'folders_' + userId;
             return self.utilsService.getObjFromStorage(key);
         }).then(function (folders) {
@@ -152,7 +152,7 @@ function initFolderService() {
                 folders[folder.id] = folder;
             }
 
-            return self.utilsService.saveObjToStorage(key, ciphers);
+            return self.utilsService.saveObjToStorage(key, folders);
         }).then(function () {
             self.decryptedFolderCache = null;
         });