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

Transition from SFJS to SNJS

Browse Source
This commit is contained in:
Mo Bitar
2019-12-13 12:11:19 -06:00
parent 010d2793b1
commit 68fbd745d5
19 changed files with 14142 additions and 28698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/app/directives/views/accountMenu.js
View File

@@ -308,9 +308,9 @@ class AccountMenu {
}
if(data.auth_params) {
SFJS.crypto.computeEncryptionKeysForUser(password, data.auth_params).then((keys) => {
SNJS.crypto.computeEncryptionKeysForUser(password, data.auth_params).then((keys) => {
try {
SFJS.itemTransformer.decryptMultipleItems(data.items, keys, false) /* throws = false as we don't want to interrupt all decryption if just one fails */
SNJS.itemTransformer.decryptMultipleItems(data.items, keys, false) /* throws = false as we don't want to interrupt all decryption if just one fails */
.then(() => {
// delete items enc_item_key since the user's actually key will do the encrypting once its passed off
data.items.forEach(function(item){

4
app/assets/javascripts/app/directives/views/passwordWizard.js
View File

@@ -211,7 +211,7 @@ class PasswordWizard {
// Ensure value for current password matches what's saved
let authParams = await authManager.getAuthParams();
let password = $scope.formData.currentPassword;
SFJS.crypto.computeEncryptionKeysForUser(password, authParams).then(async (keys) => {
SNJS.crypto.computeEncryptionKeysForUser(password, authParams).then(async (keys) => {
let success = keys.mk === (await authManager.keys()).mk;
if(success) {
this.currentServerPw = keys.pw;
@@ -239,7 +239,7 @@ class PasswordWizard {
let currentServerPw = this.currentServerPw;
let results = await SFJS.crypto.generateInitialKeysAndAuthParamsForUser(authManager.user.email, newUserPassword);
let results = await SNJS.crypto.generateInitialKeysAndAuthParamsForUser(authManager.user.email, newUserPassword);
let newKeys = results.keys;
let newAuthParams = results.authParams;

2
app/assets/javascripts/app/directives/views/revisionPreviewModal.js
View File

@@ -32,7 +32,7 @@ class RevisionPreviewModal {
// but then generate new uuid for note as not to save changes to original, if editor makes changes.
$scope.note.uuid = $scope.uuid;
let editorForNote = componentManager.editorForNote($scope.note);
$scope.note.uuid = SFJS.crypto.generateUUIDSync();
$scope.note.uuid = SNJS.crypto.generateUUIDSync();
if(editorForNote) {
// Create temporary copy, as a lot of componentManager is uuid based,

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

@@ -71,7 +71,7 @@ class ActionsManager {
let handleResponseDecryption = async (response, keys, merge) => {
var item = response.item;
await SFJS.itemTransformer.decryptItem(item, keys);
await SNJS.itemTransformer.decryptItem(item, keys);
if(!item.errorDecrypting) {
if(merge) {
@@ -101,7 +101,7 @@ class ActionsManager {
}
triedPasswords.push(passwordCandidate);
var keyResults = await SFJS.crypto.computeEncryptionKeysForUser(passwordCandidate, response.auth_params);
var keyResults = await SNJS.crypto.computeEncryptionKeysForUser(passwordCandidate, response.auth_params);
if(!keyResults) {
continue;
}

2
app/assets/javascripts/app/services/archiveManager.js
View File

@@ -17,7 +17,7 @@ class ArchiveManager {
async downloadBackupOfItems(items, encrypted) {
let run = async () => {
// download in Standard File format
// download in Standard Notes format
var keys, authParams;
if(encrypted) {
if(this.authManager.offline() && this.passcodeManager.hasPasscode()) {

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

@@ -99,7 +99,7 @@ class AuthManager extends SFAuthManager {
async verifyAccountPassword(password) {
let authParams = await this.getAuthParams();
let keys = await SFJS.crypto.computeEncryptionKeysForUser(password, authParams);
let keys = await SNJS.crypto.computeEncryptionKeysForUser(password, authParams);
let success = keys.mk === (await this.keys()).mk;
return success;
}
@@ -109,7 +109,7 @@ class AuthManager extends SFAuthManager {
return false;
}
let latest = SFJS.version();
let latest = SNJS.version();
let updateAvailable = await this.protocolVersion() !== latest;
if(updateAvailable !== this.securityUpdateAvailable) {
this.securityUpdateAvailable = updateAvailable;

8
app/assets/javascripts/app/services/passcodeManager.js
View File

@@ -83,7 +83,7 @@ class PasscodeManager {
async verifyPasscode(passcode) {
return new Promise(async (resolve, reject) => {
var params = this.passcodeAuthParams();
let keys = await SFJS.crypto.computeEncryptionKeysForUser(passcode, params);
let keys = await SNJS.crypto.computeEncryptionKeysForUser(passcode, params);
if(keys.pw !== params.hash) {
resolve(false);
} else {
@@ -94,7 +94,7 @@ class PasscodeManager {
unlock(passcode, callback) {
var params = this.passcodeAuthParams();
SFJS.crypto.computeEncryptionKeysForUser(passcode, params).then((keys) => {
SNJS.crypto.computeEncryptionKeysForUser(passcode, params).then((keys) => {
if(keys.pw !== params.hash) {
callback(false);
return;
@@ -110,9 +110,9 @@ class PasscodeManager {
}
setPasscode(passcode, callback) {
var uuid = SFJS.crypto.generateUUIDSync();
var uuid = SNJS.crypto.generateUUIDSync();
SFJS.crypto.generateInitialKeysAndAuthParamsForUser(uuid, passcode).then((results) => {
SNJS.crypto.generateInitialKeysAndAuthParamsForUser(uuid, passcode).then((results) => {
let keys = results.keys;
let authParams = results.authParams;

2
app/assets/javascripts/app/services/storageManager.js
View File

@@ -168,7 +168,7 @@ class StorageManager extends SFStorageManager {
async decryptStorage() {
var stored = JSON.parse(this.getItemSync("encryptedStorage", StorageManager.Fixed));
await SFJS.itemTransformer.decryptItem(stored, this.encryptedStorageKeys);
await SNJS.itemTransformer.decryptItem(stored, this.encryptedStorageKeys);
var encryptedStorage = new SNEncryptedStorage(stored);
for(var key of Object.keys(encryptedStorage.content.storage)) {