Merge branch 'main' into swift-ui-feedback

Author: russellwheatley

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

@@ -28,13 +28,36 @@ extension EmailPasswordOperationReauthentication {
   }
 }
 
-class EmailPasswordDeleteUserOperation: DeleteUserOperation,
+class EmailPasswordDeleteUserOperation: AuthenticatedOperation,
   EmailPasswordOperationReauthentication {
   let passwordPrompt: PasswordPromptCoordinator
 
   init(passwordPrompt: PasswordPromptCoordinator) {
     self.passwordPrompt = passwordPrompt
   }
+
+  func callAsFunction(on user: User) async throws {
+    try await callAsFunction(on: user) {
+      try await user.delete()
+    }
+  }
+}
+
+class EmailPasswordUpdatePasswordOperation: AuthenticatedOperation,
+  EmailPasswordOperationReauthentication {
+  let passwordPrompt: PasswordPromptCoordinator
+  let newPassword: String
+
+  init(passwordPrompt: PasswordPromptCoordinator, newPassword: String) {
+    self.passwordPrompt = passwordPrompt
+    self.newPassword = newPassword
+  }
+
+  func callAsFunction(on user: User) async throws {
+    try await callAsFunction(on: user) {
+      try await user.updatePassword(to: newPassword)
+    }
+  }
 }
 
 @MainActor

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AccountService.swift

@@ -19,27 +19,19 @@ enum AuthenticationToken {
 protocol AuthenticatedOperation {
   func callAsFunction(on user: User) async throws
   func reauthenticate() async throws -> AuthenticationToken
-  func performOperation(on user: User, with token: AuthenticationToken?) async throws
 }
 
 extension AuthenticatedOperation {
-  func callAsFunction(on user: User) async throws {
+  func callAsFunction(on _: User,
+                      _ performOperation: () async throws -> Void) async throws {
     do {
-      try await performOperation(on: user, with: nil)
+      try await performOperation()
     } catch let error as NSError where error.requiresReauthentication {
       let token = try await reauthenticate()
-      try await performOperation(on: user, with: token)
+      try await performOperation()
     } catch AuthServiceError.reauthenticationRequired {
       let token = try await reauthenticate()
-      try await performOperation(on: user, with: token)
+      try await performOperation()
     }
   }
 }
-
-protocol DeleteUserOperation: AuthenticatedOperation {}
-
-extension DeleteUserOperation {
-  func performOperation(on user: User, with _: AuthenticationToken? = nil) async throws {
-    try await user.delete()
-  }
-}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

@@ -1,8 +1,12 @@
 @preconcurrency import FirebaseAuth
 import SwiftUI
 
+public protocol ExternalAuthProvider {
+  associatedtype ButtonType: View
+  @MainActor var authButton: ButtonType { get }
+}
+
 public protocol GoogleProviderAuthUIProtocol {
-  func handleUrl(_ url: URL) -> Bool
   @MainActor func signInWithGoogle(clientID: String) async throws -> AuthCredential
 }
 
@@ -29,6 +33,7 @@ public enum AuthView {
   case authPicker
   case passwordRecovery
   case emailLink
+  case updatePassword
 }
 
 @MainActor
@@ -84,12 +89,14 @@ public final class AuthService {
   public var errorMessage = ""
   public let passwordPrompt: PasswordPromptCoordinator = .init()
 
+  public var googleProvider: (any GoogleProviderAuthUIProtocol)?
+  public var facebookProvider: (any FacebookProviderAuthUIProtocol)?
+  public var phoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
+
   private var listenerManager: AuthListenerManager?
-  private let googleProvider: GoogleProviderAuthUIProtocol?
-  private let facebookProvider: FacebookProviderAuthUIProtocol?
-  private let phoneAuthProvider: PhoneAuthProviderAuthUIProtocol?
+  private var signedInCredential: AuthCredential?
 
-  private var safeGoogleProvider: GoogleProviderAuthUIProtocol {
+  private var safeGoogleProvider: any GoogleProviderAuthUIProtocol {
     get throws {
       guard let provider = googleProvider else {
         throw AuthServiceError
@@ -217,6 +224,24 @@ public extension AuthService {
       throw error
     }
   }
+
+  func updatePassword(to password: String) async throws {
+    do {
+      if let user = auth.currentUser {
+        let operation = EmailPasswordUpdatePasswordOperation(
+          passwordPrompt: passwordPrompt,
+          newPassword: password
+        )
+        try await operation(on: user)
+      }
+
+    } catch {
+      errorMessage = string.localizedErrorMessage(
+        for: error
+      )
+      throw error
+    }
+  }
 }
 
 // MARK: - Email/Password Sign In

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Strings/Localizable.xcstrings

@@ -162,6 +162,7 @@
     },
     "AuthPickerTitle" : {
       "comment" : "Title for auth picker screen.",
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -404,6 +405,9 @@
           }
         }
       }
+    },
+    "Enter Password" : {
+
     },
     "EnterYourEmail" : {
       "comment" : "Title for email entry screen, email text field placeholder. Use short/abbreviated translation for 'email' which is less than 15 chars.",
@@ -932,6 +936,9 @@
           }
         }
       }
