Add comments and fix AuthDefaultUIDelegate for extensions

firebase · Jul 28, 2023 · 5119d73 · 5119d73
1 parent c054b81
commit 5119d73
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/FirebaseAuth/Sources/Swift/Auth/Auth.swift b/FirebaseAuth/Sources/Swift/Auth/Auth.swift
@@ -1685,6 +1685,7 @@ extension Auth: AuthInterop {
           return
         }
 
+        // Using reflection here to avoid build errors in extensions.
         let sel = NSSelectorFromString("sharedApplication")
         guard UIApplication.responds(to: sel),
               let application = UIApplication.perform(sel).takeUnretainedValue() as? UIApplication

diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthDefaultUIDelegate.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthDefaultUIDelegate.swift
@@ -16,31 +16,39 @@
 
   import Foundation
   import UIKit
+  #if COCOAPODS
+    @_implementationOnly import GoogleUtilities
+  #else
+    @_implementationOnly import GoogleUtilities_Environment
+  #endif
 
   /** @class AuthDefaultUIDelegate
       @brief Class responsible for providing a default FIRAuthUIDelegate.
       @remarks This class should be used in the case that a UIDelegate was expected and necessary to
           continue a given flow, but none was provided.
    */
   class AuthDefaultUIDelegate: NSObject, AuthUIDelegate {
-    // TODO: Figure out what to do for extensions.
     /** @fn defaultUIDelegate
         @brief Returns a default FIRAuthUIDelegate object.
         @return The default FIRAuthUIDelegate object.
      */
-    @available(iOSApplicationExtension, unavailable)
-    @available(tvOSApplicationExtension, unavailable)
     class func defaultUIDelegate() -> AuthUIDelegate? {
-      // TODO: Consider removing code below when doing extension testing.
-      // iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication
-      // responds to it.
-      guard let applicationClass = NSClassFromString("UIApplication"),
-            applicationClass.responds(to: NSSelectorFromString("sharedApplication")) else {
+      if GULAppEnvironmentUtil.isAppExtension() {
+        // iOS App extensions should not call [UIApplication sharedApplication], even if
+        // UIApplication responds to it.
+        return nil
+      }
+
+      // Using reflection here to avoid build errors in extensions.
+      let sel = NSSelectorFromString("sharedApplication")
+      guard UIApplication.responds(to: sel),
+            let application = UIApplication.perform(sel).takeUnretainedValue() as? UIApplication
+      else {
         return nil
       }
       var topViewController: UIViewController?
       if #available(iOS 13.0, tvOS 13.0, *) {
-        let connectedScenes = UIApplication.shared.connectedScenes
+        let connectedScenes = application.connectedScenes
         for scene in connectedScenes {
           if let windowScene = scene as? UIWindowScene {
             for window in windowScene.windows {
@@ -51,7 +59,7 @@
           }
         }
       } else {
-        topViewController = UIApplication.shared.keyWindow?.rootViewController
+        topViewController = application.keyWindow?.rootViewController
       }
       while true {
         if let controller = topViewController?.presentedViewController {

diff --git a/FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift b/FirebaseAuth/Sources/Swift/Utilities/AuthURLPresenter.swift
@@ -19,8 +19,6 @@
   import WebKit
   import SafariServices
 
-  // TODO: Remove objc's and publics
-
   /** @class AuthURLPresenter
       @brief A Class responsible for presenting URL via SFSafariViewController or WKWebView.
    */