diff --git a/FirebaseAuth/CHANGELOG.md b/FirebaseAuth/CHANGELOG.md index 9c6bc4e9c9c..4263cf06d7e 100644 --- a/FirebaseAuth/CHANGELOG.md +++ b/FirebaseAuth/CHANGELOG.md @@ -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) diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift index b8cca1f5fca..761f57cf5d1 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/OAuthProvider.swift @@ -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()) } @@ -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) @@ -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, @@ -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 { @@ -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, @@ -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 { diff --git a/FirebaseAuth/Tests/Unit/SwiftAPI.swift b/FirebaseAuth/Tests/Unit/SwiftAPI.swift index d24b8db59ad..dec351aff3e 100644 --- a/FirebaseAuth/Tests/Unit/SwiftAPI.swift +++ b/FirebaseAuth/Tests/Unit/SwiftAPI.swift @@ -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 }