Skip to content

Commit 960f702

Browse files
format
1 parent 097dc18 commit 960f702

File tree

5 files changed

+12
-13
lines changed

5 files changed

+12
-13
lines changed

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public final class AuthService {
138138

139139
private var listenerManager: AuthListenerManager?
140140

141-
internal private(set) var emailProvider: EmailProviderSwift?
141+
private(set) var emailProvider: EmailProviderSwift?
142142
var emailSignInEnabled = false
143143
private var emailSignInCallback: (() -> Void)?
144144

@@ -323,10 +323,8 @@ public extension AuthService {
323323
}
324324

325325
/// Enable email sign-in with custom callback
326-
func withEmailSignIn(
327-
_ provider: EmailProviderSwift? = nil,
328-
onTap: @escaping () -> Void
329-
) -> AuthService {
326+
func withEmailSignIn(_ provider: EmailProviderSwift? = nil,
327+
onTap: @escaping () -> Void) -> AuthService {
330328
emailProvider = provider ?? EmailProviderSwift()
331329
emailSignInEnabled = true
332330
emailSignInCallback = onTap
@@ -750,13 +748,13 @@ public extension AuthService {
750748
guard let email = user.email else {
751749
throw AuthServiceError.invalidCredentials("User does not have an email address")
752750
}
753-
751+
754752
guard let emailProvider = emailProvider else {
755753
throw AuthServiceError.providerNotFound(
756754
"Email provider not configured. Call withEmailSignIn() first."
757755
)
758756
}
759-
757+
760758
let credential = try await emailProvider.createReauthCredential(email: email)
761759
_ = try await user.reauthenticate(with: credential)
762760
} else if providerId == PhoneAuthProviderID {

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/EmailProviderAuthUI.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@ import FirebaseAuth
2020
public class EmailProviderSwift: AuthProviderSwift {
2121
public let passwordPrompt: PasswordPromptCoordinator
2222
public let providerId = EmailAuthProviderID
23-
23+
2424
public init(passwordPrompt: PasswordPromptCoordinator = .init()) {
2525
self.passwordPrompt = passwordPrompt
2626
}
27-
27+
2828
/// Create credential for reauthentication
2929
func createReauthCredential(email: String) async throws -> AuthCredential {
3030
let password = try await passwordPrompt.confirmPassword()
3131
return EmailAuthProvider.credential(withEmail: email, password: password)
3232
}
3333
}
34-

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/AuthPickerView.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ public struct AuthPickerView<Content: View> {
3333
extension AuthPickerView: View {
3434
public var body: some View {
3535
@Bindable var authService = authService
36-
@Bindable var passwordPrompt = authService.emailProvider?.passwordPrompt ?? PasswordPromptCoordinator()
36+
@Bindable var passwordPrompt = authService.emailProvider?
37+
.passwordPrompt ?? PasswordPromptCoordinator()
3738
content()
3839
.sheet(isPresented: $authService.isPresented) {
3940
@Bindable var navigator = authService.navigator

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/MFAResolutionView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private enum FocusableField: Hashable {
2424
@MainActor
2525
public struct MFAResolutionView {
2626
let mfaRequired: MFARequired
27-
27+
2828
@Environment(AuthService.self) private var authService
2929
@Environment(\.reportError) private var reportError
3030

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Views/UpdatePasswordView.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ public struct UpdatePasswordView {
5353

5454
extension UpdatePasswordView: View {
5555
public var body: some View {
56-
@Bindable var passwordPrompt = authService.emailProvider?.passwordPrompt ?? PasswordPromptCoordinator()
56+
@Bindable var passwordPrompt = authService.emailProvider?
57+
.passwordPrompt ?? PasswordPromptCoordinator()
5758
VStack(spacing: 24) {
5859
AuthTextField(
5960
text: $password,

0 commit comments

Comments
 (0)