Skip to content

Commit 2ba811a

Browse files
authored
[Auth] Remove 'ActionCodeSettings.dynamicLinkDomain' (#15036)
1 parent a0fd16d commit 2ba811a

File tree

7 files changed

+4
-50
lines changed

7 files changed

+4
-50
lines changed

FirebaseAuth/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Unreleased
2+
- [removed] **Breaking Change**: Removed
3+
`ActionCodeSettings.dynamicLinkDomain`.
4+
15
# 11.15.0
26
- [fixed] Fixed `Sendable` warnings introduced in the Xcode 26 beta. (#14996)
37

FirebaseAuth/Sources/Swift/ActionCode/ActionCodeSettings.swift

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,6 @@ import Foundation
6262
set { impl.androidInstallIfNotAvailable.withLock { $0 = newValue } }
6363
}
6464

65-
/// The Firebase Dynamic Link domain used for out of band code flow.
66-
#if !FIREBASE_CI
67-
@available(
68-
*,
69-
deprecated,
70-
message: "Firebase Dynamic Links is deprecated. Migrate to use Firebase Hosting link and use `linkDomain` to set a custom domain instead."
71-
)
72-
#endif // !FIREBASE_CI
73-
@objc open var dynamicLinkDomain: String? {
74-
get { impl.dynamicLinkDomain.value() }
75-
set { impl.dynamicLinkDomain.withLock { $0 = newValue } }
76-
}
77-
7865
/// The out of band custom domain for handling code in app.
7966
@objc public var linkDomain: String? {
8067
get { impl.linkDomain.value() }
@@ -130,15 +117,6 @@ private extension ActionCodeSettings {
130117

131118
let androidInstallIfNotAvailable = FIRAllocatedUnfairLock<Bool>(initialState: false)
132119

133-
#if !FIREBASE_CI
134-
@available(
135-
*,
136-
deprecated,
137-
message: "Firebase Dynamic Links is deprecated. Migrate to use Firebase Hosting link and use `linkDomain` to set a custom domain instead."
138-
)
139-
#endif // !FIREBASE_CI
140-
let dynamicLinkDomain = FIRAllocatedUnfairLock<String?>(initialState: nil)
141-
142120
let linkDomain = FIRAllocatedUnfairLock<String?>(initialState: nil)
143121

144122
init() {

FirebaseAuth/Sources/Swift/Backend/RPC/GetOOBConfirmationCodeRequest.swift

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ private let kAndroidMinimumVersionKey = "androidMinimumVersion"
7575
/// or not.
7676
private let kCanHandleCodeInAppKey = "canHandleCodeInApp"
7777

78-
/// The key for the "dynamic link domain" value in the request.
79-
private let kDynamicLinkDomainKey = "dynamicLinkDomain"
80-
8178
/// The key for the "link domain" value in the request.
8279
private let kLinkDomainKey = "linkDomain"
8380

@@ -105,12 +102,6 @@ private let kClientType = "clientType"
105102
/// The key for the "recaptchaVersion" value in the request.
106103
private let kRecaptchaVersion = "recaptchaVersion"
107104

108-
protocol SuppressWarning {
109-
var dynamicLinkDomain: String? { get set }
110-
}
111-
112-
extension ActionCodeSettings: SuppressWarning {}
113-
114105
@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *)
115106
class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
116107
typealias Response = GetOOBConfirmationCodeResponse
@@ -146,9 +137,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
146137
/// redirected from a Firebase owned web widget.
147138
let handleCodeInApp: Bool
148139

149-
/// The Firebase Dynamic Link domain used for out of band code flow.
150-
private let dynamicLinkDomain: String?
151-
152140
/// The Firebase Hosting domain used for out of band code flow.
153141
private(set) var linkDomain: String?
154142

@@ -183,12 +171,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
183171
androidMinimumVersion = actionCodeSettings?.androidMinimumVersion
184172
androidInstallApp = actionCodeSettings?.androidInstallIfNotAvailable ?? false
185173
handleCodeInApp = actionCodeSettings?.handleCodeInApp ?? false
186-
dynamicLinkDomain =
187-
if let actionCodeSettings {
188-
(actionCodeSettings as SuppressWarning).dynamicLinkDomain
189-
} else {
190-
nil
191-
}
192174
linkDomain = actionCodeSettings?.linkDomain
193175

194176
super.init(
@@ -289,9 +271,6 @@ class GetOOBConfirmationCodeRequest: IdentityToolkitRequest, AuthRPCRequest {
289271
if handleCodeInApp {
290272
body[kCanHandleCodeInAppKey] = true
291273
}
292-
if let dynamicLinkDomain {
293-
body[kDynamicLinkDomainKey] = dynamicLinkDomain
294-
}
295274
if let linkDomain {
296275
body[kLinkDomainKey] = linkDomain
297276
}

FirebaseAuth/Tests/Unit/GetOOBConfirmationCodeTests.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests {
3333
private let kAndroidInstallAppKey = "androidInstallApp"
3434
private let kAndroidMinimumVersionKey = "androidMinimumVersion"
3535
private let kCanHandleCodeInAppKey = "canHandleCodeInApp"
36-
private let kDynamicLinkDomainKey = "dynamicLinkDomain"
3736
private let kLinkDomainKey = "linkDomain"
3837
private let kExpectedAPIURL =
3938
"https://www.googleapis.com/identitytoolkit/v3/relyingparty/getOobConfirmationCode?key=APIKey"
@@ -66,7 +65,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests {
6665
XCTAssertEqual(decodedRequest[kAndroidMinimumVersionKey] as? String, kAndroidMinimumVersion)
6766
XCTAssertEqual(decodedRequest[kAndroidInstallAppKey] as? Bool, true)
6867
XCTAssertEqual(decodedRequest[kCanHandleCodeInAppKey] as? Bool, true)
69-
XCTAssertEqual(decodedRequest[kDynamicLinkDomainKey] as? String, kDynamicLinkDomain)
7068
XCTAssertEqual(decodedRequest[kLinkDomainKey] as? String, kLinkDomain)
7169
}
7270
}
@@ -111,7 +109,6 @@ class GetOOBConfirmationCodeTests: RPCBaseTests {
111109
XCTAssertEqual(decodedRequest[kAndroidMinimumVersionKey] as? String, kAndroidMinimumVersion)
112110
XCTAssertEqual(decodedRequest[kAndroidInstallAppKey] as? Bool, true)
113111
XCTAssertEqual(decodedRequest[kCanHandleCodeInAppKey] as? Bool, true)
114-
XCTAssertEqual(decodedRequest[kDynamicLinkDomainKey] as? String, kDynamicLinkDomain)
115112
XCTAssertEqual(decodedRequest[kLinkDomainKey] as? String, kLinkDomain)
116113
XCTAssertEqual(decodedRequest[kCaptchaResponseKey] as? String, kTestCaptchaResponse)
117114
XCTAssertEqual(decodedRequest[kClientTypeKey] as? String, kTestClientType)

FirebaseAuth/Tests/Unit/ObjCAPITests.m

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ - (void)FIRActionCodeSettings_h {
6464
NSString *s = [codeSettings iOSBundleID];
6565
s = [codeSettings androidPackageName];
6666
s = [codeSettings androidMinimumVersion];
67-
s = [codeSettings dynamicLinkDomain];
6867
s = [codeSettings linkDomain];
6968
}
7069

FirebaseAuth/Tests/Unit/RPCBaseTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ class RPCBaseTests: XCTestCase {
3737
let kIosBundleID = "testBundleID"
3838
let kAndroidPackageName = "androidpackagename"
3939
let kAndroidMinimumVersion = "3.0"
40-
let kDynamicLinkDomain = "test.page.link"
4140
let kLinkDomain = "link.firebaseapp.com"
4241
let kTestPhotoURL = "https://host.domain/image"
4342
let kCreationDateTimeIntervalInSeconds = 1_505_858_500.0
@@ -304,7 +303,6 @@ class RPCBaseTests: XCTestCase {
304303
minimumVersion: kAndroidMinimumVersion)
305304
settings.handleCodeInApp = true
306305
settings.url = URL(string: kContinueURL)
307-
settings.dynamicLinkDomain = kDynamicLinkDomain
308306
settings.linkDomain = kLinkDomain
309307
return settings
310308
}

FirebaseAuth/Tests/Unit/SwiftAPI.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class AuthAPI_hOnlyTests: XCTestCase {
4141
let _: String = codeSettings.iOSBundleID,
4242
let _: String = codeSettings.androidPackageName,
4343
let _: String = codeSettings.androidMinimumVersion,
44-
let _: String = codeSettings.dynamicLinkDomain,
4544
let _: String = codeSettings.linkDomain {}
4645
codeSettings.linkDomain = nil
4746
codeSettings.linkDomain = ""

0 commit comments

Comments
 (0)