Fahim
/
Tusker
forked from shadowfacts/Tusker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reuse client ID/secret when trying to sign in to the same account again 

Workaround for mastodon.social signins being flaky
This commit is contained in:
Shadowfacts 2023-01-23 17:43:41 -05:00
parent d2c7664073
commit f88bf552af
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Tusker/Screens/Onboarding/OnboardingViewController.swift
View File

@ -23,6 +23,8 @@ class OnboardingViewController: UINavigationController {
var authenticationSession: ASWebAuthenticationSession? var authenticationSession: ASWebAuthenticationSession?
private var clientInfo: (url: URL, id: String, secret: String)?
init() { init() {
super.init(rootViewController: instanceSelector) super.init(rootViewController: instanceSelector)
} }
@ -42,10 +44,16 @@ class OnboardingViewController: UINavigationController {
let mastodonController = MastodonController(instanceURL: instanceURL, transient: true) let mastodonController = MastodonController(instanceURL: instanceURL, transient: true)
let clientID: String let clientID: String
let clientSecret: String let clientSecret: String
do { if let clientInfo, clientInfo.url == instanceURL {
(clientID, clientSecret) = try await mastodonController.registerApp() clientID = clientInfo.id
} catch { clientSecret = clientInfo.secret
throw Error.registeringApp(error) } else {
do {
(clientID, clientSecret) = try await mastodonController.registerApp()
self.clientInfo = (instanceURL, clientID, clientSecret)
} catch {
throw Error.registeringApp(error)
}
} }
let authCode = try await getAuthorizationCode(instanceURL: instanceURL, clientID: clientID) let authCode = try await getAuthorizationCode(instanceURL: instanceURL, clientID: clientID)
let accessToken: String let accessToken: String