Skip to content

Commit 118fd9e

Browse files
tapashmajumdertapashmajumder
authored
Merge pull request #473 from Iterable/tapash/mob-2865-remove-fp
[MOB-2865] - Remove fingerprinting.
2 parents 19fb463 + 163d131 commit 118fd9e

File tree

4 files changed

+6
-155
lines changed

4 files changed

+6
-155
lines changed

‎swift-sdk.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
55CC257B2462064F00A77FD5 /* InAppPresenterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55CC257A2462064F00A77FD5 /* InAppPresenterTests.swift */; };
3333
55D54656239AE5750093ED1E /* LoggingInternal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55D54655239AE5750093ED1E /* LoggingInternal.swift */; };
3434
55E02D39253F8D86009DB8BC /* WebViewProtocolTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E02D38253F8D86009DB8BC /* WebViewProtocolTests.swift */; };
35-
55E6F460238E066400808BCE /* DeferredDeepLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E6F45D238E066400808BCE /* DeferredDeepLinkTests.swift */; };
3635
55E6F462238E066400808BCE /* DeepLinkTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55E6F45E238E066400808BCE /* DeepLinkTests.swift */; };
3736
AC02480822791E2100495FB9 /* IterableInboxNavigationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC02480722791E2100495FB9 /* IterableInboxNavigationViewController.swift */; };
3837
AC02CAA6234E50B5006617E0 /* RegistrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AC02CAA5234E50B5006617E0 /* RegistrationTests.swift */; };
@@ -380,7 +379,6 @@
380379
55CC257A2462064F00A77FD5 /* InAppPresenterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InAppPresenterTests.swift; sourceTree = "<group>"; };
381380
55D54655239AE5750093ED1E /* LoggingInternal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingInternal.swift; sourceTree = "<group>"; };
382381
55E02D38253F8D86009DB8BC /* WebViewProtocolTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebViewProtocolTests.swift; sourceTree = "<group>"; };
383-
55E6F45D238E066400808BCE /* DeferredDeepLinkTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeferredDeepLinkTests.swift; sourceTree = "<group>"; };
384382
55E6F45E238E066400808BCE /* DeepLinkTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeepLinkTests.swift; sourceTree = "<group>"; };
385383
AC02480722791E2100495FB9 /* IterableInboxNavigationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableInboxNavigationViewController.swift; sourceTree = "<group>"; };
386384
AC02CAA5234E50B5006617E0 /* RegistrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegistrationTests.swift; sourceTree = "<group>"; };
@@ -962,7 +960,6 @@
962960
5531CDAD22A9C992000D05E2 /* ClassExtensionsTests.swift */,
963961
55B37FC0229620D20042F13A /* CommerceItemTests.swift */,
964962
55E6F45E238E066400808BCE /* DeepLinkTests.swift */,
965-
55E6F45D238E066400808BCE /* DeferredDeepLinkTests.swift */,
966963
551E5C0F234D485A005FEE9E /* DeprecatedFunctionsTests.swift */,
967964
AC750A49234CD67900561902 /* InAppHelperTests.swift */,
968965
55AEA95825F05B7D00B38CED /* InAppMessageProcessorTests.swift */,
@@ -1767,7 +1764,6 @@
17671764
ACC362B824D17005002C67BA /* IterableRequestTests.swift in Sources */,
17681765
AC2C668720D3435700D46CC9 /* IterableActionRunnerTests.swift in Sources */,
17691766
00CB31B621096129004ACDEC /* TestUtils.swift in Sources */,
1770-
55E6F460238E066400808BCE /* DeferredDeepLinkTests.swift in Sources */,
17711767
AC89661E2124FBCE0051A6CD /* IterableAutoRegistrationTests.swift in Sources */,
17721768
ACA8D1A921965B7D001B1332 /* InAppTests.swift in Sources */,
17731769
00B6FACC210E8484007535CF /* APNSTypeCheckerTests.swift in Sources */,

‎swift-sdk/Internal/IterableAPIInternal.swift

-26
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,6 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
534534

535535
updateSDKVersion()
536536

537-
checkForDeferredDeepLink()
538-
539537
// get email and userId from UserDefaults if present
540538
retrieveIdentifierData()
541539

@@ -594,30 +592,6 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
594592
}
595593
}
596594

