From 7901af2a6576e5c99b3604a4b082ec91999b8fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Tue, 8 Oct 2019 11:27:42 +0200
Subject: [PATCH] Prefix values stored in session storage to avoid collisions

---
 .../Resources/Private/Assets/js/api/index.js  |  8 +++----
 .../Private/Assets/js/store/index.js          | 21 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/api/index.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/api/index.js
index bb8827ee..f1868261 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/api/index.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/api/index.js
@@ -4,7 +4,7 @@ import createAuthRefreshInterceptor from 'axios-auth-refresh'
 const authenticatedClient = axios.create();
 
 const getAccessToken = () => {
-    return sessionStorage.getItem('token');
+    return sessionStorage.getItem('myep-auth-token');
 };
 
 authenticatedClient.interceptors.request.use(request => {
@@ -13,10 +13,10 @@ authenticatedClient.interceptors.request.use(request => {
 });
 
 const refreshAuth = failedRequest => axios.post('/api/token_refresh', {
-        refresh_token: sessionStorage.getItem('refreshToken')
+        refresh_token: sessionStorage.getItem('myep-refresh-token')
     }).then(response => {
-        sessionStorage.setItem('token', response.data.token);
-        sessionStorage.setItem('refreshToken', response.data.refresh_token);
+        sessionStorage.setItem('myep-auth-token', response.data.token);
+        sessionStorage.setItem('myep-refresh-token', response.data.refresh_token);
         failedRequest.response.config.headers['Authorization'] = 'Bearer ' + response.data.token;
         return Promise.resolve();
     });
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/store/index.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/store/index.js
index 66acb98f..3f65ee0e 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/store/index.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/store/index.js
@@ -35,7 +35,7 @@ export default new Vuex.Store({
     },
     mutations: {
         initSession(state) {
-            const authToken = sessionStorage.getItem('token');
+            const authToken = sessionStorage.getItem('myep-auth-token');
             if (authToken) {
                 state.authToken = authToken;
             }
@@ -46,14 +46,14 @@ export default new Vuex.Store({
             axios.defaults.baseURL = state.config.myEpApiBaseUrl;
         },
         initWatchlist(state) {
-            if (!sessionStorage.getItem('watchList')) {
-                sessionStorage.setItem('watchList', JSON.stringify([]));
+            if (!sessionStorage.getItem('myep-watchlist')) {
+                sessionStorage.setItem('myep-watchlist', JSON.stringify([]));
             }
-            state.userData.watchList = JSON.parse(sessionStorage.getItem('watchList'));
+            state.userData.watchList = JSON.parse(sessionStorage.getItem('myep-watchlist'));
         },
         setWatchlist(state, list) {
             state.userData.watchList = list;
-            sessionStorage.setItem('watchList', JSON.stringify(list));
+            sessionStorage.setItem('myep-watchlist', JSON.stringify(list));
         },
         setUserData(state, data) {
             data.watchList = [...state.userData.watchList, ...data.watchList];
@@ -62,16 +62,16 @@ export default new Vuex.Store({
         login(state, data) {
             state.authToken = data.token;
             state.refreshToken = data.refresh_token;
-            sessionStorage.setItem('token', data.token);
-            sessionStorage.setItem('refreshToken', data.refresh_token);
+            sessionStorage.setItem('myep-auth-token', data.token);
+            sessionStorage.setItem('myep-refresh-token', data.refresh_token);
         },
         logout(state) {
             state.userData = defaultUserData;
             state.authToken = null;
             state.refreshToken = null;
-            sessionStorage.removeItem('token');
-            sessionStorage.removeItem('refreshToken');
-            sessionStorage.removeItem('watchlist');
+            sessionStorage.removeItem('myep-auth-token');
+            sessionStorage.removeItem('myep-refresh-token');
+            sessionStorage.removeItem('myep-watchlist');
         },
         alert(state, payload) {
             state.alert = payload;
@@ -91,6 +91,7 @@ export default new Vuex.Store({
         init({commit}) {
             commit('initConfig');
             commit('initWatchlist');
+            commit('initSession');
         },
         login({commit, dispatch}, credentials) {
             commit('beginLoading');