Better login error handling
This commit is contained in:
parent
b2a8174099
commit
4c4044c382
|
@ -9,6 +9,7 @@ import UIKit
|
||||||
import AuthenticationServices
|
import AuthenticationServices
|
||||||
import Fervor
|
import Fervor
|
||||||
|
|
||||||
|
@MainActor
|
||||||
protocol LoginViewControllerDelegate: AnyObject {
|
protocol LoginViewControllerDelegate: AnyObject {
|
||||||
func didLogin(with controller: FervorController)
|
func didLogin(with controller: FervorController)
|
||||||
}
|
}
|
||||||
|
@ -18,6 +19,7 @@ class LoginViewController: UIViewController {
|
||||||
weak var delegate: LoginViewControllerDelegate?
|
weak var delegate: LoginViewControllerDelegate?
|
||||||
|
|
||||||
private var textField: UITextField!
|
private var textField: UITextField!
|
||||||
|
private var activityIndicator: UIActivityIndicatorView!
|
||||||
|
|
||||||
private var authSession: ASWebAuthenticationSession?
|
private var authSession: ASWebAuthenticationSession?
|
||||||
|
|
||||||
|
@ -37,10 +39,18 @@ class LoginViewController: UIViewController {
|
||||||
textField.placeholder = "example.com"
|
textField.placeholder = "example.com"
|
||||||
textField.addTarget(self, action: #selector(doEnteredURL), for: .primaryActionTriggered)
|
textField.addTarget(self, action: #selector(doEnteredURL), for: .primaryActionTriggered)
|
||||||
view.addSubview(textField)
|
view.addSubview(textField)
|
||||||
|
|
||||||
|
activityIndicator = UIActivityIndicatorView(style: .medium)
|
||||||
|
activityIndicator.translatesAutoresizingMaskIntoConstraints = false
|
||||||
|
view.addSubview(activityIndicator)
|
||||||
|
|
||||||
NSLayoutConstraint.activate([
|
NSLayoutConstraint.activate([
|
||||||
textField.centerYAnchor.constraint(equalTo: view.centerYAnchor),
|
textField.centerYAnchor.constraint(equalTo: view.centerYAnchor),
|
||||||
textField.centerXAnchor.constraint(equalTo: view.centerXAnchor),
|
textField.centerXAnchor.constraint(equalTo: view.centerXAnchor),
|
||||||
textField.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.75),
|
textField.widthAnchor.constraint(equalTo: view.widthAnchor, multiplier: 0.75),
|
||||||
|
|
||||||
|
activityIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor),
|
||||||
|
activityIndicator.topAnchor.constraint(equalTo: textField.bottomAnchor, constant: 8),
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,14 +69,22 @@ class LoginViewController: UIViewController {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
textField.isEnabled = false
|
||||||
|
activityIndicator.startAnimating()
|
||||||
|
|
||||||
let controller = FervorController(instanceURL: components.url!)
|
let controller = FervorController(instanceURL: components.url!)
|
||||||
|
|
||||||
let registration: ClientRegistration
|
let registration: ClientRegistration
|
||||||
do {
|
do {
|
||||||
registration = try await controller.register()
|
registration = try await controller.register()
|
||||||
} catch {
|
} catch {
|
||||||
let alert = UIAlertController(title: "Unable to Register Client", message: error.localizedDescription, preferredStyle: .alert)
|
let alert = UIAlertController(title: "Unable to register client", message: error.localizedDescription, preferredStyle: .alert)
|
||||||
|
alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
|
||||||
present(alert, animated: true)
|
present(alert, animated: true)
|
||||||
|
|
||||||
|
textField.isEnabled = true
|
||||||
|
activityIndicator.stopAnimating()
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,13 +99,29 @@ class LoginViewController: UIViewController {
|
||||||
let components = URLComponents(url: callbackURL!, resolvingAgainstBaseURL: false)
|
let components = URLComponents(url: callbackURL!, resolvingAgainstBaseURL: false)
|
||||||
guard let codeItem = components?.queryItems?.first(where: { $0.name == "code" }),
|
guard let codeItem = components?.queryItems?.first(where: { $0.name == "code" }),
|
||||||
let codeValue = codeItem.value else {
|
let codeValue = codeItem.value else {
|
||||||
fatalError()
|
|
||||||
}
|
|
||||||
Task {
|
|
||||||
try! await controller.getToken(authCode: codeValue)
|
|
||||||
DispatchQueue.main.async {
|
DispatchQueue.main.async {
|
||||||
self.delegate?.didLogin(with: controller)
|
let alert = UIAlertController(title: "Unable to retrieve authorization code", message: error?.localizedDescription ?? "Unknown Error", preferredStyle: .alert)
|
||||||
|
alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
|
||||||
|
self.present(alert, animated: true)
|
||||||
|
|
||||||
|
self.textField.isEnabled = true
|
||||||
|
self.activityIndicator.stopAnimating()
|
||||||
}
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
Task { @MainActor in
|
||||||
|
do {
|
||||||
|
try await controller.getToken(authCode: codeValue)
|
||||||
|
} catch {
|
||||||
|
let alert = UIAlertController(title: "Unable to retrieve access token", message: error.localizedDescription, preferredStyle: .alert)
|
||||||
|
alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: nil))
|
||||||
|
self.present(alert, animated: true)
|
||||||
|
|
||||||
|
self.textField.isEnabled = true
|
||||||
|
self.activityIndicator.stopAnimating()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
self.delegate?.didLogin(with: controller)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue