Merge branch 'twitter-package' into refactor-remaining-packages

Author: russellwheatley

.github/workflows/swiftui-auth.yml

@@ -22,35 +22,76 @@ permissions:
   contents: read
 
 jobs:
-  swiftui-auth:
+  # Package Unit Tests (standalone, no emulator needed)
+  unit-tests:
+    name: Package Unit Tests
     runs-on: macos-15
-    timeout-minutes: 60
+    timeout-minutes: 20
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+      
+      - name: Install xcpretty
+        run: gem install xcpretty
+        
+      - name: Select Xcode version
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app/Contents/Developer
+        
+      - name: Run FirebaseSwiftUI Package Unit Tests
+        run: |
+          set -o pipefail
+          xcodebuild test \
+            -scheme FirebaseUI-Package \
+            -destination 'platform=iOS Simulator,name=iPhone 16 Pro' \
+            -enableCodeCoverage YES \
+            -resultBundlePath FirebaseSwiftUIPackageTests.xcresult | tee FirebaseSwiftUIPackageTests.log | xcpretty --test --color --simple
+            
+      - name: Upload test logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: unit-tests-logs
+          path: FirebaseSwiftUIPackageTests.log
+          
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: unit-tests-results
+          path: FirebaseSwiftUIPackageTests.xcresult
+
+  # Integration Tests (requires emulator)
+  integration-tests:
+    name: Integration Tests
+    runs-on: macos-15
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+      
       - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
         name: Install Node.js 20
         with:
           node-version: '20'
+          
       - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
         with:
           distribution: 'temurin'
           java-version: '17'
+          
       - name: Install Firebase
-        run: |
-          sudo npm i -g firebase-tools
+        run: sudo npm i -g firebase-tools
+        
       - name: Start Firebase Emulator
         run: |
-          sudo chown -R 501:20 "/Users/runner/.npm" && cd ./samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample && ./start-firebase-emulator.sh
+          sudo chown -R 501:20 "/Users/runner/.npm"
+          cd ./samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample
+          ./start-firebase-emulator.sh
+          
       - name: Install xcpretty
         run: gem install xcpretty
+        
       - name: Select Xcode version
-        run: |
-          sudo xcode-select -switch /Applications/Xcode_16.4.app/Contents/Developer
-      - name: Run FirebaseSwiftUI Package Unit Tests
-        run: |
-          set -o pipefail
-          xcodebuild test -scheme FirebaseUI-Package -destination 'platform=iOS Simulator,name=iPhone 16 Pro' -enableCodeCoverage YES -resultBundlePath FirebaseSwiftUIPackageTests.xcresult | tee FirebaseSwiftUIPackageTests.log | xcpretty --test --color --simple
-      # Build for integration tests (builds app + integration test bundle)
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app/Contents/Developer
+        
       - name: Build for Integration Tests
         run: |
           cd ./samples/swiftui/FirebaseSwiftUIExample
@@ -59,7 +100,7 @@ jobs:
             -scheme FirebaseSwiftUIExampleTests \
             -destination 'platform=iOS Simulator,name=iPhone 16 Pro' \
             -enableCodeCoverage YES | xcpretty --color --simple
-      # Run integration tests
+            
       - name: Run Integration Tests
         run: |
           cd ./samples/swiftui/FirebaseSwiftUIExample
@@ -69,7 +110,54 @@ jobs:
             -destination 'platform=iOS Simulator,name=iPhone 16 Pro' \
             -enableCodeCoverage YES \
             -resultBundlePath FirebaseSwiftUIExampleTests.xcresult | tee FirebaseSwiftUIExampleTests.log | xcpretty --test --color --simple
