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

Fixes issue with changing local passcode; disables passcode option for ephemeral sessions.

Browse Source
This commit is contained in:
Mo Bitar
2018-04-29 12:24:23 -05:00
parent a073eaa1ce
commit abb9521472
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,8 @@ class AccountMenu {
return authManager.user || passcodeManager.hasPasscode(); return authManager.user || passcodeManager.hasPasscode();
} }
$scope.canAddPasscode = !authManager.isEphemeralSession();
$scope.syncStatus = syncManager.syncStatus; $scope.syncStatus = syncManager.syncStatus;
$scope.newPasswordData = {}; $scope.newPasswordData = {};

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

@@ -73,7 +73,10 @@ class StorageManager {
} }
this.itemsStorageMode = mode; this.itemsStorageMode = mode;
this.storage.clear(); if(newStorage !== this.storage) {
// Only clear if this.storage isn't the same reference as newStorage
this.storage.clear();
}
this.storage = newStorage; this.storage = newStorage;
if(mode == StorageManager.FixedEncrypted) { if(mode == StorageManager.FixedEncrypted) {

12
app/assets/templates/directives/account-menu.html.haml
View File

@@ -128,11 +128,15 @@
.panel-section .panel-section
%h3.title.panel-row Passcode Lock %h3.title.panel-row Passcode Lock
%div{"ng-if" => "!hasPasscode()"} %div{"ng-if" => "!hasPasscode()"}
.panel-row{"ng-if" => "!formData.showPasscodeForm"} %div{"ng-if" => "canAddPasscode"}
.button.info{"ng-click" => "addPasscodeClicked(); $event.stopPropagation();"} .panel-row{"ng-if" => "!formData.showPasscodeForm"}
.label Add Passcode .button.info{"ng-click" => "addPasscodeClicked(); $event.stopPropagation();"}
.label Add Passcode
%p Add an app passcode to lock the app and encrypt on-device key storage. %p Add an app passcode to lock the app and encrypt on-device key storage.
%div{"ng-if" => "!canAddPasscode"}
%p Adding a passcode is not supported in temporary sessions. Please sign out, then sign back in with the "Stay signed in" option checked.
%form{"ng-if" => "formData.showPasscodeForm", "ng-submit" => "submitPasscodeForm()"} %form{"ng-if" => "formData.showPasscodeForm", "ng-submit" => "submitPasscodeForm()"}
%input.form-control{:type => 'password', "ng-model" => "formData.passcode", "placeholder" => "Passcode", "sn-autofocus" => "true", "should-focus" => "true"} %input.form-control{:type => 'password', "ng-model" => "formData.passcode", "placeholder" => "Passcode", "sn-autofocus" => "true", "should-focus" => "true"}