Skip to content

Commit 749dd9f

Browse files
joaodordiojoaodordio
committed
⏪ Revert MOB-11490 commit
# Conflicts: # swift-sdk.xcodeproj/project.pbxproj
1 parent f142c27 commit 749dd9f

File tree

4 files changed

+29
-481
lines changed

4 files changed

+29
-481
lines changed

‎swift-sdk.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,20 @@
1212
00B6FAD1210E8D90007535CF /* dev-1.mobileprovision in Resources */ = {isa = PBXBuildFile; fileRef = 00B6FAD0210E8D90007535CF /* dev-1.mobileprovision */; };
1313
00CB31B621096129004ACDEC /* TestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00CB31B4210960C4004ACDEC /* TestUtils.swift */; };
1414
092D01942D3038F600E3066A /* NotificationObserverTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 092D01932D3038F600E3066A /* NotificationObserverTests.swift */; };
15-
09876F3D2DF1D0290051F047 /* RedirectNetworkSessionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09876F3C2DF1D0290051F047 /* RedirectNetworkSessionTests.swift */; };
15+
09CAA47B2D4B9AD80057FB72 /* IterableApiCriteriaFetchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CAA47A2D4B9AD80057FB72 /* IterableApiCriteriaFetchTests.swift */; };
16+
09E8F2F92E29008200E92ABB /* ConsentTrackingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09E8F2F82E29008200E92ABB /* ConsentTrackingTests.swift */; };
17+
1802C00F2CA2C99E009DEA2B /* CombinationComplexCriteria.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1802C00E2CA2C99E009DEA2B /* CombinationComplexCriteria.swift */; };
18+
181063DB2C9841460078E0ED /* CustomEventUserUpdateTestCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181063DA2C9841460078E0ED /* CustomEventUserUpdateTestCaseTests.swift */; };
19+
181063DD2C994FA40078E0ED /* ValidateCustomEventUserUpdateAPITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181063DC2C994FA40078E0ED /* ValidateCustomEventUserUpdateAPITest.swift */; };
20+
181063DF2C9D51000078E0ED /* ValidateStoredEventCheckUnknownToKnownUserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 181063DE2C9D51000078E0ED /* ValidateStoredEventCheckUnknownToKnownUserTest.swift */; };
21+
182A2A152C661C9A002FF058 /* DataTypeComparatorSearchQueryCriteria.swift in Sources */ = {isa = PBXBuildFile; fileRef = 182A2A142C661C9A002FF058 /* DataTypeComparatorSearchQueryCriteria.swift */; };
22+
1881A21B2C7602F80020C64D /* ComparatorDataTypeWithArrayInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1881A21A2C7602F80020C64D /* ComparatorDataTypeWithArrayInput.swift */; };
23+
18A3520A2C7DC51C007FED53 /* NestedFieldSupportForArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A352092C7DC51C007FED53 /* NestedFieldSupportForArrayData.swift */; };
24+
18A3520C2C85BAF0007FED53 /* IsOneOfInNotOneOfCriteareaTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18A3520B2C85BAF0007FED53 /* IsOneOfInNotOneOfCriteareaTest.swift */; };
25+
18BB8B7A2C64DC8D007EBF23 /* ComparatorTypeDoesNotEqualMatchTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18BB8B792C64DC8D007EBF23 /* ComparatorTypeDoesNotEqualMatchTest.swift */; };
26+
18E23AE02C6CDE97002B2D92 /* CombinationLogicEventTypeCriteria.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18E23ADF2C6CDE97002B2D92 /* CombinationLogicEventTypeCriteria.swift */; };
27+
18E5B5D12CC77BCE00A558EC /* IterableTokenGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18E5B5D02CC77BCE00A558EC /* IterableTokenGenerator.swift */; };
28+
18E5B5D32CC7853D00A558EC /* ValidateTokenForDestinationUserTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 18E5B5D22CC7853D00A558EC /* ValidateTokenForDestinationUserTest.swift */; };
1629
1CBFFE1A2A97AEEF00ED57EE /* EmbeddedManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CBFFE162A97AEEE00ED57EE /* EmbeddedManagerTests.swift */; };
1730
1CBFFE1B2A97AEEF00ED57EE /* EmbeddedMessagingProcessorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CBFFE172A97AEEE00ED57EE /* EmbeddedMessagingProcessorTests.swift */; };
1831
1CBFFE1C2A97AEEF00ED57EE /* EmbeddedSessionManagerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CBFFE182A97AEEE00ED57EE /* EmbeddedSessionManagerTests.swift */; };
@@ -548,7 +561,20 @@
548561
00B6FAD0210E8D90007535CF /* dev-1.mobileprovision */ = {isa = PBXFileReference; lastKnownFileType = file; path = "dev-1.mobileprovision"; sourceTree = "<group>"; };
549562
00CB31B4210960C4004ACDEC /* TestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestUtils.swift; sourceTree = "<group>"; };
550563
092D01932D3038F600E3066A /* NotificationObserverTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationObserverTests.swift; sourceTree = "<group>"; };
551-
09876F3C2DF1D0290051F047 /* RedirectNetworkSessionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RedirectNetworkSessionTests.swift; sourceTree = "<group>"; };
564+
09CAA47A2D4B9AD80057FB72 /* IterableApiCriteriaFetchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableApiCriteriaFetchTests.swift; sourceTree = "<group>"; };
565+
09E8F2F82E29008200E92ABB /* ConsentTrackingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsentTrackingTests.swift; sourceTree = "<group>"; };
566+
1802C00E2CA2C99E009DEA2B /* CombinationComplexCriteria.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CombinationComplexCriteria.swift; sourceTree = "<group>"; };
567+
181063DA2C9841460078E0ED /* CustomEventUserUpdateTestCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomEventUserUpdateTestCaseTests.swift; sourceTree = "<group>"; };
568+
181063DC2C994FA40078E0ED /* ValidateCustomEventUserUpdateAPITest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidateCustomEventUserUpdateAPITest.swift; sourceTree = "<group>"; };
569+
181063DE2C9D51000078E0ED /* ValidateStoredEventCheckUnknownToKnownUserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidateStoredEventCheckUnknownToKnownUserTest.swift; sourceTree = "<group>"; };
570+
182A2A142C661C9A002FF058 /* DataTypeComparatorSearchQueryCriteria.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataTypeComparatorSearchQueryCriteria.swift; sourceTree = "<group>"; };
571+
1881A21A2C7602F80020C64D /* ComparatorDataTypeWithArrayInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComparatorDataTypeWithArrayInput.swift; sourceTree = "<group>"; };
572+
18A352092C7DC51C007FED53 /* NestedFieldSupportForArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NestedFieldSupportForArrayData.swift; sourceTree = "<group>"; };
573+
18A3520B2C85BAF0007FED53 /* IsOneOfInNotOneOfCriteareaTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IsOneOfInNotOneOfCriteareaTest.swift; sourceTree = "<group>"; };
574+
18BB8B792C64DC8D007EBF23 /* ComparatorTypeDoesNotEqualMatchTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComparatorTypeDoesNotEqualMatchTest.swift; sourceTree = "<group>"; };
575+
18E23ADF2C6CDE97002B2D92 /* CombinationLogicEventTypeCriteria.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CombinationLogicEventTypeCriteria.swift; sourceTree = "<group>"; };
576+
18E5B5D02CC77BCE00A558EC /* IterableTokenGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IterableTokenGenerator.swift; sourceTree = "<group>"; };
577+
18E5B5D22CC7853D00A558EC /* ValidateTokenForDestinationUserTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValidateTokenForDestinationUserTest.swift; sourceTree = "<group>"; };
552578
1CBFFE162A97AEEE00ED57EE /* EmbeddedManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmbeddedManagerTests.swift; sourceTree = "<group>"; };
553579
1CBFFE172A97AEEE00ED57EE /* EmbeddedMessagingProcessorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmbeddedMessagingProcessorTests.swift; sourceTree = "<group>"; };
554580
1CBFFE182A97AEEE00ED57EE /* EmbeddedSessionManagerTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EmbeddedSessionManagerTests.swift; sourceTree = "<group>"; };
@@ -1285,7 +1311,6 @@
12851311
AC3A3029262EE04400425435 /* deep-linking-tests */ = {
12861312
isa = PBXGroup;
12871313
children = (
1288-
09876F3C2DF1D0290051F047 /* RedirectNetworkSessionTests.swift */,
12891314
55E6F45E238E066400808BCE /* DeepLinkTests.swift */,
12901315
);
12911316
name = "deep-linking-tests";
@@ -2231,7 +2256,6 @@
22312256
AC776DA4211A17C700C27C27 /* IterableRequestUtilTests.swift in Sources */,
22322257
ACAA816E231163660035C743 /* RequestCreatorTests.swift in Sources */,
22332258
ACE34AB5213776CB00691224 /* LocalStorageTests.swift in Sources */,
2234-
09876F3D2DF1D0290051F047 /* RedirectNetworkSessionTests.swift in Sources */,
22352259
55B37FEE229F59290042F13A /* InAppPersistenceTests.swift in Sources */,
22362260
8A272FD02DD3775800634559 /* IterableDataRegionObjCTests.m in Sources */,
22372261
AC6FDD8C20F56309005D811E /* InAppParsingTests.swift in Sources */,

‎swift-sdk/Internal/Network/NetworkSession.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ extension RedirectNetworkSession: URLSessionDelegate, URLSessionTaskDelegate {
133133
}
134134

135135
delegate?.onRedirect(deepLinkLocation: deepLinkLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
136-
completionHandler(request)
136+
completionHandler(nil)
137137
}
138138

139139
private func number(fromString str: String) -> NSNumber {

‎tests/unit-tests/DeepLinkTests.swift‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -182,94 +182,6 @@ class DeepLinkTests: XCTestCase {
182182
private func createCookieValue(nameValuePairs values: Any...) -> String {
183183
values.take(2).map { "\($0[0])=\($0[1])" }.joined(separator: ";,")
184184
}
185-
186-
// MARK: - GreenFi SMS Deep Link Tests
187-
188-
func testGreenFiSMSDeepLinkRedirect() {
189-
let expectation1 = expectation(description: "Deep link resolves successfully")
190-
let expectation2 = expectation(description: "Attribution info extracted")
191-
192-
let greenfiSmsUrl = "https://links.greenfi.com/a/JsvVI"
193-
let destinationUrl = "https://app.greenfi.com/dashboard"
194-
let campaignId = 123456
195-
let templateId = 789012
196-
let messageId = "sms-campaign-123"
197-
198-
let mockUrlDelegate = MockUrlDelegate(returnValue: true)
199-
mockUrlDelegate.callback = { url, context in
200-
XCTAssertEqual(url.absoluteString, destinationUrl)
201-
XCTAssertEqual(context.action.type, IterableAction.actionTypeOpenUrl)
202-
XCTAssertTrue(Thread.isMainThread)
203-
expectation1.fulfill()
204-
}
205-
206-
// Create network session that simulates GreenFi's 303 redirect response
207-
let networkSession = MockNetworkSession()
208-
networkSession.responseCallback = { _ in
209-
MockNetworkSession.MockResponse(
210-
statusCode: 303, // GreenFi returns 303 redirect
211-
data: Dictionary<AnyHashable, Any>().toJsonData(),
212-
delay: 0.0,
213-
error: nil,
214-
headerFields: [
215-
"Location": destinationUrl,
216-
"Set-Cookie": self.createCookieValue(nameValuePairs: "iterableEmailCampaignId", campaignId, "iterableTemplateId", templateId, "iterableMessageId", messageId),
217-
]
218-
)
219-
}
220-
221-
let networkSessionProvider = MockRedirectNetworkSessionProvider(networkSession: networkSession)
222-
let deepLinkManager = DeepLinkManager(redirectNetworkSessionProvider: networkSessionProvider)
223-
224-
let (isIterableLink, attributionInfoFuture) = deepLinkManager.handleUniversalLink(
225-
URL(string: greenfiSmsUrl)!,
226-
urlDelegate: mockUrlDelegate,
227-
urlOpener: MockUrlOpener()
228-
)
229-
230-
XCTAssertTrue(isIterableLink, "GreenFi URL should be recognized as Iterable deep link")
231-
232-
attributionInfoFuture.onSuccess { attributionInfo in
233-
XCTAssertNotNil(attributionInfo, "Should extract attribution info from 303 response")
234-
XCTAssertEqual(attributionInfo?.campaignId, NSNumber(value: campaignId))
235-
XCTAssertEqual(attributionInfo?.templateId, NSNumber(value: templateId))
236-
XCTAssertEqual(attributionInfo?.messageId, messageId)
237-
expectation2.fulfill()
238-
}
239-
240-
wait(for: [expectation1, expectation2], timeout: testExpectationTimeout)
241-
}
242-
243-
func testGreenFiDeepLinkWithoutRedirect() {
244-
let expectation1 = expectation(description: "Deep link handled without redirect")
245-
246-
let greenfiSmsUrl = "https://links.greenfi.com/a/JsvVI"
247-
248-
let mockUrlDelegate = MockUrlDelegate(returnValue: true)
249-
mockUrlDelegate.callback = { url, context in
250-
// When no redirect occurs, should get original URL
251-
XCTAssertEqual(url.absoluteString, greenfiSmsUrl)
252-
XCTAssertEqual(context.action.type, IterableAction.actionTypeOpenUrl)
253-
expectation1.fulfill()
254-
}
255-
256-
// Use no-redirect provider to simulate timeout/failure scenario
257-
let deepLinkManager = DeepLinkManager(redirectNetworkSessionProvider: createNoRedirectNetworkSessionProvider())
258-
259-
let (isIterableLink, attributionInfoFuture) = deepLinkManager.handleUniversalLink(
260-
URL(string: greenfiSmsUrl)!,
261-
urlDelegate: mockUrlDelegate,
262-
urlOpener: MockUrlOpener()
263-
)
264-
265-
XCTAssertTrue(isIterableLink, "GreenFi URL should be recognized as Iterable deep link")
266-
267-
attributionInfoFuture.onSuccess { attributionInfo in
268-
XCTAssertNil(attributionInfo, "Should not have attribution info when redirect fails")
269-
}
270-
271-
wait(for: [expectation1], timeout: testExpectationTimeout)
272-
}
273185
}
274186

275187
private struct MockNoRedirectNetworkSessionProvider: RedirectNetworkSessionProvider {

0 commit comments

Comments
 (0)