refactor: second phase of FirebaseUI work.

.github/workflows/swiftui-auth.yml

@@ -2,17 +2,19 @@ name: SwiftUI Auth
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, development ]
     paths:
       - '.github/workflows/swiftui-auth.yml'
       - 'samples/swiftui/**'
+      - 'e2eTest/**'
       - 'FirebaseSwiftUI/**'
       - 'Package.swift'
   pull_request:
-    branches: [ main ]
+    branches: [ main, development ]
     paths:
       - '.github/workflows/swiftui-auth.yml'
       - 'samples/swiftui/**'
+      - 'e2eTest/**'
       - 'FirebaseSwiftUI/**'
       - 'Package.swift'
 
@@ -22,57 +24,185 @@ permissions:
   contents: read
 
 jobs:
-  swiftui-auth:
-    runs-on: macos-15
-    timeout-minutes: 30
+  format-check:
+    name: Swift Format Check
+    runs-on: macos-26
+    timeout-minutes: 10
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+
+      - name: Install swiftformat
+        run: brew install swiftformat
+
+      - name: Check Swift formatting
+        run: bash lint-swift.sh
+
+  # Package Unit Tests (standalone, no emulator needed)
+  unit-tests:
+    name: Package Unit Tests
+    runs-on: macos-26
+    timeout-minutes: 15
+    steps:
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
+
+      - name: Install xcpretty
+        run: gem install xcpretty
+
+      - name: Select Xcode version
+        run: sudo xcode-select -switch /Applications/Xcode_26.0.1.app/Contents/Developer
+
+      - name: Run FirebaseSwiftUI Package Unit Tests
+        run: |
+          set -o pipefail
+          xcodebuild test \
+            -scheme FirebaseUI-Package \
+            -destination 'platform=iOS Simulator,name=iPhone 17' \
+            -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-26
+    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 ./e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample
+          ./start-firebase-emulator.sh
+
       - name: Install xcpretty
         run: gem install xcpretty
+
       - name: Select Xcode version
+        run: sudo xcode-select -switch /Applications/Xcode_26.0.1.app/Contents/Developer
+
+      - name: Build for Integration Tests
         run: |
-          sudo xcode-select -switch /Applications/Xcode_16.3.app/Contents/Developer
-      - name: Run Integration Tests
-        run: |
-          cd ./samples/swiftui/FirebaseSwiftUIExample
+          cd ./e2eTest/FirebaseSwiftUIExample
           set -o pipefail
-          xcodebuild test -scheme FirebaseSwiftUIExampleTests -destination 'platform=iOS Simulator,name=iPhone 16 Pro' -enableCodeCoverage YES -resultBundlePath FirebaseSwiftUIExampleTests.xcresult | tee FirebaseSwiftUIExampleTests.log | xcpretty --test --color --simple
-      - name: Run View UI Tests
+          xcodebuild build-for-testing \
+            -scheme FirebaseSwiftUIExampleTests \
+            -destination 'platform=iOS Simulator,name=iPhone 17' \
+            -enableCodeCoverage YES | xcpretty --color --simple
+
+      - name: Run Integration Tests
         run: |
-          cd ./samples/swiftui/FirebaseSwiftUIExample
+          cd ./e2eTest/FirebaseSwiftUIExample
           set -o pipefail
-          xcodebuild test -scheme FirebaseSwiftUIExampleUITests -destination 'platform=iOS Simulator,name=iPhone 16 Pro' -enableCodeCoverage YES -resultBundlePath FirebaseSwiftUIExampleUITests.xcresult | tee FirebaseSwiftUIExampleUITests.log | xcpretty --test --color --simple
+          xcodebuild test-without-building \
+            -scheme FirebaseSwiftUIExampleTests \
+            -destination 'platform=iOS Simulator,name=iPhone 17' \
+            -enableCodeCoverage YES \
+            -resultBundlePath FirebaseSwiftUIExampleTests.xcresult | tee FirebaseSwiftUIExampleTests.log | xcpretty --test --color --simple
+
       - name: Upload test logs
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: swiftui-auth-test-logs
-          path: |
-            samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.log
-            samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.log
-      - name: Upload FirebaseSwiftUIExampleUITests.xcresult bundle
+          name: integration-tests-logs
+          path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.log
+
+      - name: Upload test results
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: FirebaseSwiftUIExampleUITests.xcresult
-          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult
-      - name: Upload FirebaseSwiftUIExampleTests.xcresult bundle
+          name: integration-tests-results
+          path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.xcresult
+
+  # UI Tests (requires emulator)
+  ui-tests:
+    name: UI Tests
+    runs-on: macos-26
+    timeout-minutes: 40
+    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 ./e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample
+          ./start-firebase-emulator.sh
+
+      - name: Install xcpretty
+        run: gem install xcpretty
+
+      - name: Select Xcode version
+        run: sudo xcode-select -switch /Applications/Xcode_26.0.1.app/Contents/Developer
+
+      - name: Build for UI Tests
+        run: |
+          cd ./e2eTest/FirebaseSwiftUIExample
+          set -o pipefail
+          xcodebuild build-for-testing \
+            -scheme FirebaseSwiftUIExampleUITests \
+            -destination 'platform=iOS Simulator,name=iPhone 17' \
+            -enableCodeCoverage YES | xcpretty --color --simple
+
+      - name: Run UI Tests
+        run: |
+          cd ./e2eTest/FirebaseSwiftUIExample
+          set -o pipefail
+          xcodebuild test-without-building \
+            -scheme FirebaseSwiftUIExampleUITests \
+            -destination 'platform=iOS Simulator,name=iPhone 17' \
+            -parallel-testing-enabled NO \
+            -enableCodeCoverage YES \
+            -resultBundlePath FirebaseSwiftUIExampleUITests.xcresult | tee FirebaseSwiftUIExampleUITests.log | xcpretty --test --color --simple
+
+      - name: Upload Firebase Emulator logs
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: firebase-emulator-logs
+          path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExample/firebase-debug.log
+
+      - name: Upload test results
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: FirebaseSwiftUIExampleTests.xcresult
-          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleTests.xcresult
+          name: FirebaseSwiftUIExampleUITests.xcresult
+          path: e2eTest/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult

