review

firebase · Jul 13, 2024 · 744059b · 744059b
1 parent 7b2ae6b
commit 744059b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/FirebaseAuth/Sources/Swift/Auth/Auth.swift b/FirebaseAuth/Sources/Swift/Auth/Auth.swift
@@ -81,7 +81,7 @@ extension Auth: AuthInterop {
       autoRefreshTokens = true
       scheduleAutoTokenRefresh()
 
-      #if os(iOS) || os(tvOS) // TODO(ObjC): Is a similar mechanism needed on macOS?
+      #if canImport(UIKit) // Is a similar mechanism needed on macOS?
         applicationDidBecomeActiveObserver =
           NotificationCenter.default.addObserver(
             forName: UIApplication.didBecomeActiveNotification,

diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthWorker.swift b/FirebaseAuth/Sources/Swift/Auth/AuthWorker.swift
@@ -21,7 +21,7 @@ import Foundation
   @_implementationOnly import GoogleUtilities_Environment
 #endif
 
-#if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
+#if canImport(UIKit)
   import UIKit
 #endif
 
@@ -277,7 +277,7 @@ actor AuthWorker {
         }
       }
     } catch {
-      #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst)
+      #if canImport(UIKit)
         if (error as NSError).code == AuthErrorCode.keychainError.rawValue {
           // If there's a keychain error, assume it is due to the keychain being accessed
           // before the device is unlocked as a result of prewarming, and listen for the

diff --git a/FirebaseAuth/Tests/Unit/AuthTests.swift b/FirebaseAuth/Tests/Unit/AuthTests.swift
@@ -49,17 +49,6 @@ class AuthTests: RPCBaseTests {
       app: FirebaseApp.app(name: name)!,
       keychainStorageProvider: keychainStorageProvider
     )
-
-    // Wait until Auth initialization completes
-    waitForAuthGlobalWorkQueueDrain()
-  }
-
-  private func waitForAuthGlobalWorkQueueDrain() {
-    let workerSemaphore = DispatchSemaphore(value: 0)
-    kAuthGlobalWorkQueue.async {
-      workerSemaphore.signal()
-    }
-    _ = workerSemaphore.wait(timeout: DispatchTime.distantFuture)
   }
 
   /** @fn testFetchSignInMethodsForEmailSuccess