Let the system manage login sheet presentation

Author: jkmassel

WordPress/Classes/Extensions/WebAuthenticationPresentationAnchorProvider.swift

@@ -1,14 +1,13 @@
 import Foundation
 import AuthenticationServices
 
-final class WebAuthenticationPresentationAnchorProvider: NSObject, ASWebAuthenticationPresentationContextProviding {
-    let anchor: ASPresentationAnchor
+final class WebAuthenticationPresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding {
 
-    init(anchor: ASPresentationAnchor) {
-        self.anchor = anchor
+    override init() {
+        super.init()
     }
 
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
-        anchor
+        ASPresentationAnchor() // Let the system manage the presentation
     }
 }

WordPress/Classes/Login/WordPressDotComAuthenticator.swift

@@ -9,6 +9,9 @@ import Alamofire
 ///
 /// API doc: https://developer.wordpress.com/docs/oauth2/
 struct WordPressDotComAuthenticator {
+
+    private let contextProvider = WebAuthenticationPresentationContextProvider()
+
     enum Error: Swift.Error {
         case invalidCallbackURL
         case loginDenied(message: String)
@@ -103,7 +106,6 @@ struct WordPressDotComAuthenticator {
 
         let callbackURL: URL = try await withCheckedThrowingContinuation { continuation in
             DispatchQueue.main.async {
-                let provider = WebAuthenticationPresentationAnchorProvider(anchor: viewController.view.window ?? UIWindow())
                 let session = ASWebAuthenticationSession(url: authorizeURL, callbackURLScheme: "x-wordpress-app") { url, error in
                     if let url {
                         continuation.resume(returning: url)
@@ -112,7 +114,8 @@ struct WordPressDotComAuthenticator {
                         continuation.resume(throwing: Error.cancelled)
                     }
                 }
-                session.presentationContextProvider = provider
+
+                session.presentationContextProvider = contextProvider
                 session.start()
             }
         }

WordPress/Classes/Networking/LoginClient.swift

@@ -58,7 +58,7 @@ final actor LoginClient {
             site: site,
             appName: appNameValue,
             appId: appId,
-            contextProvider: WebAuthenticationPresentationAnchorProvider(anchor: anchor ?? ASPresentationAnchor())
+            contextProvider: WebAuthenticationPresentationContextProvider()
         )
 
         let returnValue: Result<WordPressOrgCredentials, LoginClientError>