Merge branch 'main' into swiftui-tests

Author: russellwheatley

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/AuthServiceError.swift

@@ -1,3 +1,17 @@
+// 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 FirebaseAuth
 import SwiftUI

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService+Email.swift

@@ -1,3 +1,17 @@
+// 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.
+
 @preconcurrency import FirebaseAuth
 import Observation
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift

@@ -1,3 +1,17 @@
+// 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 FirebaseAuth
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthConfiguration.swift

@@ -1,3 +1,17 @@
+// 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 FirebaseAuth
 import Foundation
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -1,3 +1,17 @@
+// 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.
+
 @preconcurrency import FirebaseAuth
 import SwiftUI
 
@@ -8,6 +22,7 @@ public protocol ExternalAuthProvider {
 
 public protocol GoogleProviderAuthUIProtocol: ExternalAuthProvider {
   @MainActor func signInWithGoogle(clientID: String) async throws -> AuthCredential
+  @MainActor func deleteUser(user: User) async throws
 }
 
 public protocol FacebookProviderAuthUIProtocol: ExternalAuthProvider {
@@ -83,6 +98,45 @@ public final class AuthService {
   public var authenticationFlow: AuthenticationFlow = .login
   public var errorMessage = ""
   public let passwordPrompt: PasswordPromptCoordinator = .init()
+
+  // MARK: - AuthPickerView Modal APIs
+
+  public var isShowingAuthModal = false
+
+  public enum AuthModalContentType {
+    case phoneAuth
+  }
+
+  public var currentModal: AuthModalContentType?
+
+  public var authModalViewBuilderRegistry: [AuthModalContentType: () -> AnyView] = [:]
+
+  public func registerModalView(for type: AuthModalContentType,
+                                @ViewBuilder builder: @escaping () -> AnyView) {
+    authModalViewBuilderRegistry[type] = builder
+  }
+
+  public func viewForCurrentModal() -> AnyView? {
+    guard let type = currentModal,
+          let builder = authModalViewBuilderRegistry[type] else {
+      return nil
+    }
+    return builder()
+  }
+
+  public func presentModal(for type: AuthModalContentType) {
+    currentModal = type
+    isShowingAuthModal = true
+  }
+
+  public func dismissModal() {
+    isShowingAuthModal = false
+  }
+
+  // MARK: - End AuthPickerView Modal APIs
+
+  // MARK: - Provider APIs
+
   private var unsafeGoogleProvider: (any GoogleProviderAuthUIProtocol)?
   private var unsafeFacebookProvider: (any FacebookProviderAuthUIProtocol)?
   private var unsafePhoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
@@ -146,6 +200,8 @@ public final class AuthService {
     }
   }
 
+  // MARK: - End Provider APIs
+
   private func safeActionCodeSettings() throws -> ActionCodeSettings {
     // email sign-in requires action code settings
     guard let actionCodeSettings = configuration
@@ -227,7 +283,7 @@ public final class AuthService {
         try await handleAutoUpgradeAnonymousUser(credentials: credentials)
       } else {
         let result = try await auth.signIn(with: credentials)
-        signedInCredential = result.credential
+        signedInCredential = result.credential ?? credentials
       }
       updateAuthenticationState()
     } catch {
@@ -260,11 +316,13 @@ public extension AuthService {
   func deleteUser() async throws {
     do {
       if let user = auth.currentUser, let providerId = signedInCredential?.provider {
-        if providerId == "password" {
+        if providerId == EmailAuthProviderID {
           let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
           try await operation(on: user)
-        } else if providerId == "facebook.com" {
+        } else if providerId == FacebookAuthProviderID {
           try await facebookProvider.deleteUser(user: user)
+        } else if providerId == GoogleAuthProviderID {
+          try await googleProvider.deleteUser(user: user)
         }
       }
 

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/CommonUtils.swift

@@ -1,3 +1,17 @@
+// 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 CommonCrypto
 import FirebaseCore
 import Foundation

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Utils/StringUtils.swift

@@ -1,3 +1,17 @@
+// 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 FirebaseAuth
 import SwiftUI
 
@@ -271,7 +285,7 @@ public class StringUtils {
   /// found in:
   /// - SignInWithFacebookButton
   public var facebookLoginButtonLabel: String {
-    return localizedString(for: "Continue with Facebook")
+    return localizedString(for: "Sign in with Facebook")
   }
 
   /// Facebook provider
@@ -319,8 +333,8 @@ public class StringUtils {
   /// Phone provider
   /// found in:
   /// - PhoneAuthButtonView
-  public var smsCodeSentLabel: String {
-    return localizedString(for: "SMS code sent")
+  public var smsCodeSendButtonLabel: String {
+    return localizedString(for: "Send SMS code")
   }
 
   /// Phone provider
@@ -350,4 +364,11 @@ public class StringUtils {
   public var privacyPolicyLabel: String {
     return localizedString(for: "PrivacyPolicy")
   }
+
+  /// Alert Error title
+  /// found in:
+  /// PasswordRecoveryView
+  public var alertErrorTitle: String {
+    return localizedString(for: "Error")
+  }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

@@ -1,3 +1,17 @@
+// 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 FirebaseCore
 import SwiftUI
 
@@ -11,52 +25,99 @@ public struct AuthPickerView {
     authService.authenticationFlow = authService
       .authenticationFlow == .login ? .signUp : .login
   }
+
+  private var isAuthModalPresented: Binding<Bool> {
+    Binding(
+      get: { authService.isShowingAuthModal },
+      set: { authService.isShowingAuthModal = $0 }
+    )
+  }
+
+  @ViewBuilder
+  private var authPickerTitleView: some View {
+    if authService.authView == .authPicker {
+      Text(authService.string.authPickerTitle)
+        .font(.largeTitle)
+        .fontWeight(.bold)
+        .padding()
+    }
+  }
 }
 
 extension AuthPickerView: View {
   public var body: some View {
-    VStack {
-      ScrollView {
-        Text(authService.string.authPickerTitle)
-          .font(.largeTitle)
-          .fontWeight(.bold)
-          .padding()
+    ScrollView {
+      VStack {
+        authPickerTitleView
         if authService.authenticationState == .authenticated {
           SignedInView()
-        } else if authService.authView == .passwordRecovery {
-          PasswordRecoveryView()
-        } else if authService.authView == .emailLink {
-          EmailLinkView()
         } else {
-          if authService.emailSignInEnabled {
-            Text(authService.authenticationFlow == .login ? authService.string
-              .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-            Divider()
-            EmailAuthView()
+          switch authService.authView {
+          case .passwordRecovery:
+            PasswordRecoveryView()
+          case .emailLink:
+            EmailLinkView()
+          case .authPicker:
+            if authService.emailSignInEnabled {
+              Text(authService.authenticationFlow == .login ? authService.string
+                .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+              Divider()
+              EmailAuthView()
+            }
+            VStack {
+              authService.renderButtons()
+            }.padding(.horizontal)
+            if authService.emailSignInEnabled {
+              Divider()
+              HStack {
+                Text(authService
+                  .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
+                  authService.string.alreadyHaveAnAccountLabel)
+                Button(action: {
+                  withAnimation {
+                    switchFlow()
+                  }
+                }) {
+                  Text(authService.authenticationFlow == .signUp ? authService.string
+                    .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
+                    .fontWeight(.semibold)
+                    .foregroundColor(.blue)
+                }.accessibilityIdentifier("switch-auth-flow")
+              }
+            }
+            PrivacyTOCsView(displayMode: .footer)
+            Text(authService.errorMessage).foregroundColor(.red)
+          default:
+            // TODO: - possibly refactor this, see: https://github.com/firebase/FirebaseUI-iOS/pull/1259#discussion_r2105473437
+            EmptyView()
           }
-          VStack {
-            authService.renderButtons()
-          }.padding(.horizontal)
-          if authService.emailSignInEnabled {
-            Divider()
-            HStack {
-              Text(authService
-                .authenticationFlow == .login ? authService.string.dontHaveAnAccountYetLabel :
-                authService.string.alreadyHaveAnAccountLabel)
-              Button(action: {
-                withAnimation {
-                  switchFlow()
-                }
-              }) {
-                Text(authService.authenticationFlow == .signUp ? authService.string
-                  .emailLoginFlowLabel : authService.string.emailSignUpFlowLabel)
-                  .fontWeight(.semibold)
-                  .foregroundColor(.blue)
-              }.accessibilityIdentifier("switch-auth-flow")
+        }
+      }.sheet(isPresented: isAuthModalPresented) {
+        VStack(spacing: 0) {
+          HStack {
+            Button(action: {
+              authService.dismissModal()
+            }) {
+              HStack(spacing: 4) {
+                Image(systemName: "chevron.left")
+                  .font(.system(size: 17, weight: .medium))
+                Text(authService.string.backButtonLabel)
+                  .font(.system(size: 17))
+              }
+              .foregroundColor(.blue)
             }
+            Spacer()
+          }
+          .padding()
+          .background(Color(.systemBackground))
+
+          Divider()
+
+          if let view = authService.viewForCurrentModal() {
+            view
+              .frame(maxWidth: .infinity, maxHeight: .infinity)
+              .padding()
           }
-          PrivacyTOCsView(displayMode: .footer)
-          Text(authService.errorMessage).foregroundColor(.red)
         }
       }
     }