hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into shigusegubu

Browse source 
* upstream/develop:
  fix typo
  rename mutations according to actual property names
This commit is contained in:
Henry Jameson 2019-06-16 14:29:45 +03:00
commit d51a684318
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/boot/after_store.js
View file

@ -205,7 +205,7 @@ const getAppSecret = async ({ store }) => {
return getOrCreateApp({ ...oauth, instance: instance.server, commit }) return getOrCreateApp({ ...oauth, instance: instance.server, commit })
.then((app) => getClientToken({ ...app, instance: instance.server })) .then((app) => getClientToken({ ...app, instance: instance.server }))
.then((token) => { .then((token) => {
commit('setClientToken', token.access_token) commit('setAppToken', token.access_token)
commit('setBackendInteractor', backendInteractorService(store.getters.getToken())) commit('setBackendInteractor', backendInteractorService(store.getters.getToken()))
}) })
} }

2
src/components/login_form/login_form.js
View file

@ -23,7 +23,7 @@ const LoginForm = {
...mapMutations('authFlow', ['requireMFA']), ...mapMutations('authFlow', ['requireMFA']),
...mapActions({ login: 'authFlow/login' }), ...mapActions({ login: 'authFlow/login' }),
submit () { submit () {
this.isTokenMethod ? this.submitToken() : this.submitPassword() this.isTokenAuth ? this.submitToken() : this.submitPassword()
}, },
submitToken () { submitToken () {
const { clientId } = this.oauth const { clientId } = this.oauth

2
src/modules/oauth.js
View file

@ -17,7 +17,7 @@ const oauth = {
state.clientId = clientId state.clientId = clientId
state.clientSecret = clientSecret state.clientSecret = clientSecret
}, },
setClientToken (state, token) { setAppToken (state, token) {
state.appToken = token state.appToken = token
}, },
setToken (state, token) { setToken (state, token) {