Skip to content

Commit a454559

Browse files
refactor: update provider naming
1 parent ebcd911 commit a454559

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

FirebaseSwiftUI/FirebaseAuthSwiftUI/Sources/Services/AuthService.swift

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ public final class AuthService {
8383
public var authenticationFlow: AuthenticationFlow = .login
8484
public var errorMessage = ""
8585
public let passwordPrompt: PasswordPromptCoordinator = .init()
86-
private var googleProvider: (any GoogleProviderAuthUIProtocol)?
87-
private var facebookProvider: (any FacebookProviderAuthUIProtocol)?
88-
private var phoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
86+
private var unsafeGoogleProvider: (any GoogleProviderAuthUIProtocol)?
87+
private var unsafeFacebookProvider: (any FacebookProviderAuthUIProtocol)?
88+
private var unsafePhoneAuthProvider: (any PhoneAuthProviderAuthUIProtocol)?
8989

9090
private var listenerManager: AuthListenerManager?
9191
private var signedInCredential: AuthCredential?
@@ -94,13 +94,13 @@ public final class AuthService {
9494
public func register(provider: ExternalAuthProvider) {
9595
switch provider {
9696
case let google as GoogleProviderAuthUIProtocol:
97-
googleProvider = google
97+
unsafeGoogleProvider = google
9898
providers.append(provider)
9999
case let facebook as FacebookProviderAuthUIProtocol:
100-
facebookProvider = facebook
100+
unsafeFacebookProvider = facebook
101101
providers.append(provider)
102102
case let phone as PhoneAuthProviderAuthUIProtocol:
103-
phoneAuthProvider = phone
103+
unsafePhoneAuthProvider = phone
104104
providers.append(provider)
105105
default:
106106
break
@@ -117,29 +117,29 @@ public final class AuthService {
117117
)
118118
}
119119

120-
private var safeGoogleProvider: any GoogleProviderAuthUIProtocol {
120+
private var googleProvider: any GoogleProviderAuthUIProtocol {
121121
get throws {
122-
guard let provider = googleProvider else {
122+
guard let provider = unsafeGoogleProvider else {
123123
throw AuthServiceError
124124
.notConfiguredProvider("`GoogleProviderSwift` has not been configured")
125125
}
126126
return provider
127127
}
128128
}
129129

130-
private var safeFacebookProvider: any FacebookProviderAuthUIProtocol {
130+
private var facebookProvider: any FacebookProviderAuthUIProtocol {
131131
get throws {
132-
guard let provider = facebookProvider else {
132+
guard let provider = unsafeFacebookProvider else {
133133
throw AuthServiceError
134134
.notConfiguredProvider("`FacebookProviderAuthUI` has not been configured")
135135
}
136136
return provider
137137
}
138138
}
139139

140-
private var safePhoneAuthProvider: any PhoneAuthProviderAuthUIProtocol {
140+
private var phoneAuthProvider: any PhoneAuthProviderAuthUIProtocol {
141141
get throws {
142-
guard let provider = phoneAuthProvider else {
142+
guard let provider = unsafePhoneAuthProvider else {
143143
throw AuthServiceError
144144
.notConfiguredProvider("`PhoneAuthProviderSwift` has not been configured")
145145
}
@@ -265,7 +265,7 @@ public extension AuthService {
265265
let operation = EmailPasswordDeleteUserOperation(passwordPrompt: passwordPrompt)
266266
try await operation(on: user)
267267
} else if providerId == "facebook.com" {
268-
try await safeFacebookProvider.deleteUser(user: user)
268+
try await facebookProvider.deleteUser(user: user)
269269
}
270270
}
271271

@@ -428,7 +428,7 @@ public extension AuthService {
428428
"OAuth client ID not found. Please make sure Google Sign-In is enabled in the Firebase console. You may have to download a new GoogleService-Info.plist file after enabling Google Sign-In."
429429
)
430430
}
431-
let credential = try await safeGoogleProvider.signInWithGoogle(clientID: clientID)
431+
let credential = try await googleProvider.signInWithGoogle(clientID: clientID)
432432

433433
try await signIn(credentials: credential)
434434
}
@@ -438,7 +438,7 @@ public extension AuthService {
438438

439439
public extension AuthService {
440440
func signInWithFacebook(limitedLogin: Bool = true) async throws {
441-
let credential = try await safeFacebookProvider
441+
let credential = try await facebookProvider
442442
.signInWithFacebook(isLimitedLogin: limitedLogin)
443443
try await signIn(credentials: credential)
444444
}
@@ -449,7 +449,7 @@ public extension AuthService {
449449
public extension AuthService {
450450
func verifyPhoneNumber(phoneNumber: String) async throws -> String {
451451
do {
452-
return try await safePhoneAuthProvider.verifyPhoneNumber(phoneNumber: phoneNumber)
452+
return try await phoneAuthProvider.verifyPhoneNumber(phoneNumber: phoneNumber)
453453
} catch {
454454
errorMessage = string.localizedErrorMessage(
455455
for: error

0 commit comments

Comments
 (0)