From 00e8d0bb3628b773263aaf0bd1ec14034e600c08 Mon Sep 17 00:00:00 2001 From: Marquis Kurt Date: Tue, 23 Apr 2019 16:32:57 -0400 Subject: [PATCH] Use registerApp from gopherdon/app --- public/config.json | 2 +- src/pages/Welcome.tsx | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/public/config.json b/public/config.json index 9773fb7..0f0578f 100644 --- a/public/config.json +++ b/public/config.json @@ -1,5 +1,5 @@ { - "version": "1.0.0beta2u1", + "version": "1.0.0beta2u2", "location": "https://hyperspaceapp-next.herokuapp.com", "branding": { "name": "Hyperspace", diff --git a/src/pages/Welcome.tsx b/src/pages/Welcome.tsx index 05123e8..40b4769 100644 --- a/src/pages/Welcome.tsx +++ b/src/pages/Welcome.tsx @@ -175,20 +175,22 @@ class WelcomePage extends Component { console.log("Creating an emergency login...") const scopes = "read write follow"; const baseurl = localStorage.getItem('baseurl') || this.getLoginUser(this.state.user); - createHyperspaceApp(scopes, baseurl, "urn:ietf:wg:oauth:2.0:oob").then((resp: any) => { + Mastodon.registerApp(this.state.brandName? this.state.brandName: "Hyperspace", { + scopes: scopes + }, baseurl).then((appData: any) => { let saveSessionForCrashing: SaveClientSession = { - clientId: resp.clientId, - clientSecret: resp.clientSecret, - authUrl: resp.url, + clientId: appData.clientId, + clientSecret: appData.clientSecret, + authUrl: appData.url, emergency: true }; localStorage.setItem("login", JSON.stringify(saveSessionForCrashing)); this.setState({ - clientId: resp.clientId, - clientSecret: resp.clientSecret, - authUrl: resp.url + clientId: appData.clientId, + clientSecret: appData.clientSecret, + authUrl: appData.url }); - }) + }); } authorizeEmergencyLogin() {