-      # Build for UI tests (reuses app build, builds UI test bundle)
+            
+      - name: Upload test logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: integration-tests-logs
+          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.log
+          
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: integration-tests-results
+          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.xcresult
+
+  # UI Tests (requires emulator)
+  ui-tests:
+    name: UI Tests
+    runs-on: macos-15
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+      
+      - uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+        name: Install Node.js 20
+        with:
+          node-version: '20'
+          
+      - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          
+      - name: Install Firebase
+        run: sudo npm i -g firebase-tools
+        
+      - name: Start Firebase Emulator
+        run: |
+          sudo chown -R 501:20 "/Users/runner/.npm"
+          cd ./samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample
+          ./start-firebase-emulator.sh
+          
+      - name: Install xcpretty
+        run: gem install xcpretty
+        
+      - name: Select Xcode version
+        run: sudo xcode-select -switch /Applications/Xcode_16.4.app/Contents/Developer
+        
       - name: Build for UI Tests
         run: |
           cd ./samples/swiftui/FirebaseSwiftUIExample
@@ -78,8 +166,8 @@ jobs:
             -scheme FirebaseSwiftUIExampleUITests \
             -destination 'platform=iOS Simulator,name=iPhone 16 Pro' \
             -enableCodeCoverage YES | xcpretty --color --simple
-      # Run UI tests
-      - name: Run View UI Tests
+            
+      - name: Run UI Tests
         run: |
           cd ./samples/swiftui/FirebaseSwiftUIExample
           set -o pipefail
@@ -90,30 +178,17 @@ jobs:
             -maximum-concurrent-test-simulator-destinations 2 \
             -enableCodeCoverage YES \
             -resultBundlePath FirebaseSwiftUIExampleUITests.xcresult | tee FirebaseSwiftUIExampleUITests.log | xcpretty --test --color --simple
+            
       - name: Upload test logs
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: swiftui-auth-test-logs
-          path: |
-            FirebaseSwiftUIPackageTests.log
-            samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.log
-            samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.log
-      - name: Upload FirebaseSwiftUIExampleUITests.xcresult bundle
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: FirebaseSwiftUIExampleUITests.xcresult
-          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult
-      - name: Upload FirebaseSwiftUIExampleTests.xcresult bundle
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: FirebaseSwiftUIExampleTests.xcresult
-          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.xcresult
-      - name: Upload FirebaseSwiftUIPackageTests.xcresult bundle
+          name: ui-tests-logs
+          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.log
+          
+      - name: Upload test results
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: FirebaseSwiftUIPackageTests.xcresult
-          path: FirebaseSwiftUIPackageTests.xcresult
+          name: ui-tests-results
+          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/TestView.swift

