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

fixes hex encoding issue

Browse Source
This commit is contained in:
Mo Bitar
2017-03-09 20:07:28 -06:00
parent 23611c31ae
commit bc0e76c7da
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/app/services/authManager.js
View File

@@ -35,11 +35,11 @@ angular.module('app.frontend')
this.keys = function() {
var keys = {mk: localStorage.getItem("mk")};
if(!localStorage.getItem("encryptionKey")) {
keys = _.merge(keys, Neeto.crypto.generateKeysFromMasterKey(keys.mk));
_.merge(keys, Neeto.crypto.generateKeysFromMasterKey(keys.mk));
localStorage.setItem("encryptionKey", keys.encryptionKey);
localStorage.setItem("authKey", keys.authKey);
} else {
keys = _.merge(keys, {encryptionKey: localStorage.getItem("encryptionKey"), authKey: localStorage.getItem("authKey")});
_.merge(keys, {encryptionKey: localStorage.getItem("encryptionKey"), authKey: localStorage.getItem("authKey")});
}
return keys;
}