fix(e2e): fix flaky Google credential-linking test

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.

[demolaf]

isCredentialLinkingEnabled links Google to existing email user preserving UID flaked once on CI (run 32249308037, PR #2449) with an AssertionErrorWithFacts, then passed clean on retry with no code changes.

Root cause: currentAuthState is AuthState.Success is already true from the initial email/password sign-in, and stays true through the Google-link step because AuthState.Success.equals compares the wrapped FirebaseUser by reference — Firebase mutates the same currentUser instance in place during linking rather than replacing it. So waitUntil { currentAuthState is AuthState.Success } can pass on the stale pre-link value before linkWithCredential() + profile merge finish, and the assertions occasionally read providerData mid-link.

Fix: both linking waitUntil checks (Google and phone) now also require the linked provider to actually be present on providerData, tying the wait to the real postcondition instead of racing on AuthState identity.

Verified with 5+ repeated ./gradlew e2eTest --tests CredentialLinkingScreenTest runs plus the full e2eTest suite.

[gemini-code-assist]

Code Review

This pull request refactors the authentication flow lifecycle in FirebaseUI, introducing a distinct AuthState.Aborted state to separate flow-level aborts from operation-level cancellations. It also transitions phone verification to a Flow-based API to prevent dropped callbacks and fixes a bug where the TopLevelDialogController was prematurely recreated. The review feedback suggests restoring the 'Sign Up' button in a disabled state (rather than hiding it) when new registrations are disabled, and localizing the hardcoded phone verification cooldown error message using string resources.

[russellwheatley]

LGTM. The providerData wait is the right postcondition here, so these linking tests can't pass on the leftover email-sign-in Success.