Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[auth-swift] Fix two flow porting errors in AuthURLPresenter.swift #12981

Merged
merged 1 commit into from
May 20, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,19 @@
return false
}

// MARK: SFSafariViewControllerDelegate

func safariViewControllerDidFinish(_ controller: SFSafariViewController) {
kAuthGlobalWorkQueue.async {
if controller == self.safariViewController {
// TODO: Ensure that the SFSafariViewController is actually removed from the screen
// before invoking finishPresentation
self.finishPresentation(withURL: nil,
error: AuthErrorUtils.webContextCancelledError(message: nil))
}
}
}

// MARK: AuthWebViewControllerDelegate

func webViewControllerDidCancel(_ controller: AuthWebViewController) {
Expand Down Expand Up @@ -156,8 +169,8 @@
let webViewController = self.webViewController
self.webViewController = nil
if safariViewController != nil || webViewController != nil {
uiDelegate?.dismiss(animated: true) {
kAuthGlobalWorkQueue.async {
DispatchQueue.main.async {
uiDelegate?.dismiss(animated: true) {
self.isPresenting = false
if let completion {
completion(url, error)
Expand Down
Loading