Merge branch 'oauth-providers' into error-refactor

Author: russellwheatley

.github/workflows/swiftui-auth.yml

@@ -26,7 +26,7 @@ jobs:
   unit-tests:
     name: Package Unit Tests
     runs-on: macos-15
-    timeout-minutes: 20
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
 
@@ -129,7 +129,7 @@ jobs:
   ui-tests:
     name: UI Tests
     runs-on: macos-15
-    timeout-minutes: 30
+    timeout-minutes: 40
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
 
@@ -179,16 +179,16 @@ jobs:
             -enableCodeCoverage YES \
             -resultBundlePath FirebaseSwiftUIExampleUITests.xcresult | tee FirebaseSwiftUIExampleUITests.log | xcpretty --test --color --simple
             
-      - name: Upload test logs
+      - name: Upload Firebase Emulator logs
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: ui-tests-logs
-          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.log
+          name: firebase-emulator-logs
+          path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/firebase-debug.log
 
       - name: Upload test results
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: ui-tests-results
+          name: FirebaseSwiftUIExampleUITests.xcresult
           path: samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests.xcresult

FirebaseSwiftUI/FirebaseOAuthSwiftUI/Sources/Services/OAuthProviderSwift.swift

@@ -96,19 +96,23 @@ public class OAuthProviderSwift: AuthProviderSwift, DeleteUserSwift {
 
     return try await withCheckedThrowingContinuation { continuation in
       provider.getCredentialWith(nil) { credential, error in
-        if let error {
+        if let error = error {
           continuation.resume(
             throwing: AuthServiceError.signInFailed(underlying: error)
           )
-        } else if let credential {
-          continuation.resume(returning: credential)
-        } else {
+          return
+        }
+
+        guard let credential = credential else {
           continuation.resume(
             throwing: AuthServiceError.invalidCredentials(
               "\(self.providerId) did not provide a valid AuthCredential"
             )
           )
+          return
         }
+
+        continuation.resume(returning: credential)
       }
     }
   }

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExample/start-firebase-emulator.sh

@@ -14,7 +14,7 @@ if ! [ -x "$(command -v npm)" ]; then
   exit 1
 fi
 
-EMU_START_COMMAND="firebase emulators:start --only auth --project flutterfire-e2e-tests"
+EMU_START_COMMAND="firebase emulators:start --only auth --project flutterfire-e2e-tests --debug"
 
 MAX_RETRIES=3
 MAX_CHECKATTEMPTS=60

samples/swiftui/FirebaseSwiftUIExample/FirebaseSwiftUIExampleUITests/FirebaseSwiftUIExampleUITests.swift

@@ -174,6 +174,13 @@ final class FirebaseSwiftUIExampleUITests: XCTestCase {
     XCTAssertTrue(signUpButton.exists, "Sign-Up button should exist")
     signUpButton.tap()
 
+    // Wait for the auth screen to disappear (email field should no longer exist)
+    let emailFieldDisappeared = NSPredicate(format: "exists == false")
+    let expectation = XCTNSPredicateExpectation(predicate: emailFieldDisappeared, object: emailField)
+    let result = XCTWaiter().wait(for: [expectation], timeout: 10.0)
+    XCTAssertEqual(result, .completed, "Email field should disappear after sign-up")
+    
+
     // Wait for user creation and signed-in view to appear
     let signedInText = app.staticTexts["signed-in-text"]
     XCTAssertTrue(