From 60c76dc71729ba564ed0994a4aee3ae1753ca773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= Date: Tue, 27 Nov 2018 11:17:10 +0100 Subject: [PATCH] Properly cast null value from session storage --- .../ext/ep_theme/Resources/Private/Assets/js/myep/_router.js | 2 +- .../ext/ep_theme/Resources/Private/Assets/js/myep/_store.js | 2 +- .../Resources/Private/Assets/js/myep/components/App.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js index 2f876ab7..641ddecf 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_router.js @@ -8,7 +8,7 @@ const guard = (to, from, next) => { if (store.state.loading) { next(false); } else if (store.state.loggedIn) { - if (to.meta.requiresTeamer && !store.state.teamer) { + if (to.meta.requiresTeamer && !store.state.isTeamer) { next(false); } else { next(); diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js index 81e097f0..14e45601 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/_store.js @@ -27,7 +27,7 @@ export default new Vuex.Store({ config: config, loading: false, loggedIn: !!sessionStorage.getItem('token'), - teamer: !!sessionStorage.getItem('teamerId'), + isTeamer: JSON.parse(sessionStorage.getItem('teamerId')) !== null, countries: [], abilities: [], timeFrames: [], diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue index 44a804fb..f6b7fa39 100644 --- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue +++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/myep/components/App.vue @@ -63,7 +63,7 @@ return this.$store.state.loggedIn; }, isTeamer () { - return this.$store.state.teamer; + return this.$store.state.isTeamer; }, loaderUrl () { return this.$store.state.config.loaderUrl;