rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

migrations

Browse Source
This commit is contained in:
Mo Bitar
2016-12-10 22:08:53 -06:00
parent 7bbd18e75c
commit 358fd89989
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/app/frontend/controllers/header.js
View File

@@ -83,7 +83,6 @@ angular.module('app.frontend')
this.loginData.status = "Generating Login Keys..."; this.loginData.status = "Generating Login Keys...";
$timeout(function(){ $timeout(function(){
apiController.login(this.loginData.email, this.loginData.user_password, function(response){ apiController.login(this.loginData.email, this.loginData.user_password, function(response){
console.log("login response", response);
if(response.errors) { if(response.errors) {
this.loginData.status = response.errors[0]; this.loginData.status = response.errors[0];
} else { } else {

1
app/assets/javascripts/app/frontend/controllers/home.js
View File

@@ -24,7 +24,6 @@ angular.module('app.frontend')
} }
apiController.getCurrentUser(function(response){ apiController.getCurrentUser(function(response){
console.log("get current response", response);
if(response && !response.errors) { if(response && !response.errors) {
$scope.defaultUser = new User(response.plain()); $scope.defaultUser = new User(response.plain());
$rootScope.title = "Notes — Neeto"; $rootScope.title = "Notes — Neeto";

10
app/assets/javascripts/app/services/apiController.js
View File

@@ -318,7 +318,6 @@ angular.module('app.services')
var request = Restangular.one("users", user.id).one("notes", note.id); var request = Restangular.one("users", user.id).one("notes", note.id);
_.merge(request, params); _.merge(request, params);
console.log("saving note", request);
request.customOperation(request.id ? "put" : "post") request.customOperation(request.id ? "put" : "post")
.then(function(response) { .then(function(response) {
var responseObject = response.plain(); var responseObject = response.plain();
@@ -332,21 +331,20 @@ angular.module('app.services')
} }
this.createRequestParamsFromNote = function(note, user) { this.createRequestParamsFromNote = function(note, user) {
var params = {}; var params = {id: note.id};
if(user.local_encryption_enabled && !note.pending_share && !note.isPublic()) { if(user.local_encryption_enabled && !note.pending_share && !note.isPublic()) {
// encrypted // encrypted
var noteCopy = _.cloneDeep(note); var noteCopy = _.cloneDeep(note);
this.encryptSingleNote(noteCopy, this.retrieveGk()); this.encryptSingleNote(noteCopy, this.retrieveGk());
params.loc_enc_content = noteCopy.loc_enc_content; params.loc_enc_content = noteCopy.loc_enc_content || local_encrypted_content;
params.loc_eek = noteCopy.loc_eek; params.loc_eek = noteCopy.loc_eek || noteCopy.local_eek;
} }
else { else {
// decrypted // decrypted
params.content = note.JSONContent(); params.content = note.JSONContent();
} }
return params; return params;
} }
@@ -542,7 +540,7 @@ angular.module('app.services')
this.encryptSingleNote = function(note, key) { this.encryptSingleNote = function(note, key) {
var ek = null; var ek = null;
if(note.isEncrypted()) { if(note.isEncrypted()) {
ek = Neeto.crypto.decryptText(note.loc_eek, key); ek = Neeto.crypto.decryptText(note.loc_eek || note.local_eek, key);
} else { } else {
ek = Neeto.crypto.generateRandomEncryptionKey(); ek = Neeto.crypto.generateRandomEncryptionKey();
note.loc_eek = Neeto.crypto.encryptText(ek, key); note.loc_eek = Neeto.crypto.encryptText(ek, key);