Fixed auth
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2020-12-06 02:13:13 +01:00
parent 633f2af5eb
commit 5a727a6872
5 changed files with 35 additions and 31 deletions

View File

@@ -8,32 +8,31 @@ const baseURL = process.env.VUE_APP_API_LOCATION;
Vue.use(Vuex)
export default {
namespaced: true,
state() {
return {
auth: {
processing: false,
token: localStorage.getItem(JWT_KEY_NAME) || '',
name: ''
}
processing: false,
token: localStorage.getItem(JWT_KEY_NAME) || '',
name: ''
}
},
mutations: {
auth_started(state) {
state.auth.processing = true;
state.processing = true;
},
auth_success(state, token, name) {
state.auth.processing = false;
state.auth.token = token;
state.auth.name = name;
auth_success(state, {token, name}) {
state.processing = false;
state.token = token;
state.name = name;
},
auth_fail(state) {
state.auth.processing = false;
state.auth.token = '';
state.auth.name = '';
state.processing = false;
state.token = '';
state.name = '';
},
logout(state) {
state.auth.token = '';
state.auth.name = '';
state.token = '';
state.name = '';
}
},
actions: {
@@ -47,9 +46,8 @@ export default {
return reject();
}
const user = creds.name;
localStorage.setItem(JWT_KEY_NAME, token)
commit('auth_success', token, user)
commit('auth_success', {token, name: creds.name})
return resolve(resp);
}).catch(err => {
commit('auth_fail')
@@ -68,9 +66,9 @@ export default {
return reject();
}
const user = creds.name;
localStorage.setItem(JWT_KEY_NAME, token)
commit('auth_success', token, user)
commit('auth_success', {token, name: creds.name})
resolve(resp)
}).catch(err => {
commit('auth_fail')
@@ -90,10 +88,10 @@ export default {
modules: {},
getters: {
isLoggedIn(state) {
return !!state.auth.token;
return !!state.token;
},
authInProgress(state) {
return state.auth.processing;
return state.processing;
}
}
}