Merge branch 'main' into test-uikit

Author: russellwheatley

.gitignore

@@ -29,3 +29,4 @@ Pods/
 Podfile.lock
 *.xcworkspace/
 samples/**/GoogleService-Info.plist
+e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult/

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift

@@ -17,6 +17,7 @@ import FirebaseAuthUIComponents
 import FirebaseCore
 import SwiftUI
 
+@MainActor
 public struct EmailLinkView {
   @Environment(AuthService.self) private var authService
   @Environment(\.accountConflictHandler) private var accountConflictHandler

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift

@@ -16,6 +16,7 @@ import FirebaseAuthUIComponents
 import FirebaseCore
 import SwiftUI
 
+@MainActor
 public struct PasswordRecoveryView {
   @Environment(AuthService.self) private var authService
   @State private var email = ""

Gemfile.lock

@@ -1,11 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
-    activesupport (7.1.5.2)
+    CFPropertyList (3.0.9)
+    activesupport (7.1.6)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -18,15 +15,15 @@ GEM
       mutex_m
       securerandom (>= 0.3)
       tzinfo (~> 2.0)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.9)
+      public_suffix (>= 2.0.2, < 8.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.3)
+    benchmark (0.5.0)
+    bigdecimal (4.1.0)
     claide (1.1.0)
     cocoapods (1.16.2)
       addressable (~> 2.8)
@@ -66,35 +63,35 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     drb (2.2.3)
     escape (0.0.4)
-    ethon (0.17.0)
+    ethon (0.18.0)
       ffi (>= 1.15.0)
-    ffi (1.17.2)
+      logger
+    ffi (1.17.4)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
     httpclient (2.9.0)
       mutex_m
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.15.0)
+    json (2.19.3)
     logger (1.7.0)
-    minitest (5.25.5)
+    minitest (5.26.1)
     molinillo (0.8.0)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nkf (0.2.0)
     public_suffix (4.0.7)
     rexml (3.4.4)
     ruby-macho (2.5.1)
     securerandom (0.3.2)
