Merge pull request #19603 from wordpress-mobile/task/jetpack-overlay-universal-linking

Add universal link action for the Jetpack overlay

Author: dvdchr

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -504,6 +504,14 @@ extension WordPressAppDelegate {
     }
 
     func handleWebActivity(_ activity: NSUserActivity) {
+        // try to handle unauthenticated routes first.
+        if activity.activityType == NSUserActivityTypeBrowsingWeb,
+           let url = activity.webpageURL,
+           UniversalLinkRouter.unauthenticated.canHandle(url: url) {
+            UniversalLinkRouter.unauthenticated.handle(url: url)
+            return
+        }
+
         guard AccountHelper.isLoggedIn,
             activity.activityType == NSUserActivityTypeBrowsingWeb,
             let url = activity.webpageURL else {

WordPress/Classes/Utility/Universal Links/Routes+Jetpack.swift

@@ -0,0 +1,14 @@
+struct JetpackRoute: Route {
+    let path = "/app"
+    let section: DeepLinkSection? = nil
+    var action: NavigationAction {
+        return self
+    }
+}
+
+extension JetpackRoute: NavigationAction {
+    func perform(_ values: [String: String], source: UIViewController?, router: LinkRouter) {
+        // We don't care where it opens in the app as long as it opens the app.
+        // If we handle deferred linking only then it would be relevant.
+    }
+}

WordPress/Classes/Utility/Universal Links/UniversalLinkRouter.swift

@@ -25,11 +25,16 @@ struct UniversalLinkRouter: LinkRouter {
     static let shared = UniversalLinkRouter(
         routes: defaultRoutes)
 
+    // A singleton that handles universal link routes without requiring authentication.
+    //
+    static let unauthenticated = UniversalLinkRouter(routes: jetpackRoutes)
+
     static let defaultRoutes: [Route] =
         redirects +
         meRoutes +
         newPostRoutes +
         newPageRoutes +
+        jetpackRoutes +
         notificationsRoutes +
         readerRoutes +
         statsRoutes +
@@ -43,6 +48,10 @@ struct UniversalLinkRouter: LinkRouter {
         MeNotificationSettingsRoute()
     ]
 
+    static let jetpackRoutes: [Route] = [
+        JetpackRoute()
+    ]
+
     static let newPostRoutes: [Route] = [
         NewPostRoute(),
         NewPostForSiteRoute()
@@ -120,8 +129,10 @@ struct UniversalLinkRouter: LinkRouter {
             return matcherCanHandle
         }
 
-        // If there's a hostname, check it's WordPress.com
-        return scheme == "https" && host == "wordpress.com" && matcherCanHandle
+        // If there's a hostname, check if it's WordPress.com or jetpack.com/app.
+        return scheme == "https"
+        && (host == "wordpress.com" || host == "jetpack.com")
+        && matcherCanHandle
     }
 
     /// Attempts to find a route that matches the url's path, and perform its

WordPress/Classes/ViewRelated/Jetpack/Branding/Coordinator/JetpackBrandingCoordinator.swift

@@ -3,10 +3,37 @@ import UIKit
 /// A class containing convenience methods for the the Jetpack branding experience
 class JetpackBrandingCoordinator {
 
+    /// Used to "guess" if the Jetpack app is already installed.
+    /// The check is done from the WordPress side.
+    ///
+    /// Note: The string values should kept in-sync with Jetpack's URL scheme.
+    ///
+    static var jetpackDeepLinkScheme: String {
+        #if DEBUG
+        return "jpdebug"
+        #elseif INTERNAL_BUILD
+        return "jpinternal"
+        #elseif ALPHA_BUILD
+        return "jpalpha"
+        #else
+        return "jetpack"
+        #endif
+    }
+
     static func presentOverlay(from viewController: UIViewController, redirectAction: (() -> Void)? = nil) {
 
         let action = redirectAction ?? {
-            // TODO: Add here the default action to redirect to the jp app
+            guard let jetpackDeepLinkURL = URL(string: "\(jetpackDeepLinkScheme)://app"),
+                  let jetpackUniversalLinkURL = URL(string: "https://jetpack.com/app"),
+                  let jetpackAppStoreURL = URL(string: "https://apps.apple.com/app/jetpack-website-builder/id1565481562") else {
+                return
+            }
+
+            // First, check if the WordPress app can open Jetpack by testing its URL scheme.
+            // if we can potentially open Jetpack app, let's open it through universal link to avoid scheme conflicts (e.g., a certain game :-).
+            // finally, if the user might not have Jetpack installed, direct them to App Store page.
+            let urlToOpen = UIApplication.shared.canOpenURL(jetpackDeepLinkURL) ? jetpackUniversalLinkURL : jetpackAppStoreURL
+            UIApplication.shared.open(urlToOpen)
         }
 
         let jetpackOverlayViewController = JetpackOverlayViewController(viewFactory: makeJetpackOverlayView, redirectAction: action)

WordPress/Info.plist

@@ -496,6 +496,7 @@
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>$(JP_SCHEME)</string>
 		<string>org-appextension-feature-password-management</string>
 		<string>twitter</string>
 		<string>whatsapp</string>

WordPress/Jetpack/JetpackDebug.entitlements

@@ -10,6 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
+		<string>applinks:jetpack.com</string>
 		<string>webcredentials:wordpress.com</string>
 		<string>applinks:apps.wordpress.com</string>
 		<string>applinks:wordpress.com</string>

WordPress/Jetpack/JetpackRelease-Alpha.entitlements

@@ -6,6 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
+		<string>applinks:jetpack.com</string>
 		<string>webcredentials:wordpress.com</string>
 		<string>applinks:apps.wordpress.com</string>
 		<string>applinks:wordpress.com</string>

WordPress/Jetpack/JetpackRelease-Internal.entitlements

@@ -6,6 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
+		<string>applinks:jetpack.com</string>
 		<string>webcredentials:wordpress.com</string>
 		<string>applinks:apps.wordpress.com</string>
 		<string>applinks:wordpress.com</string>

WordPress/Jetpack/JetpackRelease.entitlements

@@ -10,6 +10,7 @@
 	</array>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
+		<string>applinks:jetpack.com</string>
 		<string>webcredentials:wordpress.com</string>
 		<string>applinks:apps.wordpress.com</string>
 		<string>applinks:wordpress.com</string>

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -186,6 +186,8 @@
 		08216FD51CDBF96000304BA7 /* MenuItemTypeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08216FC71CDBF96000304BA7 /* MenuItemTypeViewController.m */; };
 		082635BB1CEA69280088030C /* MenuItemsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 082635BA1CEA69280088030C /* MenuItemsViewController.m */; };
 		0828D7FA1E6E09AE00C7C7D4 /* WPAppAnalytics+Media.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0828D7F91E6E09AE00C7C7D4 /* WPAppAnalytics+Media.swift */; };
+		082A645B291C2DD700668D2C /* Routes+Jetpack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 082A645A291C2DD700668D2C /* Routes+Jetpack.swift */; };
+		082A645C291C2DD700668D2C /* Routes+Jetpack.swift in Sources */ = {isa = PBXBuildFile; fileRef = 082A645A291C2DD700668D2C /* Routes+Jetpack.swift */; };
 		082AB9D91C4EEEF4000CA523 /* PostTagService.m in Sources */ = {isa = PBXBuildFile; fileRef = 082AB9D81C4EEEF4000CA523 /* PostTagService.m */; };
 		082AB9DD1C4F035E000CA523 /* PostTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 082AB9DC1C4F035E000CA523 /* PostTag.m */; };
 		0845B8C61E833C56001BA771 /* URL+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0845B8C51E833C56001BA771 /* URL+Helpers.swift */; };
