From b3c56428fa8fe15a35b70c5f5ca933ce2c0bba66 Mon Sep 17 00:00:00 2001 From: Amine Mouafik Date: Fri, 29 Nov 2019 19:41:09 +0700 Subject: Prevent Password Lock to trigger while not logged in --- src/stores/SettingsStore.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/stores/SettingsStore.js') diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index df0fc77e9..051e86be2 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js @@ -68,7 +68,6 @@ export default class SettingsStore extends Store { () => this.all.app.locked, () => { const { router } = window.ferdi.stores; - if (this.all.app.locked && this.all.app.lockingFeatureEnabled) { // App just got locked, redirect to unlock screen router.push('/auth/locked'); @@ -82,7 +81,8 @@ export default class SettingsStore extends Store { // Make sure to lock app on launch if locking feature is enabled setTimeout(() => { - if (this.all.app.lockingFeatureEnabled) { + const isLoggedIn = Boolean(localStorage.getItem('authToken')); + if (isLoggedIn && this.all.app.lockingFeatureEnabled) { // Disable lock first - otherwise the lock might not get activated corrently this.actions.settings.update({ type: 'app', -- cgit v1.2.3-54-g00ecf