-    typhoeus (1.4.1)
-      ethon (>= 0.9.0)
+    typhoeus (1.6.0)
+      ethon (>= 0.18.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     xcodeproj (1.27.0)

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/FirebaseSwiftUIExampleUITests.swift

@@ -233,22 +233,15 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
     let emailField = app.textFields["email-field"]
 
     XCTAssertTrue(emailField.waitForExistence(timeout: 2), "Email field should exist")
-    // Workaround for updating SecureFields with ConnectHardwareKeyboard enabled
-    UIPasteboard.general.string = email
-    emailField.press(forDuration: 1.2)
-    app.menuItems["Paste"].tap()
+    try pasteIntoField(emailField, text: email, app: app)
 
     let passwordField = app.secureTextFields["password-field"]
     XCTAssertTrue(passwordField.exists, "Password field should exist")
-    UIPasteboard.general.string = password
-    passwordField.press(forDuration: 1.2)
-    app.menuItems["Paste"].tap()
+    try pasteIntoField(passwordField, text: password, app: app)
 
     let confirmPasswordField = app.secureTextFields["confirm-password-field"]
     XCTAssertTrue(confirmPasswordField.exists, "Confirm password field should exist")
-    UIPasteboard.general.string = password
-    confirmPasswordField.press(forDuration: 1.2)
-    app.menuItems["Paste"].tap()
+    try pasteIntoField(confirmPasswordField, text: password, app: app)
 
     // Create the user (sign up)
     let signUpButton = app

e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/MFAEnrolmentUITests.swift

@@ -56,23 +56,7 @@ final class MFAEnrollmentUITests: XCTestCase {
     // Sign in first to access MFA management
     try signInToApp(app: app, email: email)
 
-    // Check MFA management button exists
-    let mfaManagementButton = app.buttons["mfa-management-button"]
-    XCTAssertTrue(
-      mfaManagementButton.waitForExistence(timeout: 5),
-      "MFA management button should exist"
-    )
-    XCTAssertTrue(mfaManagementButton.isEnabled, "MFA management button should be enabled")
-
-    // Tap the button
-    mfaManagementButton.tap()
-
-    // Verify we navigated to MFA management view
-    let managementTitle = app.staticTexts["Two-Factor Authentication"]
-    XCTAssertTrue(
-      managementTitle.waitForExistence(timeout: 5),
-      "Should navigate to MFA management view"
-    )
+    try navigateToMFAManagement(app: app)
   }
 
   @MainActor
@@ -87,16 +71,16 @@ final class MFAEnrollmentUITests: XCTestCase {
 
     // Sign in and navigate to MFA management
     try signInToApp(app: app, email: email)
-    app.buttons["mfa-management-button"].tap()
+    try navigateToMFAManagement(app: app)
 
     // Tap setup MFA button (for users with no enrolled factors)
     let setupButton = app.buttons["setup-mfa-button"]
-    if setupButton.waitForExistence(timeout: 3) {
+    if setupButton.waitForExistence(timeout: 10) {
       setupButton.tap()
     } else {
       // If factors are already enrolled, tap add another method
       let addMethodButton = app.buttons["add-mfa-method-button"]
-      XCTAssertTrue(addMethodButton.waitForExistence(timeout: 3), "Add method button should exist")
+      XCTAssertTrue(addMethodButton.waitForExistence(timeout: 10), "Add method button should exist")
       addMethodButton.tap()
     }
 
@@ -448,27 +432,46 @@ final class MFAEnrollmentUITests: XCTestCase {
       signedInText.waitForExistence(timeout: 30),
       "SignedInView should be visible after login"
     )
+    dismissAlert(app: app)
     XCTAssertTrue(signedInText.exists, "SignedInView should be visible after login")
   }
 
+  @MainActor
+  private func navigateToMFAManagement(app: XCUIApplication) throws {
+    dismissAlert(app: app)
+
+    let mfaManagementButton = app.buttons["mfa-management-button"]
+    XCTAssertTrue(
+      mfaManagementButton.waitForExistence(timeout: 10),
+      "MFA management button should exist"
+    )
+    XCTAssertTrue(mfaManagementButton.isEnabled, "MFA management button should be enabled")
+    mfaManagementButton.tap()
+
+    let managementTitle = app.staticTexts["Two-Factor Authentication"]
+    XCTAssertTrue(
+      managementTitle.waitForExistence(timeout: 10),
+      "Should navigate to MFA management view"
+    )
+  }
+
   @MainActor
   private func navigateToMFAEnrollment(app: XCUIApplication) throws {
-    // Navigate to MFA management
-    app.buttons["mfa-management-button"].tap()
+    try navigateToMFAManagement(app: app)
 
     // Navigate to MFA enrollment
     let setupButton = app.buttons["setup-mfa-button"]
-    if setupButton.waitForExistence(timeout: 3) {
+    if setupButton.waitForExistence(timeout: 10) {
       setupButton.tap()
     } else {
       let addMethodButton = app.buttons["add-mfa-method-button"]
-      XCTAssertTrue(addMethodButton.waitForExistence(timeout: 3), "Add method button should exist")
+      XCTAssertTrue(addMethodButton.waitForExistence(timeout: 10), "Add method button should exist")
       addMethodButton.tap()
     }
 
     // Verify we're in MFA enrollment view
     let enrollmentTitle = app.staticTexts["Set Up Two-Factor Authentication"]
-    XCTAssertTrue(enrollmentTitle.waitForExistence(timeout: 5), "Should be in MFA enrollment view")
+    XCTAssertTrue(enrollmentTitle.waitForExistence(timeout: 10), "Should be in MFA enrollment view")
   }
 }
 
@@ -486,49 +489,51 @@ struct VerificationCode: Codable {
 /// - Returns: The verification code as a String
 /// - Throws: Error if unable to retrieve codes
 private func getLastSmsCode(specificPhone: String? = nil) async throws -> String {
-  let getSmsCodesUrl =
-    "http://127.0.0.1:9099/emulator/v1/projects/flutterfire-e2e-tests/verificationCodes"
+  do {
+    for projectID in authEmulatorCandidateProjectIDs() {
+      let getSmsCodesUrl =
+        "http://127.0.0.1:9099/emulator/v1/projects/\(projectID)/verificationCodes"
 
-  guard let url = URL(string: getSmsCodesUrl) else {
-    throw NSError(
-      domain: "getLastSmsCode",
-      code: -1,
-      userInfo: [NSLocalizedDescriptionKey: "Failed to create URL for SMS codes endpoint"]
-    )
-  }
+      guard let url = URL(string: getSmsCodesUrl) else {
+        continue
+      }
 
-  do {
-    let (data, _) = try await URLSession.shared.data(from: url)
+      guard let (data, _) = try? await URLSession.shared.data(from: url) else {
+        continue
+      }
 
-    let decoder = JSONDecoder()
-    let codesResponse = try decoder.decode(VerificationCodesResponse.self, from: data)
+      let decoder = JSONDecoder()
+      guard let codesResponse = try? decoder.decode(VerificationCodesResponse.self, from: data) else {
+        continue
+      }
 
-    guard let codes = codesResponse.verificationCodes, !codes.isEmpty else {
-      throw NSError(
-        domain: "getLastSmsCode",
-        code: -1,
-        userInfo: [NSLocalizedDescriptionKey: "No SMS verification codes found in emulator"]
-      )
-    }
+      guard let codes = codesResponse.verificationCodes, !codes.isEmpty else {
+        continue
+      }
 
-    if let specificPhone = specificPhone {
-      // Search backwards through codes for the specific phone number
-      for code in codes.reversed() {
-        if code.phoneNumber == specificPhone {
-          return code.code
+      if let specificPhone = specificPhone {
+        // Search backwards through codes for the specific phone number
+        for code in codes.reversed() {
+          if code.phoneNumber == specificPhone {
+            return code.code
+          }
         }
+      } else if let lastCode = codes.last {
+        return lastCode.code
       }
-      throw NSError(
-        domain: "getLastSmsCode",
-        code: -1,
-        userInfo: [
-          NSLocalizedDescriptionKey: "No SMS verification code found for phone number: \(specificPhone)",
-        ]
-      )
+    }
+
+    let description = if let specificPhone {
+      "No SMS verification code found for phone number: \(specificPhone)"
     } else {
-      // Return the last code in the array
-      return codes.last!.code
+      "No SMS verification codes found in emulator"
     }
+
+    throw NSError(
+      domain: "getLastSmsCode",
+      code: -1,
+      userInfo: [NSLocalizedDescriptionKey: description]
+    )
   } catch let error as DecodingError {
     throw NSError(
       domain: "getLastSmsCode",