diff --git a/FirebaseAuth/CHANGELOG.md b/FirebaseAuth/CHANGELOG.md index b9278b58399..9c6bc4e9c9c 100644 --- a/FirebaseAuth/CHANGELOG.md +++ b/FirebaseAuth/CHANGELOG.md @@ -1,3 +1,7 @@ +# Unreleased +- [removed] **Breaking Change**: Removed + `ActionCodeSettings.dynamicLinkDomain`. + # 11.15.0 - [fixed] Fixed `Sendable` warnings introduced in the Xcode 26 beta. (#14996) diff --git a/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift b/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift index 2f98f08b332..17bd7a30433 100644 --- a/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift +++ b/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift @@ -62,19 +62,6 @@ import Foundation set { impl.androidInstallIfNotAvailable.withLock { $0 = newValue } } } - /// The Firebase Dynamic Link domain used for out of band code flow. - #if !FIREBASE_CI - @available( - *, - deprecated, - message: "Firebase Dynamic Links is deprecated. Migrate to use Firebase Hosting link and use `linkDomain` to set a custom domain instead." - ) - #endif // !FIREBASE_CI - @objc open var dynamicLinkDomain: String? { - get { impl.dynamicLinkDomain.value() } - set { impl.dynamicLinkDomain.withLock { $0 = newValue } } - } - /// The out of band custom domain for handling code in app. @objc public var linkDomain: String? { get { impl.linkDomain.value() } @@ -130,15 +117,6 @@ private extension ActionCodeSettings { let androidInstallIfNotAvailable = FIRAllocatedUnfairLock(initialState: false) - #if !FIREBASE_CI - @available( - *, - deprecated, - message: "Firebase Dynamic Links is deprecated. Migrate to use Firebase Hosting link and use `linkDomain` to set a custom domain instead." - ) - #endif // !FIREBASE_CI - let dynamicLinkDomain = FIRAllocatedUnfairLock(initialState: nil) - let linkDomain = FIRAllocatedUnfairLock(initialState: nil) init() { diff --git a/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift b/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift index 3dd4a07b59b..dd3ac4fc465 100644 --- a/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift +++ b/FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift @@ -75,9 +75,6 @@ private let kAndroidMinimumVersionKey = "androidMinimumVersion" /// or not. private let kCanHandleCodeInAppKey = "canHandleCodeInApp" -/// The key for the "dynamic link domain" value in the request. -private let kDynamicLinkDomainKey = "dynamicLinkDomain" - /// The key for the "link domain" value in the request. private let kLinkDomainKey = "linkDomain" @@ -105,12 +102,6 @@ private let kClientType = "clientType" /// The key for the "recaptchaVersion" value in the request. private let kRecaptchaVersion = "recaptchaVersion" -protocol SuppressWarning { - var dynamicLinkDomain: String? { get set } -} - -extension ActionCodeSettings: SuppressWarning {} - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest { typealias Response = GetOOBConfirmationCodeResponse @@ -146,9 +137,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest { /// redirected from a Firebase owned web widget. let handleCodeInApp: Bool - /// The Firebase Dynamic Link domain used for out of band code flow. - private let dynamicLinkDomain: String? - /// The Firebase Hosting domain used for out of band code flow. private(set) var linkDomain: String? @@ -183,12 +171,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest { androidMinimumVersion = actionCodeSettings?.androidMinimumVersion androidInstallApp = actionCodeSettings?.androidInstallIfNotAvailable ?? false handleCodeInApp = actionCodeSettings?.handleCodeInApp ?? false - dynamicLinkDomain = - if let actionCodeSettings { - (actionCodeSettings as SuppressWarning).dynamicLinkDomain - } else { - nil - } linkDomain = actionCodeSettings?.linkDomain super.init( @@ -289,9 +271,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest { if handleCodeInApp { body[kCanHandleCodeInAppKey] = true } - if let dynamicLinkDomain { - body[kDynamicLinkDomainKey] = dynamicLinkDomain - } if let linkDomain { body[kLinkDomainKey] = linkDomain } diff --git a/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift b/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift index 5750ea52f32..362d3fef951 100644 --- a/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift +++ b/FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift @@ -33,7 +33,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests { private let kAndroidInstallAppKey = "androidInstallApp" private let kAndroidMinimumVersionKey = "androidMinimumVersion" private let kCanHandleCodeInAppKey = "canHandleCodeInApp" - private let kDynamicLinkDomainKey = "dynamicLinkDomain" private let kLinkDomainKey = "linkDomain" private let kExpectedAPIURL = "https://www.googleapis.com/identitytoolkit/v3/relyingparty/getOobConfirmationCode?key=APIKey" @@ -66,7 +65,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests { XCTAssertEqual(decodedRequest[kAndroidMinimumVersionKey] as? String, kAndroidMinimumVersion) XCTAssertEqual(decodedRequest[kAndroidInstallAppKey] as? Bool, true) XCTAssertEqual(decodedRequest[kCanHandleCodeInAppKey] as? Bool, true) - XCTAssertEqual(decodedRequest[kDynamicLinkDomainKey] as? String, kDynamicLinkDomain) XCTAssertEqual(decodedRequest[kLinkDomainKey] as? String, kLinkDomain) } } @@ -111,7 +109,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests { XCTAssertEqual(decodedRequest[kAndroidMinimumVersionKey] as? String, kAndroidMinimumVersion) XCTAssertEqual(decodedRequest[kAndroidInstallAppKey] as? Bool, true) XCTAssertEqual(decodedRequest[kCanHandleCodeInAppKey] as? Bool, true) - XCTAssertEqual(decodedRequest[kDynamicLinkDomainKey] as? String, kDynamicLinkDomain) XCTAssertEqual(decodedRequest[kLinkDomainKey] as? String, kLinkDomain) XCTAssertEqual(decodedRequest[kCaptchaResponseKey] as? String, kTestCaptchaResponse) XCTAssertEqual(decodedRequest[kClientTypeKey] as? String, kTestClientType) diff --git a/FirebaseAuth/Tests/Unit/ObjCAPITests.m b/FirebaseAuth/Tests/Unit/ObjCAPITests.m index 2cb50ab2766..ed664c45e09 100644 --- a/FirebaseAuth/Tests/Unit/ObjCAPITests.m +++ b/FirebaseAuth/Tests/Unit/ObjCAPITests.m @@ -64,7 +64,6 @@ - (void)FIRActionCodeSettings_h { NSString *s = [codeSettings iOSBundleID]; s = [codeSettings androidPackageName]; s = [codeSettings androidMinimumVersion]; - s = [codeSettings dynamicLinkDomain]; s = [codeSettings linkDomain]; } diff --git a/FirebaseAuth/Tests/Unit/RPCBaseTests.swift b/FirebaseAuth/Tests/Unit/RPCBaseTests.swift index 2e619030e49..2d70b0276ef 100644 --- a/FirebaseAuth/Tests/Unit/RPCBaseTests.swift +++ b/FirebaseAuth/Tests/Unit/RPCBaseTests.swift @@ -37,7 +37,6 @@ class RPCBaseTests: XCTestCase { let kIosBundleID = "testBundleID" let kAndroidPackageName = "androidpackagename" let kAndroidMinimumVersion = "3.0" - let kDynamicLinkDomain = "test.page.link" let kLinkDomain = "link.firebaseapp.com" let kTestPhotoURL = "https://host.domain/image" let kCreationDateTimeIntervalInSeconds = 1_505_858_500.0 @@ -304,7 +303,6 @@ class RPCBaseTests: XCTestCase { minimumVersion: kAndroidMinimumVersion) settings.handleCodeInApp = true settings.url = URL(string: kContinueURL) - settings.dynamicLinkDomain = kDynamicLinkDomain settings.linkDomain = kLinkDomain return settings } diff --git a/FirebaseAuth/Tests/Unit/SwiftAPI.swift b/FirebaseAuth/Tests/Unit/SwiftAPI.swift index f61db229730..d24b8db59ad 100644 --- a/FirebaseAuth/Tests/Unit/SwiftAPI.swift +++ b/FirebaseAuth/Tests/Unit/SwiftAPI.swift @@ -41,7 +41,6 @@ class AuthAPI_hOnlyTests: XCTestCase { let _: String = codeSettings.iOSBundleID, let _: String = codeSettings.androidPackageName, let _: String = codeSettings.androidMinimumVersion, - let _: String = codeSettings.dynamicLinkDomain, let _: String = codeSettings.linkDomain {} codeSettings.linkDomain = nil codeSettings.linkDomain = ""