|
@@ -38,27 +38,32 @@ export const UserStore = defineStore({
|
|
this.name = data.attributes.name
|
|
this.name = data.attributes.name
|
|
this.isloggedin = true //data.attributes.status
|
|
this.isloggedin = true //data.attributes.status
|
|
console.log('user store checkuser isloggedin', this.isloggedin);
|
|
console.log('user store checkuser isloggedin', this.isloggedin);
|
|
-
|
|
|
|
- this.userGetRoles()
|
|
|
|
- .then(({ data : { data : { user } } }) => {
|
|
|
|
- console.log('graphql user loaded', user)
|
|
|
|
- this.roles = user.roles
|
|
|
|
- this.checkIsAdmin()
|
|
|
|
- })
|
|
|
|
- .catch(error => {
|
|
|
|
- console.warn('Issue with graphql user loading', error)
|
|
|
|
- Promise.reject(error)
|
|
|
|
- })
|
|
|
|
|
|
+
|
|
|
|
+ this.getUser(); // necessery to get the csrf-token
|
|
|
|
+
|
|
|
|
+ // this.userGetRoles()
|
|
|
|
+ // .then(({ data : { data : { user } } }) => {
|
|
|
|
+ // console.log('graphql user loaded', user)
|
|
|
|
+ // this.roles = user.roles
|
|
|
|
+ // this.checkIsAdmin()
|
|
|
|
+ // })
|
|
|
|
+ // .catch(error => {
|
|
|
|
+ // console.warn('Issue with graphql user loading', error)
|
|
|
|
+ // Promise.reject(error)
|
|
|
|
+ // })
|
|
})
|
|
})
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
+ },
|
|
|
|
+ getSessionToken(){
|
|
|
|
+
|
|
},
|
|
},
|
|
userLogin (credentials) {
|
|
userLogin (credentials) {
|
|
console.log('user store userLogin', credentials);
|
|
console.log('user store userLogin', credentials);
|
|
return new Promise((resolve, reject) => {
|
|
return new Promise((resolve, reject) => {
|
|
- this.getToken(credentials)
|
|
|
|
|
|
+ this.postCredentials(credentials)
|
|
.then((response) => {
|
|
.then((response) => {
|
|
- console.log('userLogin getToken response', response)
|
|
|
|
|
|
+ console.log('userLogin postCredentials response', response)
|
|
|
|
|
|
if (response.status === 200) {
|
|
if (response.status === 200) {
|
|
this.uid = response.data.current_user.uid
|
|
this.uid = response.data.current_user.uid
|
|
@@ -71,24 +76,24 @@ export const UserStore = defineStore({
|
|
console.log('User Loggedin')
|
|
console.log('User Loggedin')
|
|
// todo reload concernements
|
|
// todo reload concernements
|
|
// concrnmtStore().reloadConcernements(); // INFO would be good but to much complicated for now, just reload the page
|
|
// concrnmtStore().reloadConcernements(); // INFO would be good but to much complicated for now, just reload the page
|
|
- window.location.reload();
|
|
|
|
|
|
+ // window.location.reload();
|
|
resolve()
|
|
resolve()
|
|
})
|
|
})
|
|
} else {
|
|
} else {
|
|
this.loginMessage = response.data.message
|
|
this.loginMessage = response.data.message
|
|
- console.warn('Issue with getToken', response)
|
|
|
|
|
|
+ console.warn('Issue with postCredentials', response)
|
|
console.log('user loggein failed', this.loginMessage)
|
|
console.log('user loggein failed', this.loginMessage)
|
|
Promise.reject(new Error('user loggin failed'))
|
|
Promise.reject(new Error('user loggin failed'))
|
|
}
|
|
}
|
|
})
|
|
})
|
|
.catch(error => {
|
|
.catch(error => {
|
|
- console.warn('Issue with Dispatch getToken', error)
|
|
|
|
|
|
+ console.warn('Issue with Dispatch postCredentials', error)
|
|
Promise.reject(error)
|
|
Promise.reject(error)
|
|
})
|
|
})
|
|
})
|
|
})
|
|
},
|
|
},
|
|
- getToken (credentials) {
|
|
|
|
- console.log('userStore getToken', credentials)
|
|
|
|
|
|
+ postCredentials (credentials) {
|
|
|
|
+ console.log('userStore postCredentials', credentials)
|
|
return REST.post('/user/login?_format=json',
|
|
return REST.post('/user/login?_format=json',
|
|
credentials,
|
|
credentials,
|
|
{
|
|
{
|