No longer sending extra data, renamed some properties
This commit is contained in:
parent
77511a5338
commit
af75c6d1ea
|
@ -246,9 +246,9 @@ const setConfig = async ({ store }) => {
|
|||
|
||||
const checkOAuthToken = async ({ store }) => {
|
||||
return new Promise(async (resolve, reject) => {
|
||||
if (store.state.oauth.token) {
|
||||
if (store.state.oauth.userToken) {
|
||||
try {
|
||||
await store.dispatch('loginUser', store.state.oauth.token)
|
||||
await store.dispatch('loginUser', store.state.oauth.userToken)
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
|
|
|
@ -11,8 +11,9 @@ const LoginForm = {
|
|||
},
|
||||
methods: {
|
||||
oAuthLogin () {
|
||||
const { clientId } = this.$store.state.oauth
|
||||
const data = {
|
||||
...this.$store.state.oauth,
|
||||
clientId,
|
||||
instance: this.$store.state.instance.server,
|
||||
commit: this.$store.commit
|
||||
}
|
||||
|
@ -21,8 +22,9 @@ const LoginForm = {
|
|||
.then((app) => { oauthApi.login({ ...app, ...data }) })
|
||||
},
|
||||
submit () {
|
||||
const { clientId } = this.$store.state.oauth
|
||||
const data = {
|
||||
...this.$store.state.oauth,
|
||||
clientId,
|
||||
instance: this.$store.state.instance.server,
|
||||
commit: this.$store.commit
|
||||
}
|
||||
|
|
|
@ -4,8 +4,10 @@ const oac = {
|
|||
props: ['code'],
|
||||
mounted () {
|
||||
if (this.code) {
|
||||
const { clientId } = this.$store.state.oauth
|
||||
|
||||
oauth.getToken({
|
||||
...this.$store.state.oauth,
|
||||
clientId,
|
||||
instance: this.$store.state.instance.server,
|
||||
code: this.code
|
||||
}).then((result) => {
|
||||
|
|
|
@ -2,8 +2,8 @@ const oauth = {
|
|||
state: {
|
||||
clientId: false,
|
||||
clientSecret: false,
|
||||
token: false,
|
||||
clientToken: false
|
||||
appToken: false,
|
||||
userToken: false
|
||||
},
|
||||
mutations: {
|
||||
setClientData (state, { clientId, clientSecret }) {
|
||||
|
@ -11,15 +11,15 @@ const oauth = {
|
|||
state.clientSecret = clientSecret
|
||||
},
|
||||
setClientToken (state, token) {
|
||||
state.clientToken = token
|
||||
state.appToken = token
|
||||
},
|
||||
setToken (state, token) {
|
||||
state.token = token
|
||||
state.userToken = token
|
||||
}
|
||||
},
|
||||
getters: {
|
||||
getToken: state => () => {
|
||||
return state.token || state.clientToken
|
||||
return state.userToken || state.appToken
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue