diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-22 07:47:30 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-06-22 07:47:30 +0000 |
| commit | 5a8f3dddfde863a87a3a4f0ed9c7433935520c59 (patch) | |
| tree | ea94eed3cb7f5fe268be6cf5ae22b5d6b917bb49 /src/components | |
| parent | 03a27c6d4864758d72f127138fa21961ef2b61fa (diff) | |
| parent | bd377148ade7aaf26652dc14ee77683b7e6c8c5a (diff) | |
Merge branch 'fix-token-auth-login' into 'develop'
Fix broken token authentication
See merge request pleroma/pleroma-fe!846
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/login_form/login_form.js | 3 | ||||
| -rw-r--r-- | src/components/oauth_callback/oauth_callback.js | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index 93214646..4a5b1965 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -26,9 +26,10 @@ const LoginForm = { this.isTokenAuth ? this.submitToken() : this.submitPassword() }, submitToken () { - const { clientId } = this.oauth + const { clientId, clientSecret } = this.oauth const data = { clientId, + clientSecret, instance: this.instance.server, commit: this.$store.commit } diff --git a/src/components/oauth_callback/oauth_callback.js b/src/components/oauth_callback/oauth_callback.js index 2c6ca235..a3c7b7f9 100644 --- a/src/components/oauth_callback/oauth_callback.js +++ b/src/components/oauth_callback/oauth_callback.js @@ -4,10 +4,11 @@ const oac = { props: ['code'], mounted () { if (this.code) { - const { clientId } = this.$store.state.oauth + const { clientId, clientSecret } = this.$store.state.oauth oauth.getToken({ clientId, + clientSecret, instance: this.$store.state.instance.server, code: this.code }).then((result) => { |