597-
private func checkForDeferredDeepLink() {
598-
guard config.checkForDeferredDeeplink else {
599-
return
600-
}
601-
guard localStorage.ddlChecked == false else {
602-
return
603-
}
604-
605-
guard let request = IterableRequestUtil.createPostRequest(forApiEndPoint: linksEndPoint,
606-
path: Const.Path.ddlMatch,
607-
headers: [JsonKey.Header.apiKey: apiKey],
608-
args: nil,
609-
body: DeviceInfo.createDeviceInfo()) else {
610-
ITBError("Could not create request")
611-
return
612-
}
613-
614-
NetworkHelper.sendRequest(request, usingSession: networkSession).onSuccess { json in
615-
self.handleDDL(json: json)
616-
}.onError { sendError in
617-
ITBError(sendError.reason)
618-
}
619-
}
620-
621595
private func handleDDL(json: [AnyHashable: Any]) {
622596
if let serverResponse = try? JSONDecoder().decode(ServerResponse.self, from: JSONSerialization.data(withJSONObject: json, options: [])),
623597
serverResponse.isMatch,

‎tests/swift-sdk-swift-tests/DeferredDeepLinkTests.swift

-110
This file was deleted.

‎tests/swift-sdk-swift-tests/IterableAPITests.swift

+6-15
Original file line numberDiff line numberDiff line change
@@ -35,45 +35,37 @@ class IterableAPITests: XCTestCase {
3535
}
3636

3737
func testInitializeCheckEndpoint() {
38-
let expectation1 = XCTestExpectation(description: "links endpoint called")
39-
let expectation2 = XCTestExpectation(description: "api endpoint called")
38+
let expectation1 = XCTestExpectation(description: "api endpoint called")
4039

4140
let mockNetworkSession = MockNetworkSession()
4241
mockNetworkSession.requestCallback = { urlRequest in
4342
if let url = urlRequest.url {
44-
if url.absoluteString.starts(with: Endpoint.links) {
43+
if url.absoluteString.starts(with: Endpoint.api) {
4544
expectation1.fulfill()
46-
} else if url.absoluteString.starts(with: Endpoint.api) {
47-
expectation2.fulfill()
4845
}
4946
}
5047
}
5148

5249
let config = IterableConfig()
53-
config.checkForDeferredDeeplink = true
5450
let internalAPI = IterableAPIInternal.initializeForTesting(apiKey: IterableAPITests.apiKey, config: config, networkSession: mockNetworkSession)
5551
internalAPI.email = IterableAPITests.email
5652
internalAPI.track("Some Event")
5753

5854
XCTAssertEqual(internalAPI.apiKey, IterableAPITests.apiKey)
5955

60-
wait(for: [expectation1, expectation2], timeout: testExpectationTimeout)
56+
wait(for: [expectation1], timeout: testExpectationTimeout)
6157
}
6258

6359
func testInitializeWithNewEndpoint() {
64-
let expectation1 = XCTestExpectation(description: "new links endpoint called")
65-
let expectation2 = XCTestExpectation(description: "new api endpoint called")
60+
let expectation1 = XCTestExpectation(description: "new api endpoint called")
6661

6762
let newApiEndpoint = "https://test.iterable.com/api/"
68-
let newLinksEndpoint = "https://links.test.iterable.com/"
6963

7064
let mockNetworkSession = MockNetworkSession()
7165
mockNetworkSession.requestCallback = { urlRequest in
7266
if let url = urlRequest.url {
73-
if url.absoluteString.starts(with: newLinksEndpoint) {
67+
if url.absoluteString.starts(with: newApiEndpoint) {
7468
expectation1.fulfill()
75-
} else if url.absoluteString.starts(with: newApiEndpoint) {
76-
expectation2.fulfill()
7769
}
7870
}
7971
}
@@ -83,14 +75,13 @@ class IterableAPITests: XCTestCase {
8375
let internalAPI = IterableAPIInternal.initializeForTesting(apiKey: IterableAPITests.apiKey,
8476
config: config,
8577
apiEndPointOverride: newApiEndpoint,
86-
linksEndPointOverride: newLinksEndpoint,
8778
networkSession: mockNetworkSession)
8879
internalAPI.email = IterableAPITests.email
8980
internalAPI.track("Some Event")
9081

9182
XCTAssertEqual(internalAPI.apiKey, IterableAPITests.apiKey)
9283

93-
wait(for: [expectation1, expectation2], timeout: testExpectationTimeout)
84+
wait(for: [expectation1], timeout: testExpectationTimeout)
9485
}
9586

9687
func testTrackEventWithNoEmailOrUser() {

0 commit comments

Comments
 (0)