bachir/materio-d9
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added login failed message (remains register message); installed flood_control contrib module

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2021-01-27 22:49:52 +01:00
parent 584c4cc5d2
commit e65dfeb5b5
15 changed files with 235 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
web/themes/custom/materiotheme/vuejs/store/modules/user.js
View File

@ -18,6 +18,7 @@ export default {
mail: '',
csrf_token: null,
logout_token: null,
loginMessage: '',
isloggedin: false,
isAdmin: false,
isAdherent: false,
@ -38,6 +39,7 @@ export default {
state.csrf_token = token
},
setToken (state, data) {
console.log('setToken', data)
state.uid = data.current_user.uid
// state.username = data.username;
state.mail = data.current_user.mail
@ -45,6 +47,10 @@ export default {
state.isloggedin = true
state.logout_token = data.logout_token
},
setLoginMessage (state, message) {
console.log('setLoginMessage', message);
state.loginMessage = message
},
setUid (state, uid) {
state.uid = uid
state.isloggedin = true
@ -98,7 +104,7 @@ export default {
// }
// redirect to home page in every case
window.location = window.location.origin
window.location = window.location.origin
},
setFlagColls (state, flagcolls) {
console.log('User pre setFlagColls', state.flagcolls)
@ -147,13 +153,21 @@ export default {
dispatch('getToken', credentials)
// TODO: catch failed login
.then(() => {
dispatch('getUser').then(userdata => {
console.log('User Loggedin')
if (state.isAdmin) {
window.location.reload(true)
}
resolve()
})
// there no response here, check the original getToken method
// console.log('dispatch getToken response', response);
// check if getToken (login) went well
if(state.isloggedin){
dispatch('getUser').then(userdata => {
console.log('User Loggedin')
if (state.isAdmin) {
window.location.reload(true)
}
resolve()
})
}else{
console.log('user loggein failed')
Promise.reject('user loggein failed')
}
})
.catch(error => {
console.warn('Issue with Dispatch getToken', error)
@ -162,10 +176,22 @@ export default {
})
},
getToken ({ dispatch, commit, state }, credentials) {
return REST.post('/user/login?_format=json', credentials)
.then(({ data }) => {
console.log('user REST getToken data', data)
commit('setToken', data)
return REST.post('/user/login?_format=json',
credentials,
{
validateStatus: function (status) {
return status >= 200 && status < 500;
}
})
.then((response) => {
console.log('user REST getToken response', response)
if(response.status === 200){
commit('setToken', response.data)
}else if(response.data.message){
commit('setLoginMessage', response.data.message)
}else{
console.warn('Issue with getToken', response)
}
})
.catch(error => {
console.warn('Issue with getToken', error)