Skip to content

Commit e6ae16c

Browse files
authored
[Auth] Remove deprecated string-based provider ID APIs (#15037)
1 parent fcf272d commit e6ae16c

File tree

3 files changed

+9
-52
lines changed

3 files changed

+9
-52
lines changed

FirebaseAuth/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Unreleased
22
- [removed] **Breaking Change**: Removed
33
`ActionCodeSettings.dynamicLinkDomain`.
4+
- [removed] **Breaking Change**: Remove deprecated Swift APIs using
5+
`String`-typed `productID`s that were in favor of API that leverages the
6+
`AuthProviderID` enum. Note, this only affects Swift clients.
47

58
# 11.15.0
69
- [fixed] Fixed `Sendable` warnings introduced in the Xcode 26 beta. (#14996)

FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift

Lines changed: 6 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,7 @@ import Foundation
3434
/// - providerID: The provider ID of the IDP for which this auth provider instance will be
3535
/// configured.
3636
/// - Returns: An instance of OAuthProvider corresponding to the specified provider ID.
37-
#if !FIREBASE_CI
38-
@available(
39-
swift,
40-
deprecated: 0.01,
41-
message: "Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead."
42-
)
43-
#endif // !FIREBASE_CI
37+
@available(swift 1000.0) // Objective-C only API
4438
@objc(providerWithProviderID:) open class func provider(providerID: String) -> OAuthProvider {
4539
return OAuthProvider(providerID: providerID, auth: Auth.auth())
4640
}
@@ -60,13 +54,7 @@ import Foundation
6054
/// configured.
6155
/// - auth: The auth instance to be associated with the OAuthProvider instance.
6256
/// - Returns: An instance of OAuthProvider corresponding to the specified provider ID.
63-
#if !FIREBASE_CI
64-
@available(
65-
swift,
66-
deprecated: 0.01,
67-
message: "Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead."
68-
)
69-
#endif // !FIREBASE_CI
57+
@available(swift 1000.0) // Objective-C only API
7058
@objc(providerWithProviderID:auth:) open class func provider(providerID: String,
7159
auth: Auth) -> OAuthProvider {
7260
return OAuthProvider(providerID: providerID, auth: auth)
@@ -136,13 +124,7 @@ import Foundation
136124
/// - Parameter accessToken: The access token associated with the Auth credential be created, if
137125
/// available.
138126
/// - Returns: An AuthCredential for the specified provider ID, ID token and access token.
139-
#if !FIREBASE_CI
140-
@available(
141-
swift,
142-
deprecated: 0.01,
143-
message: "Use `credential(providerID: AuthProviderID, idToken: String, accessToken: String? = nil) -> OAuthCredential` instead."
144-
)
145-
#endif // !FIREBASE_CI
127+
@available(swift 1000.0) // Objective-C only API
146128
@objc(credentialWithProviderID:IDToken:accessToken:)
147129
public static func credential(withProviderID providerID: String,
148130
idToken: String,
@@ -173,13 +155,7 @@ import Foundation
173155
/// - Parameter accessToken: The access token associated with the Auth credential be created, if
174156
/// available.
175157
/// - Returns: An AuthCredential for the specified provider ID, ID token and access token.
176-
#if !FIREBASE_CI
177-
@available(
178-
swift,
179-
deprecated: 0.01,
180-
message: "Use `credential(providerID: AuthProviderID, accessToken: String) -> OAuthCredential` instead."
181-
)
182-
#endif // !FIREBASE_CI
158+
@available(swift 1000.0) // Objective-C only API
183159
@objc(credentialWithProviderID:accessToken:)
184160
public static func credential(withProviderID providerID: String,
185161
accessToken: String) -> OAuthCredential {
@@ -203,13 +179,7 @@ import Foundation
203179
/// - Parameter rawNonce: The raw nonce associated with the Auth credential being created.
204180
/// - Parameter accessToken: The access token associated with the Auth credential be created.
205181
/// - Returns: An AuthCredential for the specified provider ID, ID token and access token.
206-
#if !FIREBASE_CI
207-
@available(
208-
swift,
209-
deprecated: 0.01,
210-
message: "Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead."
211-
)
212-
#endif // !FIREBASE_CI
182+
@available(swift 1000.0) // Objective-C only API
213183
@objc(credentialWithProviderID:IDToken:rawNonce:accessToken:)
214184
public static func credential(withProviderID providerID: String, idToken: String,
215185
rawNonce: String,
@@ -228,13 +198,7 @@ import Foundation
228198
/// - Parameter idToken: The IDToken associated with the Auth credential being created.
229199
/// - Parameter rawNonce: The raw nonce associated with the Auth credential being created.
230200
/// - Returns: An AuthCredential.
231-
#if !FIREBASE_CI
232-
@available(
233-
swift,
234-
deprecated: 0.01,
235-
message: "Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead."
236-
)
237-
#endif // !FIREBASE_CI
201+
@available(swift 1000.0) // Objective-C only API
238202
@objc(credentialWithProviderID:IDToken:rawNonce:)
239203
public static func credential(withProviderID providerID: String, idToken: String,
240204
rawNonce: String) -> OAuthCredential {

FirebaseAuth/Tests/Unit/SwiftAPI.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -474,34 +474,24 @@ class AuthAPI_hOnlyTests: XCTestCase {
474474
func FIROAuthProvider_h() {
475475
let _: (String, Auth) -> OAuthProvider = OAuthProvider.init(providerID:auth:)
476476
let _: (AuthProviderID, Auth) -> OAuthProvider = OAuthProvider.init(providerID:auth:)
477-
let _: (String) -> OAuthProvider = OAuthProvider.provider(providerID:)
478-
let _: (String, Auth) -> OAuthProvider = OAuthProvider.provider(providerID:auth:)
479477
let _: (AuthProviderID) -> OAuthProvider = OAuthProvider.provider(providerID:)
480478
let _: (AuthProviderID, Auth) -> OAuthProvider = OAuthProvider.provider(providerID:auth:)
481479
// `auth` defaults to `nil`
482480
let provider = OAuthProvider(providerID: "id")
483481
let _: String = provider.providerID
484482
#if os(iOS)
485-
let _: (String, String, String?) -> OAuthCredential =
486-
OAuthProvider.credential(withProviderID:idToken:accessToken:)
487483
let _: (AuthProviderID, String, String?) -> OAuthCredential =
488484
OAuthProvider.credential(providerID:idToken:accessToken:)
489485
// `accessToken` defaults to `nil`
490486
let _: OAuthCredential =
491487
OAuthProvider.credential(providerID: .apple, idToken: "")
492-
let _: (String, String) -> OAuthCredential =
493-
OAuthProvider.credential(withProviderID:accessToken:)
494488
let _: (AuthProviderID, String) -> OAuthCredential = OAuthProvider
495489
.credential(providerID:accessToken:)
496-
let _: (String, String, String, String) -> OAuthCredential =
497-
OAuthProvider.credential(withProviderID:idToken:rawNonce:accessToken:)
498490
let _: (AuthProviderID, String, String, String?) -> OAuthCredential =
499491
OAuthProvider.credential(providerID:idToken:rawNonce:accessToken:)
500492
// `accessToken` defaults to `nil`
501493
let _: OAuthCredential =
502494
OAuthProvider.credential(providerID: .apple, idToken: "", rawNonce: "")
503-
let _: (String, String, String) -> OAuthCredential =
504-
OAuthProvider.credential(withProviderID:idToken:rawNonce:)
505495

506496
provider.getCredentialWith(provider as? AuthUIDelegate) { credential, error in
507497
}

0 commit comments

Comments
 (0)