FirebaseSwiftUI/FirebaseAppleSwiftUI/Sources/Services/AppleProviderAuthUI.swift

@@ -0,0 +1,154 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import AuthenticationServices
+import CryptoKit
+import FirebaseAuth
+import FirebaseAuthSwiftUI
+import FirebaseCore
+import SwiftUI
+
+// MARK: - Data Extensions
+
+extension Data {
+  var utf8String: String? {
+    return String(data: self, encoding: .utf8)
+  }
+}
+
+extension ASAuthorizationAppleIDCredential {
+  var authorizationCodeString: String? {
+    return authorizationCode?.utf8String
+  }
+
+  var idTokenString: String? {
+    return identityToken?.utf8String
+  }
+}
+
+// MARK: - Authenticate With Apple Dialog
+
+private func authenticateWithApple(scopes: [ASAuthorization.Scope]) async throws -> (
+  ASAuthorizationAppleIDCredential,
+  String
+) {
+  return try await AuthenticateWithAppleDialog(scopes: scopes).authenticate()
+}
+
+private class AuthenticateWithAppleDialog: NSObject {
+  private var continuation: CheckedContinuation<(ASAuthorizationAppleIDCredential, String), Error>?
+  private var currentNonce: String?
+  private let scopes: [ASAuthorization.Scope]
+
+  init(scopes: [ASAuthorization.Scope]) {
+    self.scopes = scopes
+    super.init()
+  }
+
+  func authenticate() async throws -> (ASAuthorizationAppleIDCredential, String) {
+    return try await withCheckedThrowingContinuation { continuation in
+      self.continuation = continuation
+
+      let appleIDProvider = ASAuthorizationAppleIDProvider()
+      let request = appleIDProvider.createRequest()
+      request.requestedScopes = scopes
+
+      do {
+        let nonce = try CryptoUtils.randomNonceString()
+        currentNonce = nonce
+        request.nonce = CryptoUtils.sha256(nonce)
+      } catch {
+        continuation.resume(throwing: AuthServiceError.signInFailed(underlying: error))
+        return
+      }
+
+      let authorizationController = ASAuthorizationController(authorizationRequests: [request])
+      authorizationController.delegate = self
+      authorizationController.performRequests()
+    }
+  }
+}
+
+extension AuthenticateWithAppleDialog: ASAuthorizationControllerDelegate {
+  func authorizationController(controller _: ASAuthorizationController,
+                               didCompleteWithAuthorization authorization: ASAuthorization) {
+    if let appleIDCredential = authorization.credential as? ASAuthorizationAppleIDCredential {
+      if let nonce = currentNonce {
+        continuation?.resume(returning: (appleIDCredential, nonce))
+      } else {
+        continuation?.resume(
+          throwing: AuthServiceError.signInFailed(
+            underlying: NSError(
+              domain: "AppleSignIn",
+              code: -1,
+              userInfo: [NSLocalizedDescriptionKey: "Missing nonce"]
+            )
+          )
+        )
+      }
+    } else {
+      continuation?.resume(
+        throwing: AuthServiceError.invalidCredentials("Missing Apple ID credential")
+      )
+    }
+    continuation = nil
+  }
+
+  func authorizationController(controller _: ASAuthorizationController,
+                               didCompleteWithError error: Error) {
+    continuation?.resume(throwing: AuthServiceError.signInFailed(underlying: error))
+    continuation = nil
+  }
+}
+
+// MARK: - Apple Provider Swift
+
+public class AppleProviderSwift: CredentialAuthProviderSwift {
+  public let scopes: [ASAuthorization.Scope]
+  let providerId = "apple.com"
+
+  public init(scopes: [ASAuthorization.Scope] = [.fullName, .email]) {
+    self.scopes = scopes
+  }
+
+  @MainActor public func createAuthCredential() async throws -> AuthCredential {
+    let (appleIDCredential, nonce) = try await authenticateWithApple(scopes: scopes)
+
+    guard let idTokenString = appleIDCredential.idTokenString else {
+      throw AuthServiceError.invalidCredentials("Unable to fetch identity token from Apple")
+    }
+
+    let credential = OAuthProvider.appleCredential(
+      withIDToken: idTokenString,
+      rawNonce: nonce,
+      fullName: appleIDCredential.fullName
+    )
+
+    return credential
+  }
+}
+
+public class AppleProviderAuthUI: AuthProviderUI {
+  private let typedProvider: AppleProviderSwift
+  public var provider: AuthProviderSwift { typedProvider }
+  public let id: String = "apple.com"
+
+  public init(provider: AppleProviderSwift) {
+    typedProvider = provider
+  }
+
+  @MainActor public func authButton() -> AnyView {
+    AnyView(SignInWithAppleButton(provider: typedProvider))
+  }
+}