@@ -5508,6 +5510,7 @@
 		082635B91CEA69280088030C /* MenuItemsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuItemsViewController.h; sourceTree = "<group>"; };
 		082635BA1CEA69280088030C /* MenuItemsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuItemsViewController.m; sourceTree = "<group>"; };
 		0828D7F91E6E09AE00C7C7D4 /* WPAppAnalytics+Media.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "WPAppAnalytics+Media.swift"; sourceTree = "<group>"; };
+		082A645A291C2DD700668D2C /* Routes+Jetpack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Routes+Jetpack.swift"; sourceTree = "<group>"; };
 		082AB9D71C4EEEF4000CA523 /* PostTagService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostTagService.h; sourceTree = "<group>"; };
 		082AB9D81C4EEEF4000CA523 /* PostTagService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostTagService.m; sourceTree = "<group>"; };
 		082AB9DB1C4F035E000CA523 /* PostTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostTag.h; sourceTree = "<group>"; };
@@ -9691,19 +9694,20 @@
 		1797373920EBDA1100377B4E /* Universal Links */ = {
 			isa = PBXGroup;
 			children = (
+				17BD4A182101D31B00975AC3 /* NavigationActionHelpers.swift */,
 				17B7C89F20EC1D6A0042E260 /* Route.swift */,
+				F574416C2425697D00E150A8 /* Route+Page.swift */,
+				1714F8CF20E6DA8900226DCB /* RouteMatcher.swift */,
 				17BD4A0720F76A4700975AC3 /* Routes+Banners.swift */,
-				174C11922624C78900346EC6 /* Routes+Start.swift */,
+				082A645A291C2DD700668D2C /* Routes+Jetpack.swift */,
 				F1655B4722A6C2FA00227BFB /* Routes+Mbar.swift */,
 				17F0E1D920EBDC0A001E9514 /* Routes+Me.swift */,
 				17E24F5320FCF1D900BD70A3 /* Routes+MySites.swift */,
 				17B7C8C020EE2A870042E260 /* Routes+Notifications.swift */,
 				1703D04B20ECD93800D292E9 /* Routes+Post.swift */,
-				F574416C2425697D00E150A8 /* Route+Page.swift */,
 				17A4A36820EE51870071C2CA /* Routes+Reader.swift */,
+				174C11922624C78900346EC6 /* Routes+Start.swift */,
 				1715179120F4B2EB002C4A38 /* Routes+Stats.swift */,
-				17BD4A182101D31B00975AC3 /* NavigationActionHelpers.swift */,
-				1714F8CF20E6DA8900226DCB /* RouteMatcher.swift */,
 				17B7C89D20EC1D0D0042E260 /* UniversalLinkRouter.swift */,
 			);
 			path = "Universal Links";
@@ -20804,6 +20808,7 @@
 				D858F30120E20106007E8A1C /* LikePost.swift in Sources */,
 				1703D04C20ECD93800D292E9 /* Routes+Post.swift in Sources */,
 				E11C4B702010930B00A6619C /* Blog+Jetpack.swift in Sources */,
+				082A645B291C2DD700668D2C /* Routes+Jetpack.swift in Sources */,
 				DC3B9B2C27739760003F7249 /* TimeZoneSelectorViewModel.swift in Sources */,
 				F1DB8D292288C14400906E2F /* Uploader.swift in Sources */,
 				3FB1929026C6109F000F5AA3 /* TimeSelectionView.swift in Sources */,
@@ -23179,6 +23184,7 @@
 				FABB23312602FC2C00C8785C /* SettingsCommon.swift in Sources */,
 				17C1D6922670E4A2006C8970 /* UIFont+Fitting.swift in Sources */,
 				FABB23322602FC2C00C8785C /* FormatBarItemProviders.swift in Sources */,
+				082A645C291C2DD700668D2C /* Routes+Jetpack.swift in Sources */,
 				FABB23332602FC2C00C8785C /* RevisionDiffViewController.swift in Sources */,
 				FABB23342602FC2C00C8785C /* BlogDetailsSectionFooterView.swift in Sources */,
 				3F435221289B2B5100CE19ED /* JetpackOverlayViewController.swift in Sources */,
@@ -24925,6 +24931,7 @@
 				);
 				INFOPLIST_FILE = Info.plist;
 				INFOPLIST_PREPROCESS = YES;
+				JP_SCHEME = jpdebug;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -24991,6 +24998,7 @@
 				);
 				INFOPLIST_FILE = Info.plist;
 				INFOPLIST_PREPROCESS = YES;
+				JP_SCHEME = jetpack;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -26992,6 +27000,7 @@
 				);
 				INFOPLIST_FILE = "WordPress-Alpha-Info.plist";
 				INFOPLIST_PREPROCESS = YES;
+				JP_SCHEME = jpalpha;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -27429,6 +27438,7 @@
 				);
 				INFOPLIST_FILE = "WordPress-Internal-Info.plist";
 				INFOPLIST_PREPROCESS = YES;
+				JP_SCHEME = jpinternal;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",