aboutsummaryrefslogtreecommitdiff
path: root/src/components/login_form
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-05-22 19:13:41 +0300
committerHenry Jameson <me@hjkos.com>2019-05-22 19:13:41 +0300
commite7a2a7267dbd8a4ee3d266d22249459d028569d6 (patch)
tree36bf31c489e26ae9adebdca8ee75f49c16688eb0 /src/components/login_form
parent233506f6c1b0b16ca62c557ae6eca4a585e28a2c (diff)
Proper clientId/secret/token caching, MastoAPI registration
Diffstat (limited to 'src/components/login_form')
-rw-r--r--src/components/login_form/login_form.js16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index dc917e47..0097e18a 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -11,22 +11,26 @@ const LoginForm = {
},
methods: {
oAuthLogin () {
- oauthApi.login({
- oauth: this.$store.state.oauth,
+ const data = {
+ ...this.$store.state.oauth,
instance: this.$store.state.instance.server,
commit: this.$store.commit
- })
+ }
+
+ oauthApi.getOrCreateApp(data)
+ .then((app) => { oauthApi.login({ ...app, ...data }) })
},
submit () {
const data = {
- oauth: this.$store.state.oauth,
- instance: this.$store.state.instance.server
+ ...this.$store.state.oauth,
+ instance: this.$store.state.instance.server,
+ commit: this.$store.commit
}
this.clearError()
oauthApi.getOrCreateApp(data).then((app) => {
oauthApi.getTokenWithCredentials(
{
- app,
+ ...app,
instance: data.instance,
username: this.user.username,
password: this.user.password