From 358fd8998901b18649cc89a3b6112afed776466f Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Sat, 10 Dec 2016 22:08:53 -0600
Subject: [PATCH] migrations

---
 .../javascripts/app/frontend/controllers/header.js     |  1 -
 .../javascripts/app/frontend/controllers/home.js       |  1 -
 app/assets/javascripts/app/services/apiController.js   | 10 ++++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/app/frontend/controllers/header.js b/app/assets/javascripts/app/frontend/controllers/header.js
index 4e5bc6271..dcc5f0a47 100644
--- a/app/assets/javascripts/app/frontend/controllers/header.js
+++ b/app/assets/javascripts/app/frontend/controllers/header.js
@@ -83,7 +83,6 @@ angular.module('app.frontend')
       this.loginData.status = "Generating Login Keys...";
       $timeout(function(){
         apiController.login(this.loginData.email, this.loginData.user_password, function(response){
-          console.log("login response", response);
           if(response.errors) {
             this.loginData.status = response.errors[0];
           } else {
diff --git a/app/assets/javascripts/app/frontend/controllers/home.js b/app/assets/javascripts/app/frontend/controllers/home.js
index 938f39db5..6ca66a70e 100644
--- a/app/assets/javascripts/app/frontend/controllers/home.js
+++ b/app/assets/javascripts/app/frontend/controllers/home.js
@@ -24,7 +24,6 @@ angular.module('app.frontend')
     }
 
     apiController.getCurrentUser(function(response){
-      console.log("get current response", response);
       if(response && !response.errors) {
         $scope.defaultUser = new User(response.plain());
         $rootScope.title = "Notes — Neeto";
diff --git a/app/assets/javascripts/app/services/apiController.js b/app/assets/javascripts/app/services/apiController.js
index 571e56c8f..9392db448 100644
--- a/app/assets/javascripts/app/services/apiController.js
+++ b/app/assets/javascripts/app/services/apiController.js
@@ -318,7 +318,6 @@ angular.module('app.services')
 
         var request = Restangular.one("users", user.id).one("notes", note.id);
         _.merge(request, params);
-        console.log("saving note", request);
         request.customOperation(request.id ? "put" : "post")
         .then(function(response) {
           var responseObject = response.plain();
@@ -332,21 +331,20 @@ angular.module('app.services')
       }
 
       this.createRequestParamsFromNote = function(note, user) {
-        var params = {};
+        var params = {id: note.id};
 
         if(user.local_encryption_enabled && !note.pending_share && !note.isPublic()) {
           // encrypted
           var noteCopy = _.cloneDeep(note);
           this.encryptSingleNote(noteCopy, this.retrieveGk());
 
-          params.loc_enc_content = noteCopy.loc_enc_content;
-          params.loc_eek = noteCopy.loc_eek;
+          params.loc_enc_content = noteCopy.loc_enc_content || local_encrypted_content;
+          params.loc_eek = noteCopy.loc_eek || noteCopy.local_eek;
         }
         else {
           // decrypted
           params.content = note.JSONContent();
         }
-
         return params;
       }
 
@@ -542,7 +540,7 @@ angular.module('app.services')
       this.encryptSingleNote = function(note, key) {
         var ek = null;
         if(note.isEncrypted()) {
-          ek = Neeto.crypto.decryptText(note.loc_eek, key);
+          ek = Neeto.crypto.decryptText(note.loc_eek || note.local_eek, key);
         } else {
           ek = Neeto.crypto.generateRandomEncryptionKey();
           note.loc_eek = Neeto.crypto.encryptText(ek, key);