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

Passcode manager auth params

Browse Source
This commit is contained in:
Mo Bitar
2018-05-15 16:42:06 -05:00
parent 4dcc402847
commit 71fb916100
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,10 @@ angular.module('app')
return JSON.parse(storageManager.getItem("offlineParams", StorageManager.Fixed)); return JSON.parse(storageManager.getItem("offlineParams", StorageManager.Fixed));
} }
this.protocolVersion = function() {
return this._authParams && this._authParams.version;
}
this.unlock = function(passcode, callback) { this.unlock = function(passcode, callback) {
var params = this.passcodeAuthParams(); var params = this.passcodeAuthParams();
SFJS.crypto.computeEncryptionKeysForUser(passcode, params, (keys) => { SFJS.crypto.computeEncryptionKeysForUser(passcode, params, (keys) => {
@@ -35,6 +39,7 @@ angular.module('app')
} }
this._keys = keys; this._keys = keys;
this._authParams = params;
this.decryptLocalStorage(keys, params); this.decryptLocalStorage(keys, params);
this._locked = false; this._locked = false;
callback(true); callback(true);
@@ -48,10 +53,12 @@ angular.module('app')
authParams.hash = keys.pw; authParams.hash = keys.pw;
this._keys = keys; this._keys = keys;
this._hasPasscode = true; this._hasPasscode = true;
this._authParams = authParams;
// Encrypting will initially clear localStorage // Encrypting will initially clear localStorage
this.encryptLocalStorage(keys, authParams); this.encryptLocalStorage(keys, authParams);
// After it's cleared, it's safe to write to it // After it's cleared, it's safe to write to it
storageManager.setItem("offlineParams", JSON.stringify(authParams), StorageManager.Fixed); storageManager.setItem("offlineParams", JSON.stringify(authParams), StorageManager.Fixed);
callback(true); callback(true);

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

@@ -26,8 +26,8 @@ class SyncManager {
callback && callback(); callback && callback();
return; return;
} }
// Use null to use the latest protocol version if offline
var version = this.authManager.offline() ? null : this.authManager.protocolVersion(); var version = this.authManager.offline() ? this.passcodeManager.protocolVersion() : this.authManager.protocolVersion();
var keys = this.authManager.offline() ? this.passcodeManager.keys() : this.authManager.keys(); var keys = this.authManager.offline() ? this.passcodeManager.keys() : this.authManager.keys();
var params = items.map(function(item) { var params = items.map(function(item) {
var itemParams = new ItemParams(item, keys, version); var itemParams = new ItemParams(item, keys, version);