From 67363ad67fa69f28f9b1ef1679435ba7e288d6eb Mon Sep 17 00:00:00 2001 From: Milos Stojanovic Date: Thu, 30 Nov 2023 15:12:05 +0100 Subject: [PATCH] Revert "Fix: for LDAP auth when user credentials are invalid (#407)" Does not pass current tests :/ This reverts commit 7e0f460d9ed4d9108436975e969452f2d57e9163. --- frontend/mixins/shared.js | 2 +- frontend/store.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/mixins/shared.js b/frontend/mixins/shared.js index 6beb803..e045495 100644 --- a/frontend/mixins/shared.js +++ b/frontend/mixins/shared.js @@ -92,7 +92,7 @@ const funcs = { }) }, is(role) { - return this.$store.state?.user?.role == role + return this.$store.state.user.role == role }, can(permissions) { return this.$store.getters.hasPermissions(permissions) diff --git a/frontend/store.js b/frontend/store.js index 6827931..f0e4d0b 100644 --- a/frontend/store.js +++ b/frontend/store.js @@ -24,9 +24,9 @@ export default new Vuex.Store({ getters: { hasPermissions: (state) => (permissions) => { if (_.isArray(permissions)) { - return _.intersection(state.user?.permissions, permissions).length == permissions.length + return _.intersection(state.user.permissions, permissions).length == permissions.length } - return _.find(state.user?.permissions, p => p == permissions) ? true : false + return _.find(state.user.permissions, p => p == permissions) ? true : false } }, mutations: {