Merge branch 'main' into auto-upgrade-anonymous

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,16 +1,20 @@
 @preconcurrency import FirebaseAuth
 import SwiftUI
 
-public protocol GoogleProviderProtocol {
-  func handleUrl(_ url: URL) -> Bool
+public protocol ExternalAuthProvider {
+  associatedtype ButtonType: View
+  @MainActor var authButton: ButtonType { get }
+}
+
+public protocol GoogleProviderAuthUIProtocol: ExternalAuthProvider {
   @MainActor func signInWithGoogle(clientID: String) async throws -> AuthCredential
 }
 
-public protocol FacebookProviderProtocol {
+public protocol FacebookProviderAuthUIProtocol: ExternalAuthProvider {
   @MainActor func signInWithFacebook(isLimitedLogin: Bool) async throws -> AuthCredential
 }
 
-public protocol PhoneAuthProviderProtocol {
+public protocol PhoneAuthProviderAuthUIProtocol: ExternalAuthProvider {
   @MainActor func verifyPhoneNumber(phoneNumber: String) async throws -> String
 }
 
@@ -29,6 +33,7 @@ public enum AuthView {
   case authPicker
   case passwordRecovery
   case emailLink
+  case updatePassword
 }
 
 @MainActor
@@ -61,9 +66,9 @@ private final class AuthListenerManager {
 @Observable
 public final class AuthService {
   public init(configuration: AuthConfiguration = AuthConfiguration(), auth: Auth = Auth.auth(),
-              googleProvider: GoogleProviderProtocol? = nil,
-              facebookProvider: FacebookProviderProtocol? = nil,
-              phoneAuthProvider: PhoneAuthProviderProtocol? = nil) {
+              googleProvider: (any GoogleProviderAuthUIProtocol)? = nil,
+              facebookProvider: (any FacebookProviderAuthUIProtocol)? = nil,
+              phoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)? = nil) {
     self.auth = auth
     self.configuration = configuration
     self.googleProvider = googleProvider
@@ -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: GoogleProviderProtocol?
-  private let facebookProvider: FacebookProviderProtocol?
-  private let phoneAuthProvider: PhoneAuthProviderProtocol?
+  private var signedInCredential: AuthCredential?
 
-  private var safeGoogleProvider: GoogleProviderProtocol {
+  private var safeGoogleProvider: any GoogleProviderAuthUIProtocol {
     get throws {
       guard let provider = googleProvider else {
         throw AuthServiceError
@@ -99,7 +106,7 @@ public final class AuthService {
     }
   }
 
-  private var safeFacebookProvider: FacebookProviderProtocol {
+  private var safeFacebookProvider: any FacebookProviderAuthUIProtocol {
     get throws {
       guard let provider = facebookProvider else {
         throw AuthServiceError
@@ -109,7 +116,7 @@ public final class AuthService {
     }
   }
 
-  private var safePhoneAuthProvider: PhoneAuthProviderProtocol {
+  private var safePhoneAuthProvider: any PhoneAuthProviderAuthUIProtocol {
     get throws {
       guard let provider = phoneAuthProvider else {
         throw AuthServiceError
@@ -239,6 +246,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/Utils/CommonUtils.swift

@@ -1,4 +1,5 @@
 import CommonCrypto
+import FirebaseCore
 import Foundation
 import Security
 
@@ -55,3 +56,20 @@ public class CommonUtils {
     return urlComponents.queryItems?.first(where: { $0.name == paramName })?.value
   }
 }
+
+public extension FirebaseOptions {
+  static func dummyConfigurationForPreview() {
+    guard FirebaseApp.app() == nil else { return }
+
+    let options = FirebaseOptions(
+      googleAppID: "1:123:ios:123abc456def7890",
+      gcmSenderID: "dummy"
+    )
+    options.apiKey = "dummy"
+    options.projectID = "dummy-project-id"
+    options.bundleID = Bundle.main.bundleIdentifier ?? "com.example.dummy"
+    options.clientID = "dummy-abc.apps.googleusercontent.com"
+
+    FirebaseApp.configure(options: options)
+  }
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailAuthView.swift

@@ -5,6 +5,7 @@
 //  Created by Russell Wheatley on 20/03/2025.
 //
 import FirebaseAuth
+import FirebaseCore
 import SwiftUI
 
 private enum FocusableField: Hashable {
@@ -132,3 +133,9 @@ extension EmailAuthView: View {
     }
   }
 }
+
+#Preview {
+  FirebaseOptions.dummyConfigurationForPreview()
+  return EmailAuthView()
+    .environment(AuthService())
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/EmailLinkView.swift

@@ -1,4 +1,5 @@
 import FirebaseAuth
+import FirebaseCore
 import SwiftUI
 
 public struct EmailLinkView {
@@ -74,3 +75,9 @@ extension EmailLinkView: View {
     })
   }
 }
+
+#Preview {
+  FirebaseOptions.dummyConfigurationForPreview()
+  return EmailLinkView()
+    .environment(AuthService())
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordPromptView.swift

@@ -27,3 +27,7 @@ extension PasswordPromptSheet: View {
     .padding()
   }
 }
+
+#Preview {
+  PasswordPromptSheet(coordinator: PasswordPromptCoordinator())
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/PasswordRecoveryView.swift

@@ -1,3 +1,4 @@
+import FirebaseCore
 import SwiftUI
 
 public struct PasswordRecoveryView {
@@ -67,3 +68,9 @@ extension PasswordRecoveryView: View {
     })
   }
 }
+
+#Preview {
+  FirebaseOptions.dummyConfigurationForPreview()
+  return PasswordRecoveryView()
+    .environment(AuthService())
+}

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/SignedInView.swift

@@ -1,3 +1,4 @@
+import FirebaseCore
 import SwiftUI
 
 @MainActor
@@ -14,32 +15,46 @@ 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)
     }
   }
 }
+
+#Preview {
+  FirebaseOptions.dummyConfigurationForPreview()
+  return SignedInView()
+    .environment(AuthService())
+}