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

* upstream/develop:
  fix typo
  rename mutations according to actual property names

src/boot/after_store.js

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

src/components/login_form/login_form.js

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

src/modules/oauth.js

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