Skip to content

[Auth] Remove deprecated string-based provider ID APIs #15037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 24, 2025
Merged

[Auth] Remove deprecated string-based provider ID APIs #15037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d8cda0
[Auth] Remove deprecated string-based provider ID APIs
ncooke3 Jun 24, 2025
7195fc7
ci
ncooke3 Jun 24, 2025
38c1a62
Merge branch 'main' into nc/provider-deprecations
ncooke3 Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions FirebaseAuth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Unreleased
- [removed] **Breaking Change**: Removed
`ActionCodeSettings.dynamicLinkDomain`.
- [removed] **Breaking Change**: Remove deprecated Swift APIs using
`String`-typed `productID`s that were in favor of API that leverages the
`AuthProviderID` enum. Note, this only affects Swift clients.

# 11.15.0
- [fixed] Fixed `Sendable` warnings introduced in the Xcode 26 beta. (#14996)
Expand Down
48 changes: 6 additions & 42 deletions FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,7 @@ import Foundation
/// - providerID: The provider ID of the IDP for which this auth provider instance will be
/// configured.
/// - Returns: An instance of OAuthProvider corresponding to the specified provider ID.
#if !FIREBASE_CI
@available(
swift,
deprecated: 0.01,
message: "Use `provider(providerID: AuthProviderID) -> OAuthProvider` instead."
)
#endif // !FIREBASE_CI
@available(swift 1000.0) // Objective-C only API
@objc(providerWithProviderID:) open class func provider(providerID: String) -> OAuthProvider {
return OAuthProvider(providerID: providerID, auth: Auth.auth())
}
Expand All @@ -60,13 +54,7 @@ import Foundation
/// configured.
/// - auth: The auth instance to be associated with the OAuthProvider instance.
/// - Returns: An instance of OAuthProvider corresponding to the specified provider ID.
#if !FIREBASE_CI
@available(
swift,
deprecated: 0.01,
message: "Use `provider(providerID: AuthProviderID, auth: Auth) -> OAuthProvider` instead."
)
#endif // !FIREBASE_CI
@available(swift 1000.0) // Objective-C only API
@objc(providerWithProviderID:auth:) open class func provider(providerID: String,
auth: Auth) -> OAuthProvider {
return OAuthProvider(providerID: providerID, auth: auth)
Expand Down Expand Up @@ -136,13 +124,7 @@ import Foundation
/// - Parameter accessToken: The access token associated with the Auth credential be created, if
/// available.
/// - Returns: An AuthCredential for the specified provider ID, ID token and access token.
#if !FIREBASE_CI
@available(
swift,
deprecated: 0.01,
message: "Use `credential(providerID: AuthProviderID, idToken: String, accessToken: String? = nil) -> OAuthCredential` instead."
)
#endif // !FIREBASE_CI
@available(swift 1000.0) // Objective-C only API
@objc(credentialWithProviderID:IDToken:accessToken:)
public static func credential(withProviderID providerID: String,
idToken: String,
Expand Down Expand Up @@ -173,13 +155,7 @@ import Foundation
/// - Parameter accessToken: The access token associated with the Auth credential be created, if
/// available.
/// - Returns: An AuthCredential for the specified provider ID, ID token and access token.
#if !FIREBASE_CI
@available(
swift,
deprecated: 0.01,
message: "Use `credential(providerID: AuthProviderID, accessToken: String) -> OAuthCredential` instead."
)
#endif // !FIREBASE_CI
@available(swift 1000.0) // Objective-C only API
@objc(credentialWithProviderID:accessToken:)
public static func credential(withProviderID providerID: String,
accessToken: String) -> OAuthCredential {
Expand All @@ -203,13 +179,7 @@ import Foundation
/// - Parameter rawNonce: The raw nonce associated with the Auth credential being created.
/// - Parameter accessToken: The access token associated with the Auth credential be created.
/// - Returns: An AuthCredential for the specified provider ID, ID token and access token.
#if !FIREBASE_CI
@available(
swift,
deprecated: 0.01,
message: "Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead."
)
#endif // !FIREBASE_CI
@available(swift 1000.0) // Objective-C only API
@objc(credentialWithProviderID:IDToken:rawNonce:accessToken:)
public static func credential(withProviderID providerID: String, idToken: String,
rawNonce: String,
Expand All @@ -228,13 +198,7 @@ import Foundation
/// - Parameter idToken: The IDToken associated with the Auth credential being created.
/// - Parameter rawNonce: The raw nonce associated with the Auth credential being created.
/// - Returns: An AuthCredential.
#if !FIREBASE_CI
@available(
swift,
deprecated: 0.01,
message: "Use `credential(providerID: AuthProviderID, idToken: String, rawNonce: String, accessToken: String? = nil) -> OAuthCredential` instead."
)
#endif // !FIREBASE_CI
@available(swift 1000.0) // Objective-C only API
@objc(credentialWithProviderID:IDToken:rawNonce:)
public static func credential(withProviderID providerID: String, idToken: String,
rawNonce: String) -> OAuthCredential {
Expand Down
10 changes: 0 additions & 10 deletions FirebaseAuth/Tests/Unit/SwiftAPI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,34 +474,24 @@ class AuthAPI_hOnlyTests: XCTestCase {
func FIROAuthProvider_h() {
let _: (String, Auth) -> OAuthProvider = OAuthProvider.init(providerID:auth:)
let _: (AuthProviderID, Auth) -> OAuthProvider = OAuthProvider.init(providerID:auth:)
let _: (String) -> OAuthProvider = OAuthProvider.provider(providerID:)
let _: (String, Auth) -> OAuthProvider = OAuthProvider.provider(providerID:auth:)
let _: (AuthProviderID) -> OAuthProvider = OAuthProvider.provider(providerID:)
let _: (AuthProviderID, Auth) -> OAuthProvider = OAuthProvider.provider(providerID:auth:)
// `auth` defaults to `nil`
let provider = OAuthProvider(providerID: "id")
let _: String = provider.providerID
#if os(iOS)
let _: (String, String, String?) -> OAuthCredential =
OAuthProvider.credential(withProviderID:idToken:accessToken:)
let _: (AuthProviderID, String, String?) -> OAuthCredential =
OAuthProvider.credential(providerID:idToken:accessToken:)
// `accessToken` defaults to `nil`
let _: OAuthCredential =
OAuthProvider.credential(providerID: .apple, idToken: "")
let _: (String, String) -> OAuthCredential =
OAuthProvider.credential(withProviderID:accessToken:)
let _: (AuthProviderID, String) -> OAuthCredential = OAuthProvider
.credential(providerID:accessToken:)
let _: (String, String, String, String) -> OAuthCredential =
OAuthProvider.credential(withProviderID:idToken:rawNonce:accessToken:)
let _: (AuthProviderID, String, String, String?) -> OAuthCredential =
OAuthProvider.credential(providerID:idToken:rawNonce:accessToken:)
// `accessToken` defaults to `nil`
let _: OAuthCredential =
OAuthProvider.credential(providerID: .apple, idToken: "", rawNonce: "")
let _: (String, String, String) -> OAuthCredential =
OAuthProvider.credential(withProviderID:idToken:rawNonce:)

provider.getCredentialWith(provider as? AuthUIDelegate) { credential, error in
}
Expand Down
Loading