+    },
+    "Submit" : {
+
     },
     "TermsOfService" : {
       "comment" : "Text linked to a web page with the Terms of Service content.",

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift

@@ -15,32 +15,40 @@ extension SignedInView: View {
   }
 
   public var body: some View {
-    VStack {
-      Text("Signed in")
-      Text("User: \(authService.currentUser?.email ?? "Unknown")")
+    if authService.authView == .updatePassword {
+      UpdatePasswordView()
+    } else {
+      VStack {
+        Text("Signed in")
+        Text("User: \(authService.currentUser?.email ?? "Unknown")")
 
-      if authService.currentUser?.isEmailVerified == false {
-        VerifyEmailView()
-      }
-
-      Button("Sign out") {
-        Task {
-          do {
-            try await authService.signOut()
-          } catch {}
+        if authService.currentUser?.isEmailVerified == false {
+          VerifyEmailView()
         }
-      }
-      Divider()
-      Button("Delete account") {
-        Task {
-          do {
-            try await authService.deleteUser()
-          } catch {}
+        Divider()
+        Button("Update password") {
+          authService.authView = .updatePassword
+        }
+        Divider()
+        Button("Sign out") {
+          Task {
+            do {
+              try await authService.signOut()
+            } catch {}
+          }
+        }
+        Divider()
+        Button("Delete account") {
+          Task {
+            do {
+              try await authService.deleteUser()
+            } catch {}
+          }
         }
+        Text(authService.errorMessage).foregroundColor(.red)
+      }.sheet(isPresented: isShowingPasswordPrompt) {
+        PasswordPromptSheet(coordinator: authService.passwordPrompt)
       }
-      Text(authService.errorMessage).foregroundColor(.red)
-    }.sheet(isPresented: isShowingPasswordPrompt) {
-      PasswordPromptSheet(coordinator: authService.passwordPrompt)
     }
   }
 }

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/UpdatePassword.swift

@@ -0,0 +1,82 @@
+//
+//  UpdatePassword.swift
+//  FirebaseUI
+//
+//  Created by Russell Wheatley on 24/04/2025.
+//
+
+import SwiftUI
+
+private enum FocusableField: Hashable {
+  case password
+  case confirmPassword
+}
+
+@MainActor
+public struct UpdatePasswordView {
+  @Environment(AuthService.self) private var authService
+  @State private var password = ""
+  @State private var confirmPassword = ""
+
+  @FocusState private var focus: FocusableField?
+  private var isValid: Bool {
+    !password.isEmpty && password == confirmPassword
+  }
+}
+
+extension UpdatePasswordView: View {
+  private var isShowingPasswordPrompt: Binding<Bool> {
+    Binding(
+      get: { authService.passwordPrompt.isPromptingPassword },
+      set: { authService.passwordPrompt.isPromptingPassword = $0 }
+    )
+  }
+
+  public var body: some View {
+    VStack {
+      LabeledContent {
+        SecureField("Password", text: $password)
+          .focused($focus, equals: .password)
+          .submitLabel(.go)
+      } label: {
+        Image(systemName: "lock")
+      }
+      .padding(.vertical, 6)
+      .background(Divider(), alignment: .bottom)
+      .padding(.bottom, 8)
+
+      Divider()
+
+      LabeledContent {
+        SecureField("Confirm password", text: $confirmPassword)
+          .focused($focus, equals: .confirmPassword)
+          .submitLabel(.go)
+      } label: {
+        Image(systemName: "lock")
+      }
+      .padding(.vertical, 6)
+      .background(Divider(), alignment: .bottom)
+      .padding(.bottom, 8)
+
+      Divider()
+
+      Button(action: {
+        Task {
+          try await authService.updatePassword(to: confirmPassword)
+          authService.authView = .authPicker
+        }
+      }, label: {
+        Text("Update password")
+          .padding(.vertical, 8)
+          .frame(maxWidth: .infinity)
+
+      })
+      .disabled(!isValid)
+      .padding([.top, .bottom], 8)
+      .frame(maxWidth: .infinity)
+      .buttonStyle(.borderedProminent)
+    }.sheet(isPresented: isShowingPasswordPrompt) {
+      PasswordPromptSheet(coordinator: authService.passwordPrompt)
+    }
+  }
+}

FirebaseSwiftUI/FirebaseFacebookSwiftUI/Sources/Services/FacebookProviderAuthUI.swift

@@ -3,6 +3,7 @@ import FacebookCore
 import FacebookLogin
 import FirebaseAuth
 import FirebaseAuthSwiftUI
+import SwiftUI
 
 let kFacebookEmailScope = "email"
 let kFacebookProfileScope = "public_profile"
@@ -34,6 +35,10 @@ public class FacebookProviderAuthUI: FacebookProviderAuthUIProtocol {
     shaNonce = CommonUtils.sha256Hash(of: rawNonce)
   }
 
+  @MainActor public var authButton: SignInWithFacebookButton {
+    return SignInWithFacebookButton()
+  }
+
   @MainActor public func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential {
     let trackingStatus = ATTrackingManager.trackingAuthorizationStatus
     let tracking: LoginTracking = trackingStatus != .authorized ? .limited :

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/AuthService+Google.swift

@@ -0,0 +1,17 @@
+//
+//  AuthService+Google.swift
+//  FirebaseUI
+//
+//  Created by Morgan Chen on 4/16/25.
+//
+
+import FirebaseAuthSwiftUI
+
+public extension AuthService {
+  @discardableResult
+  func withGoogleSignIn() -> AuthService {
+    let clientID = auth.app?.options.clientID ?? ""
+    googleProvider = GoogleProviderAuthUI(clientID: clientID)
+    return self
+  }
+}

FirebaseSwiftUI/FirebaseGoogleSwiftUI/Sources/Services/GoogleProviderAuthUI.swift

@@ -1,6 +1,9 @@
 @preconcurrency import FirebaseAuth
 import FirebaseAuthSwiftUI
+import FirebaseCore
 import GoogleSignIn
+import GoogleSignInSwift
+import SwiftUI
 
 let kGoogleUserInfoEmailScope = "https://www.googleapis.com/auth/userinfo.email"
 let kGoogleUserInfoProfileScope = "https://www.googleapis.com/auth/userinfo.profile"
@@ -16,12 +19,18 @@ public class GoogleProviderAuthUI: @preconcurrency GoogleProviderAuthUIProtocol
   let scopes: [String]
   let shortName = "Google"
   let providerId = "google.com"
-  public init(scopes: [String]? = nil) {
+  let clientID: String
+  public init(scopes: [String]? = nil, clientID: String = FirebaseApp.app()!.options.clientID!) {
     self.scopes = scopes ?? kDefaultScopes
+    self.clientID = clientID
   }
 
-  public func handleUrl(_ url: URL) -> Bool {
-    return GIDSignIn.sharedInstance.handle(url)
+  @MainActor public var authButton: GoogleSignInButton {
+    return GoogleSignInButton {
+      Task {
+        try await self.signInWithGoogle(clientID: self.clientID)
+      }
+    }
   }
 
   @MainActor public func signInWithGoogle(clientID: String) async throws -> AuthCredential {

FirebaseSwiftUI/FirebasePhoneAuthSwiftUI/Sources/Services/PhoneAuthProviderAuthUI.swift

@@ -1,9 +1,15 @@
 @preconcurrency import FirebaseAuth
 import FirebaseAuthSwiftUI
+import SwiftUI
 
 public typealias VerificationID = String
 
 public class PhoneAuthProviderAuthUI: @preconcurrency PhoneAuthProviderAuthUIProtocol {
+  public var authButton: Button<Text> {
+    // TODO: implement me
+    return Button("Phone", action: {})
+  }
+
   public init() {}
 
   @MainActor public func verifyPhoneNumber(phoneNumber: String) async throws -> VerificationID {