@@ -33,7 +33,7 @@ struct TestView: View {
     Auth.auth().useEmulator(withHost: "localhost", port: 9099)
     Auth.auth().settings?.isAppVerificationDisabledForTesting = true
     Task {
-      try await testCreateUser()
+      try signOut()
     }
 
     let isMfaEnabled = ProcessInfo.processInfo.arguments.contains("--mfa-enabled")

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/UITestUtils.swift

@@ -8,123 +8,9 @@ import FirebaseAuth
 import SwiftUI
 
 // UI Test Runner keys
-public let testRunner = CommandLine.arguments.contains("--auth-emulator")
-let verifyEmail = CommandLine.arguments.contains("--verify-email")
+public let testRunner = CommandLine.arguments.contains("--test-view-enabled")
 
-public var testEmail: String? {
-  guard let emailIndex = CommandLine.arguments.firstIndex(of: "--create-user"),
-        CommandLine.arguments.indices.contains(emailIndex + 1)
-  else { return nil }
-  return CommandLine.arguments[emailIndex + 1]
+func signOut() throws {
+  try Auth.auth().signOut()
 }
 
-func testCreateUser() async throws {
-  if let email = testEmail {
-    let password = "123456"
-    let auth = Auth.auth()
-    let result = try await auth.createUser(withEmail: email, password: password)
-    if verifyEmail {
-      try await setEmailVerifiedInEmulator(for: result.user)
-    }
-    try auth.signOut()
-  }
-}
-
-/// Marks the given Firebase `user` as email-verified **in the Auth emulator**.
-/// Works in CI even if the email address doesn't exist.
-/// - Parameters:
-///   - user: The signed-in Firebase user you want to verify.
-///   - projectID: Your emulator project ID (e.g. "demo-project" or whatever you're using locally).
-///   - emulatorHost: Host:port for the Auth emulator. Defaults to localhost:9099.
-func setEmailVerifiedInEmulator(for user: User,
-                                projectID: String = "flutterfire-e2e-tests",
-                                emulatorHost: String = "localhost:9099") async throws {
-
-  guard let email = user.email else {
-    throw NSError(domain: "EmulatorError", code: 1,
-                  userInfo: [
-                    NSLocalizedDescriptionKey: "User has no email; cannot look up OOB code in emulator",
-                  ])
-  }
-
-  // 1) Trigger a verification email -> creates an OOB code in the emulator.
-  try await sendVerificationEmail(user)
-
-  // 2) Read OOB codes from the emulator and find the VERIFY_EMAIL code for this user.
-  let base = "http://\(emulatorHost)"
-  let oobURL = URL(string: "\(base)/emulator/v1/projects/\(projectID)/oobCodes")!
-
-  let (oobData, oobResp) = try await URLSession.shared.data(from: oobURL)
-  guard (oobResp as? HTTPURLResponse)?.statusCode == 200 else {
-    let body = String(data: oobData, encoding: .utf8) ?? ""
-    throw NSError(domain: "EmulatorError", code: 2,
-                  userInfo: [
-                    NSLocalizedDescriptionKey: "Failed to fetch oobCodes. Response: \(body)",
-                  ])
-  }
-
-  struct OobEnvelope: Decodable { let oobCodes: [OobItem] }
-  struct OobItem: Decodable {
-    let oobCode: String
-    let email: String
-    let requestType: String
-    let creationTime: String? // RFC3339/ISO8601; optional for safety
-  }
-
-  let envelope = try JSONDecoder().decode(OobEnvelope.self, from: oobData)
-
-  // Pick the most recent VERIFY_EMAIL code for this email (in case there are multiple).
-  let iso = ISO8601DateFormatter()
-  let codeItem = envelope.oobCodes
-    .filter {
-      $0.email.caseInsensitiveCompare(email) == .orderedSame && $0.requestType == "VERIFY_EMAIL"
-    }
-    .sorted {
-      let d0 = $0.creationTime.flatMap { iso.date(from: $0) } ?? .distantPast
-      let d1 = $1.creationTime.flatMap { iso.date(from: $0) } ?? .distantPast
-      return d0 > d1
-    }
-    .first
-
-  guard let oobCode = codeItem?.oobCode else {
-    throw NSError(domain: "EmulatorError", code: 3,
-                  userInfo: [
-                    NSLocalizedDescriptionKey: "No VERIFY_EMAIL oobCode found for \(email) in emulator",
-                  ])
-  }
-
-  // 3) Apply the OOB code via the emulator's identitytoolkit endpoint.
-  // Note: API key value does not matter when talking to the emulator.
-  var applyReq = URLRequest(
-    url: URL(string: "\(base)/identitytoolkit.googleapis.com/v1/accounts:update?key=anything")!
-  )
-  applyReq.httpMethod = "POST"
-  applyReq.setValue("application/json", forHTTPHeaderField: "Content-Type")
-  applyReq.httpBody = try JSONSerialization.data(withJSONObject: ["oobCode": oobCode], options: [])
-
-  let (applyData, applyResp) = try await URLSession.shared.data(for: applyReq)
-  guard let http = applyResp as? HTTPURLResponse, http.statusCode == 200 else {
-    let body = String(data: applyData, encoding: .utf8) ?? ""
-    throw NSError(domain: "EmulatorError", code: 4,
-                  userInfo: [
-                    NSLocalizedDescriptionKey: "Applying oobCode failed. Status \((applyResp as? HTTPURLResponse)?.statusCode ?? -1). Body: \(body)",
-                  ])
-  }
-
-
-  // 4) Reload the user to reflect the new verification state.
-  try await user.reload()
-}
-
-/// Small async helper to call FirebaseAuth's callback-based `sendEmailVerification` on iOS.
-private func sendVerificationEmail(_ user: User) async throws {
-  try await withCheckedThrowingContinuation { (cont: CheckedContinuation<Void, Error>) in
-    user.sendEmailVerification { error in
-      if let error = error {
-        cont.resume(throwing: error)
-      } else {
-        cont.resume()
-      }
-    }
-  }
-}