Merge branch 'masto-register-app-secret' into 'develop'

Proper clientId/secret/token caching, MastoAPI registration

Closes #554

See merge request pleroma/pleroma-fe!806

1 files changed, 12 insertions, 5 deletions

diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 0d76af0e..93214646 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -26,23 +26,30 @@ const LoginForm = {
       this.isTokenAuth ? this.submitToken() : this.submitPassword()
     },
     submitToken () {
-      oauthApi.login({
-        oauth: this.oauth,
+      const { clientId } = this.oauth
+      const data = {
+        clientId,
         instance: this.instance.server,
         commit: this.$store.commit
-      })
+      }
+
+      oauthApi.getOrCreateApp(data)
+        .then((app) => { oauthApi.login({ ...app, ...data }) })
     },
     submitPassword () {
+      const { clientId } = this.oauth
       const data = {
+        clientId,
         oauth: this.oauth,
-        instance: this.instance.server
+        instance: this.instance.server,
+        commit: this.$store.commit
       }
       this.error = false
 
       oauthApi.getOrCreateApp(data).then((app) => {
         oauthApi.getTokenWithCredentials(
           {
-            app,
+            ...app,
             instance: data.instance,
             username: this.user.username,
             password: this.user.password