Merge branch 'master' into feature/itbl_track_anon_user

evantk91 · web-flow · commit 445c893ead46 · 2024-10-07T15:07:53.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [6.5.7]
+### Fixed
+- Fixed deeplink re-routing issue where delegate would only return `false` value. Thanks to @scottasoutherland :) 
+
 ## [6.5.6]
 ### Fixed
 - Fixed an issue where push notification were not being delivered in iOS 18 beta Sandbox builds.
diff --git a/Iterable-iOS-AppExtensions.podspec b/Iterable-iOS-AppExtensions.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Iterable-iOS-AppExtensions"
   s.module_name  = "IterableAppExtensions"
-  s.version      = "6.5.6"
+  s.version      = "6.5.7"
   s.summary      = "App Extensions for Iterable SDK"
 
   s.description  = <<-DESC
diff --git a/Iterable-iOS-SDK.podspec b/Iterable-iOS-SDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name         = "Iterable-iOS-SDK"
   s.module_name  = "IterableSDK"
-  s.version      = "6.5.6"
+  s.version      = "6.5.7"
   s.summary      = "Iterable's official SDK for iOS"
 
   s.description  = <<-DESC
diff --git a/sample-apps/objc-sample-app/objc-sample-app/AppDelegate.m b/sample-apps/objc-sample-app/objc-sample-app/AppDelegate.m
@@ -134,7 +134,7 @@ - (BOOL)handleIterableURL:(NSURL *)url context:(IterableActionContext *)context
 - (BOOL)handleIterableCustomAction:(IterableAction *)action context:(IterableActionContext *)context {
     if ([action.type isEqualToString:@"handleFindCoffee"]) {
         if (action.userInput != nil) {
-            NSString *urlString = [[NSString alloc] initWithFormat:@"https://majumder.me/coffee?q=%@", action.userInput];
+            NSString *urlString = [[NSString alloc] initWithFormat:@"https://example.com/coffee?q=%@", action.userInput];
             NSURL *url = [[NSURL alloc] initWithString:urlString];
             return [DeepLinkHandler handleURL:url];
         }
diff --git a/sample-apps/objc-sample-app/objc-sample-app/objc-sample-app.entitlements b/sample-apps/objc-sample-app/objc-sample-app/objc-sample-app.entitlements
@@ -6,8 +6,8 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:majumder.me</string>
-		<string>applinks:links.majumder.me</string>
+		<string>applinks:example.com</string>
+		<string>applinks:links.example.com</string>
 	</array>
 </dict>
 </plist>
diff --git a/sample-apps/swift-sample-app/swift-sample-app.xcodeproj/project.pbxproj b/sample-apps/swift-sample-app/swift-sample-app.xcodeproj/project.pbxproj
@@ -497,13 +497,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "swift-sample-app/swift-sample-app.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = BP98Z28R86;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "swift-sample-app/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "iterable.swift-sample-app";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.example.iterable.swift-sample-app";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -516,13 +516,13 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "swift-sample-app/swift-sample-app.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = BP98Z28R86;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "swift-sample-app/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "iterable.swift-sample-app";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.example.iterable.swift-sample-app";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -533,14 +533,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = BP98Z28R86;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "swift-sample-app-notification-extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "iterable.swift-sample-app.swift-sample-app-notification-extension";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.example.iterable.swift-sample-app.swift-sample-app-notification-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
@@ -552,14 +552,14 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = BP98Z28R86;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = "swift-sample-app-notification-extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "iterable.swift-sample-app.swift-sample-app-notification-extension";
+				PRODUCT_BUNDLE_IDENTIFIER = "com.example.iterable.swift-sample-app.swift-sample-app-notification-extension";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
diff --git a/sample-apps/swift-sample-app/swift-sample-app/AppDelegate.swift b/sample-apps/swift-sample-app/swift-sample-app/AppDelegate.swift
@@ -171,7 +171,7 @@ extension AppDelegate: IterableCustomActionDelegate {
     func handle(iterableCustomAction action: IterableAction, inContext _: IterableActionContext) -> Bool {
         if action.type == "handleFindCoffee" {
             if let query = action.userInput {
-                return DeepLinkHandler.handle(url: URL(string: "https://majumder.me/coffee?q=\(query)")!)
+                return DeepLinkHandler.handle(url: URL(string: "https://example.com/coffee?q=\(query)")!)
             }
         }
         return false
diff --git a/sample-apps/swift-sample-app/swift-sample-app/swift-sample-app.entitlements b/sample-apps/swift-sample-app/swift-sample-app/swift-sample-app.entitlements
@@ -6,8 +6,8 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:majumder.me</string>
-		<string>applinks:links.majumder.me</string>
+		<string>applinks:example.com</string>
+		<string>applinks:links.example.com</string>
 	</array>
 </dict>
 </plist>
diff --git a/swift-sdk/Internal/DeepLinkManager.swift b/swift-sdk/Internal/DeepLinkManager.swift
@@ -43,17 +43,18 @@ class DeepLinkManager: NSObject {
             // Always return true for deep link
             return (true, pending)
         } else {
+            var result: Bool = false
             if let action = IterableAction.actionOpenUrl(fromUrlString: url.absoluteString) {
                 let context = IterableActionContext(action: action, source: .universalLink)
                 
-                ActionRunner.execute(action: action,
+                result = ActionRunner.execute(action: action,
                                              context: context,
                                              urlHandler: IterableUtil.urlHandler(fromUrlDelegate: urlDelegate,
                                                                                  inContext: context),
                                              urlOpener: urlOpener,
                                              allowedProtocols: allowedProtocols)
             }
-            return (false, Fulfill<IterableAttributionInfo?, Error>(value: nil))
+            return (result, Fulfill<IterableAttributionInfo?, Error>(value: nil))
         }
     }
     
diff --git a/swift-sdk/IterableAPI.swift b/swift-sdk/IterableAPI.swift
@@ -7,7 +7,7 @@ import UIKit
 
 @objcMembers public final class IterableAPI: NSObject {
     /// The current SDK version
-    public static let sdkVersion = "6.5.6"
+    public static let sdkVersion = "6.5.7"
     
     /// The email of the logged in user that this IterableAPI is using
     public static var email: String? {
diff --git a/tests/unit-tests/DeepLinkTests.swift b/tests/unit-tests/DeepLinkTests.swift
@@ -70,11 +70,10 @@ class DeepLinkTests: XCTestCase {
         
         let deepLinkManager = DeepLinkManager(redirectNetworkSessionProvider: createNoRedirectNetworkSessionProvider())
         
-        let (isIterableLink, _) = deepLinkManager.handleUniversalLink(URL(string: iterableNoRewriteURL)!,
+        let (_, _) = deepLinkManager.handleUniversalLink(URL(string: iterableNoRewriteURL)!,
                                                                       urlDelegate: mockUrlDelegate,
                                                                       urlOpener: MockUrlOpener())
-        
-        XCTAssertFalse(isIterableLink)
+
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ - (BOOL)handleIterableURL:(NSURL )url context:(IterableActionContext )context`
`134`	`134`	`- (BOOL)handleIterableCustomAction:(IterableAction )action context:(IterableActionContext )context {`
`135`	`135`	`if ([action.type isEqualToString:@"handleFindCoffee"]) {`
`136`	`136`	`if (action.userInput != nil) {`
`137`		`- NSString *urlString = [[NSString alloc] initWithFormat:@"https://majumder.me/coffee?q=%@", action.userInput];`
	`137`	`+ NSString *urlString = [[NSString alloc] initWithFormat:@"https://example.com/coffee?q=%@", action.userInput];`
`138`	`138`	`NSURL *url = [[NSURL alloc] initWithString:urlString];`
`139`	`139`	`return [DeepLinkHandler handleURL:url];`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ extension AppDelegate: IterableCustomActionDelegate {`
`171`	`171`	`func handle(iterableCustomAction action: IterableAction, inContext _: IterableActionContext) -> Bool {`
`172`	`172`	`if action.type == "handleFindCoffee" {`
`173`	`173`	`if let query = action.userInput {`
`174`		`- return DeepLinkHandler.handle(url: URL(string: "https://majumder.me/coffee?q=\(query)")!)`
	`174`	`+ return DeepLinkHandler.handle(url: URL(string: "https://example.com/coffee?q=\(query)")!)`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`	`return false`
Original file line number	Diff line number	Diff line change
`@@ -43,17 +43,18 @@ class DeepLinkManager: NSObject {`
`43`	`43`	`// Always return true for deep link`
`44`	`44`	`return (true, pending)`
`45`	`45`	`} else {`
	`46`	`+ var result: Bool = false`
`46`	`47`	`if let action = IterableAction.actionOpenUrl(fromUrlString: url.absoluteString) {`
`47`	`48`	`let context = IterableActionContext(action: action, source: .universalLink)`
`48`	`49`
`49`		`- ActionRunner.execute(action: action,`
	`50`	`+ result = ActionRunner.execute(action: action,`
`50`	`51`	`context: context,`
`51`	`52`	`urlHandler: IterableUtil.urlHandler(fromUrlDelegate: urlDelegate,`
`52`	`53`	`inContext: context),`
`53`	`54`	`urlOpener: urlOpener,`
`54`	`55`	`allowedProtocols: allowedProtocols)`
`55`	`56`	`}`
`56`		`- return (false, Fulfill<IterableAttributionInfo?, Error>(value: nil))`
	`57`	`+ return (result, Fulfill<IterableAttributionInfo?, Error>(value: nil))`
`57`	`58`	`}`
`58`	`59`	`}`
`59`	`60`