[demolaf]

Lets apps draw the password, phone and email link reauthentication prompts with their own content through one .reauthContent modifier. Existing views and the stock UI are unchanged.

Changes

• EmailReauthScreen, PhoneReauthScreen and EmailLinkReauthScreen own the reauth logic and pass a …ContentState (bindings, actions, isValid, isLoading, localized errorMessage) to their content.
• DefaultEmailReauthContent, DefaultPhoneReauthContent and DefaultEmailLinkReauthContent hold the stock markup with the stack's theming (authFont, .authCTAButtonStyle()), and EmailReauthView, PhoneReauthView and EmailLinkReauthView now render the screens with them.
• .reauthContent { prompt in ... } carries the app's content through the environment, so it reaches every sheet withReauthentication presents, from SignedInView to the MFA screens.
• The confirmation alerts, the OAuth prompt and the second-factor step after reauth stay stock.

API Usage

AuthPickerView { authenticatedApp }
  .reauthContent { prompt in
    switch prompt {
    case let .password(state):
      SecureField("Password", text: state.password)
      Button("Continue", action: state.verify)
        .disabled(!state.isValid || state.isLoading)
      Button("Not now", action: state.cancel)
    default:
      DefaultReauthContent(prompt: prompt)
    }
  }

Preview

Deleting the account with an expired session in the e2e example app (Auth emulator): custom password prompt from the snippet above, stock phone prompt through DefaultReauthContent, and the stock password prompt picking up a Georgia authTypography and purple tint.

---

Maintainer note: Fixes internal CPRN-608

[gemini-code-assist]

Code Review

This pull request refactors the reauthentication flow in FirebaseAuthSwiftUI by introducing reusable screens (EmailLinkReauthScreen, EmailReauthScreen, and PhoneReauthScreen) and default content views, alongside a new reauthContent modifier that allows developers to provide custom UI for reauthentication prompts. It also adds comprehensive unit tests for these components. The review feedback suggests replacing deprecated .foregroundColor modifiers with .foregroundStyle across the new views and refactoring EmailReauthScreen to extract error reporting into a helper method for consistency.

[gemini-code-assist]

Use .foregroundStyle instead of the deprecated .foregroundColor modifier. In modern SwiftUI (iOS 15+), .foregroundStyle is preferred for setting the color or style of views, and .foregroundStyle(.tint) is the idiomatic way to apply the accent color.

Suggested change

	Image(systemName: "envelope.open.fill")
	.font(.system(size: 60))
	.foregroundColor(.accentColor)
	.padding(.top, 32)
	Image(systemName: "envelope.open.fill")
	.font(.system(size: 60))
	.foregroundStyle(.tint)
	.padding(.top, 32)

[gemini-code-assist]

Use .foregroundStyle instead of the deprecated .foregroundColor modifier.

Suggested change

	Image(systemName: "lock.circle.fill")
	.font(.system(size: 60))
	.foregroundColor(.blue)
	Image(systemName: "lock.circle.fill")
	.font(.system(size: 60))
	.foregroundStyle(.blue)

[gemini-code-assist]

Use .foregroundStyle instead of the deprecated .foregroundColor modifier.

Suggested change

	Text(authService.string.forSecurityEnterPasswordMessage)
	.font(.body)
	.foregroundColor(.secondary)
	Text(authService.string.forSecurityEnterPasswordMessage)
	.font(.body)
	.foregroundStyle(.secondary)

[gemini-code-assist]

Use .foregroundStyle instead of the deprecated .foregroundColor modifier.

Suggested change

	Image(systemName: "phone.circle.fill")
	.font(.system(size: 60))
	.foregroundColor(.blue)
	Image(systemName: "phone.circle.fill")
	.font(.system(size: 60))
	.foregroundStyle(.blue)

[gemini-code-assist]

Use .foregroundStyle instead of the deprecated .foregroundColor modifier.

Suggested change

	Text(authService.string.forSecurityVerifyPhoneMessage)
	.font(.body)
	.foregroundColor(.secondary)
	Text(authService.string.forSecurityVerifyPhoneMessage)
	.font(.body)
	.foregroundStyle(.secondary)

[gemini-code-assist]

To reduce code duplication and maintain consistency with PhoneReauthScreen and EmailLinkReauthScreen, extract the error reporting logic into a private report(_:) helper method.

  private func verify() {
    guard isValid, !isLoading else { return }
    isLoading = true
    errorMessage = nil
    Task {
      defer { isLoading = false }
      do {
        let credential = EmailAuthProvider.credential(withEmail: email, password: password)
        try await authService.reauthenticate(with: credential)
        coordinator.reauthCompleted()
      } catch let AuthServiceError.multiFactorReauthenticationRequired(mfaRequired) {
        self.mfaRequired = mfaRequired
      } catch {
        report(error)
      }
    }
  }

  private func report(_ error: Error) {
    errorMessage = authService.string.localizedErrorMessage(for: error)
    if let reportError {
      reportError(error)
    } else {
      self.error = AlertError(
        title: "Error",
        message: error.localizedDescription,
        underlyingError: error
      )
    }
  }