@@ -83,9 +83,9 @@ public final class AuthService {
83
83
public var authenticationFlow : AuthenticationFlow = . login
84
84
public var errorMessage = " "
85
85
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 ) ?
89
89
90
90
private var listenerManager : AuthListenerManager ?
91
91
private var signedInCredential : AuthCredential ?
@@ -94,13 +94,13 @@ public final class AuthService {
94
94
public func register( provider: ExternalAuthProvider ) {
95
95
switch provider {
96
96
case let google as GoogleProviderAuthUIProtocol :
97
- googleProvider = google
97
+ unsafeGoogleProvider = google
98
98
providers. append ( provider)
99
99
case let facebook as FacebookProviderAuthUIProtocol :
100
- facebookProvider = facebook
100
+ unsafeFacebookProvider = facebook
101
101
providers. append ( provider)
102
102
case let phone as PhoneAuthProviderAuthUIProtocol :
103
- phoneAuthProvider = phone
103
+ unsafePhoneAuthProvider = phone
104
104
providers. append ( provider)
105
105
default :
106
106
break
@@ -117,29 +117,29 @@ public final class AuthService {
117
117
)
118
118
}
119
119
120
- private var safeGoogleProvider : any GoogleProviderAuthUIProtocol {
120
+ private var googleProvider : any GoogleProviderAuthUIProtocol {
121
121
get throws {
122
- guard let provider = googleProvider else {
122
+ guard let provider = unsafeGoogleProvider else {
123
123
throw AuthServiceError
124
124
. notConfiguredProvider ( " `GoogleProviderSwift` has not been configured " )
125
125
}
126
126
return provider
127
127
}
128
128
}
129
129
130
- private var safeFacebookProvider : any FacebookProviderAuthUIProtocol {
130
+ private var facebookProvider : any FacebookProviderAuthUIProtocol {
131
131
get throws {
132
- guard let provider = facebookProvider else {
132
+ guard let provider = unsafeFacebookProvider else {
133
133
throw AuthServiceError
134
134
. notConfiguredProvider ( " `FacebookProviderAuthUI` has not been configured " )
135
135
}
136
136
return provider
137
137
}
138
138
}
139
139
140
- private var safePhoneAuthProvider : any PhoneAuthProviderAuthUIProtocol {
140
+ private var phoneAuthProvider : any PhoneAuthProviderAuthUIProtocol {
141
141
get throws {
142
- guard let provider = phoneAuthProvider else {
142
+ guard let provider = unsafePhoneAuthProvider else {
143
143
throw AuthServiceError
144
144
. notConfiguredProvider ( " `PhoneAuthProviderSwift` has not been configured " )
145
145
}
@@ -265,7 +265,7 @@ public extension AuthService {
265
265
let operation = EmailPasswordDeleteUserOperation ( passwordPrompt: passwordPrompt)
266
266
try await operation ( on: user)
267
267
} else if providerId == " facebook.com " {
268
- try await safeFacebookProvider . deleteUser ( user: user)
268
+ try await facebookProvider . deleteUser ( user: user)
269
269
}
270
270
}
271
271
@@ -428,7 +428,7 @@ public extension AuthService {
428
428
" 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. "
429
429
)
430
430
}
431
- let credential = try await safeGoogleProvider . signInWithGoogle ( clientID: clientID)
431
+ let credential = try await googleProvider . signInWithGoogle ( clientID: clientID)
432
432
433
433
try await signIn ( credentials: credential)
434
434
}
@@ -438,7 +438,7 @@ public extension AuthService {
438
438
439
439
public extension AuthService {
440
440
func signInWithFacebook( limitedLogin: Bool = true ) async throws {
441
- let credential = try await safeFacebookProvider
441
+ let credential = try await facebookProvider
442
442
. signInWithFacebook ( isLimitedLogin: limitedLogin)
443
443
try await signIn ( credentials: credential)
444
444
}
@@ -449,7 +449,7 @@ public extension AuthService {
449
449
public extension AuthService {
450
450
func verifyPhoneNumber( phoneNumber: String ) async throws -> String {
451
451
do {
452
- return try await safePhoneAuthProvider . verifyPhoneNumber ( phoneNumber: phoneNumber)
452
+ return try await phoneAuthProvider . verifyPhoneNumber ( phoneNumber: phoneNumber)
453
453
} catch {
454
454
errorMessage = string. localizedErrorMessage (
455
455
for: error
0 commit comments