EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-10-08 11:27:49 +02:00
parent 336857034c 6694899aec
commit 3414e1d12d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/api/index.js
+4 -4
View File
@@ -4,7 +4,7 @@ import createAuthRefreshInterceptor from 'axios-auth-refresh'
const authenticatedClient = axios.create(); const authenticatedClient = axios.create();
const getAccessToken = () => { const getAccessToken = () => {
return sessionStorage.getItem('token'); return sessionStorage.getItem('myep-auth-token');
}; };
authenticatedClient.interceptors.request.use(request => { authenticatedClient.interceptors.request.use(request => {
@@ -13,10 +13,10 @@ authenticatedClient.interceptors.request.use(request => {
}); });
const refreshAuth = failedRequest => axios.post('/api/token_refresh', { const refreshAuth = failedRequest => axios.post('/api/token_refresh', {
refresh_token: sessionStorage.getItem('refreshToken') refresh_token: sessionStorage.getItem('myep-refresh-token')
}).then(response => { }).then(response => {
sessionStorage.setItem('token', response.data.token); sessionStorage.setItem('myep-auth-token', response.data.token);
sessionStorage.setItem('refreshToken', response.data.refresh_token); sessionStorage.setItem('myep-refresh-token', response.data.refresh_token);
failedRequest.response.config.headers['Authorization'] = 'Bearer ' + response.data.token; failedRequest.response.config.headers['Authorization'] = 'Bearer ' + response.data.token;
return Promise.resolve(); return Promise.resolve();
}); });
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/store/index.js
+11 -10
View File
@@ -35,7 +35,7 @@ export default new Vuex.Store({
}, },
mutations: { mutations: {
initSession(state) { initSession(state) {
const authToken = sessionStorage.getItem('token'); const authToken = sessionStorage.getItem('myep-auth-token');
if (authToken) { if (authToken) {
state.authToken = authToken; state.authToken = authToken;
} }
@@ -46,14 +46,14 @@ export default new Vuex.Store({
axios.defaults.baseURL = state.config.myEpApiBaseUrl; axios.defaults.baseURL = state.config.myEpApiBaseUrl;
}, },
initWatchlist(state) { initWatchlist(state) {
if (!sessionStorage.getItem('watchList')) { if (!sessionStorage.getItem('myep-watchlist')) {
sessionStorage.setItem('watchList', JSON.stringify([])); 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) { setWatchlist(state, list) {
state.userData.watchList = list; state.userData.watchList = list;
sessionStorage.setItem('watchList', JSON.stringify(list)); sessionStorage.setItem('myep-watchlist', JSON.stringify(list));
}, },
setUserData(state, data) { setUserData(state, data) {
data.watchList = [...state.userData.watchList, ...data.watchList]; data.watchList = [...state.userData.watchList, ...data.watchList];
@@ -62,16 +62,16 @@ export default new Vuex.Store({
login(state, data) { login(state, data) {
state.authToken = data.token; state.authToken = data.token;
state.refreshToken = data.refresh_token; state.refreshToken = data.refresh_token;
sessionStorage.setItem('token', data.token); sessionStorage.setItem('myep-auth-token', data.token);
sessionStorage.setItem('refreshToken', data.refresh_token); sessionStorage.setItem('myep-refresh-token', data.refresh_token);
}, },
logout(state) { logout(state) {
state.userData = defaultUserData; state.userData = defaultUserData;
state.authToken = null; state.authToken = null;
state.refreshToken = null; state.refreshToken = null;
sessionStorage.removeItem('token'); sessionStorage.removeItem('myep-auth-token');
sessionStorage.removeItem('refreshToken'); sessionStorage.removeItem('myep-refresh-token');
sessionStorage.removeItem('watchlist'); sessionStorage.removeItem('myep-watchlist');
}, },
alert(state, payload) { alert(state, payload) {
state.alert = payload; state.alert = payload;
@@ -91,6 +91,7 @@ export default new Vuex.Store({
init({commit}) { init({commit}) {
commit('initConfig'); commit('initConfig');
commit('initWatchlist'); commit('initWatchlist');
commit('initSession');
}, },
login({commit, dispatch}, credentials) { login({commit, dispatch}, credentials) {
commit('beginLoading'); commit('beginLoading');