Merge pull request #19712 from wordpress-mobile/release/21.3

Merge 21.3.0.1 to trunk

Author: oguzkocer

Gemfile.lock

@@ -188,15 +188,14 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.11.0)
-    fastlane-plugin-wpmreleasetoolkit (6.0.0)
+    fastlane-plugin-wpmreleasetoolkit (6.1.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
       diffy (~> 3.3)
       git (~> 1.3)
       google-cloud-storage (~> 1.31)
-      jsonlint (~> 0.3)
       nokogiri (~> 1.11)
       octokit (~> 4.18)
       parallel (~> 1.14)
@@ -213,7 +212,7 @@ GEM
       rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.26.0)
       google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.9.0)
+    google-apis-core (0.9.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -222,8 +221,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.15.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-iamcredentials_v1 (0.16.0)
+      google-apis-core (>= 0.9.1, < 2.a)
     google-apis-playcustomapp_v1 (0.10.0)
       google-apis-core (>= 0.7, < 2.a)
     google-apis-storage_v1 (0.19.0)
@@ -234,15 +233,15 @@ GEM
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.0)
-    google-cloud-storage (1.43.0)
+    google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
       google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.3.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -257,9 +256,6 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
     json (2.6.2)
-    jsonlint (0.3.0)
-      oj (~> 3)
-      optimist (~> 3)
     jwt (2.5.0)
     kramdown (2.4.0)
       rexml
@@ -284,9 +280,7 @@ GEM
     octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    oj (3.13.23)
     open4 (1.3.4)
-    optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
     os (1.1.4)

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 
 21.3
 -----
+* [***] Adds a smooth, opt-in transition to the Jetpack app. [#19714]
 * [*] [internal] When a user migrates to the Jetpack app and allows notifications, WordPress app notifications are disabled. This is released disabled and is behind a feature flag. [#19616, #19611, #19590]
 * [*] Fixed a minor UI issue where the segmented control under My SIte was being clipped when "Home" is selected. [#19595]
 * [*] Fixed an issue where the site wasn't removed and the app wasn't refreshed after disconnecting the site from WordPress.com. [#19634]

WordPress/Classes/Models/WPAccount.m

@@ -2,6 +2,7 @@
 #import "WordPress-Swift.h"
 
 static NSString * const WordPressComOAuthKeychainServiceName = @"public-api.wordpress.com";
+static NSString * const JetpackComOAuthKeychainServiceName = @"jetpack.public-api.wordpress.com";
 
 @interface WPAccount ()
 
@@ -85,7 +86,7 @@ - (void)setAuthToken:(NSString *)authToken
         NSError *error = nil;
         [SFHFKeychainUtils storeUsername:self.username
                              andPassword:authToken
-                          forServiceName:WordPressComOAuthKeychainServiceName
+                          forServiceName:[WPAccount authKeychainServiceName]
                              accessGroup:nil
                           updateExisting:YES
                                    error:&error];
@@ -97,7 +98,7 @@ - (void)setAuthToken:(NSString *)authToken
     } else {
         NSError *error = nil;
         [SFHFKeychainUtils deleteItemForUsername:self.username
-                                  andServiceName:WordPressComOAuthKeychainServiceName
+                                  andServiceName:[WPAccount authKeychainServiceName]
                                      accessGroup:nil
                                            error:&error];
         if (error) {
@@ -133,8 +134,9 @@ - (BOOL)hasAtomicSite {
 + (NSString *)tokenForUsername:(NSString *)username
 {
     NSError *error = nil;
+    [WPAccount migrateAuthKeyForUsername:username];
     NSString *authToken = [SFHFKeychainUtils getPasswordForUsername:username
-                                                     andServiceName:WordPressComOAuthKeychainServiceName
+                                                     andServiceName:[WPAccount authKeychainServiceName]
                                                         accessGroup:nil
                                                               error:&error];
     if (error) {
@@ -144,6 +146,22 @@ + (NSString *)tokenForUsername:(NSString *)username
     return authToken;
 }
 
++ (void)migrateAuthKeyForUsername:(NSString *)username
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        if ([AppConfiguration isJetpack]) {
+            SharedDataIssueSolver *sharedDataIssueSolver = [SharedDataIssueSolver instance];
+            [sharedDataIssueSolver migrateAuthKeyFor:username];
+        }
+    });
+}
+
++ (NSString *)authKeychainServiceName
+{
+    return [AppConfiguration isWordPress] ? WordPressComOAuthKeychainServiceName : JetpackComOAuthKeychainServiceName;
+}
+
 #pragma mark - API Helpers
 
 - (WordPressComRestApi *)wordPressComRestApi

WordPress/Classes/System/WordPressAppDelegate+openURL.swift

@@ -20,6 +20,15 @@ import AutomatticTracks
             return true
         }
 
+        /// WordPress only. Handle deeplink from JP that requests data export.
+        let wordPressExportRouter = MigrationDeepLinkRouter(urlForScheme: URL(string: AppScheme.wordpressMigrationV1.rawValue),
+                                                            routes: [WordPressExportRoute()])
+        if AppConfiguration.isWordPress,
+           wordPressExportRouter.canHandle(url: url) {
+            wordPressExportRouter.handle(url: url)
+            return true
+        }
+
         if url.scheme == JetpackNotificationMigrationService.wordPressScheme {
             return JetpackNotificationMigrationService.shared.handleNotificationMigrationOnWordPress()
         }

WordPress/Classes/System/WordPressAppDelegate.swift

@@ -198,12 +198,13 @@ class WordPressAppDelegate: UIResponder, UIApplicationDelegate {
         updateFeatureFlags()
         updateRemoteConfig()
 
-        #if JETPACK
+#if JETPACK
+        // JetpackWindowManager is only available in the Jetpack target.
         if let windowManager = windowManager as? JetpackWindowManager,
            windowManager.shouldImportMigrationData {
-            windowManager.importAndShowMigrationContent(nil, failureCompletion: nil)
+            windowManager.importAndShowMigrationContent()
         }
-        #endif
+#endif
     }
 
     func applicationWillResignActive(_ application: UIApplication) {
@@ -629,17 +630,28 @@ extension WordPressAppDelegate {
 extension WordPressAppDelegate {
 
     var currentlySelectedScreen: String {
-        // Check if the post editor or login view is up
-        let rootViewController = window?.rootViewController
-        if let presentedViewController = rootViewController?.presentedViewController {
-            if presentedViewController is EditPostViewController {
-                return "Post Editor"
-            } else if presentedViewController is LoginNavigationController {
-                return "Login View"
-            }
+        guard let rootViewController = window?.rootViewController else {
+            DDLogInfo("\(#function) is called when `rootViewController` is nil.")
+            return String()
         }
 
-        return WPTabBarController.sharedInstance().currentlySelectedScreen()
+        // NOTE: This logic doesn't cover all the scenarios properly yet. If we want to know what screen was actually seen,
+        // there should be a recursive check to get to the visible view controller (or call `UINavigationController`'s `visibleViewController`).
+        //
+        // Read more here: https://github.com/wordpress-mobile/WordPress-iOS/pull/19677#pullrequestreview-1199885009
+        //
+        switch rootViewController.presentedViewController ?? rootViewController {
+        case is EditPostViewController:
+            return "Post Editor"
+        case is LoginNavigationController:
+            return "Login View"
+#if JETPACK
+        case is MigrationNavigationController:
+            return "Jetpack Migration View"
+#endif
+        default:
+            return WPTabBarController.sharedInstance().currentlySelectedScreen()
+        }
     }
 
     var isWelcomeScreenVisible: Bool {
@@ -785,8 +797,7 @@ extension WordPressAppDelegate {
     @objc fileprivate func handleDefaultAccountChangedNotification(_ notification: NSNotification) {
         // If the notification object is not nil, then it's a login
         if notification.object != nil {
-            setupShareExtensionToken()
-            configureNotificationExtension()
+            setupWordPressExtensions()
             startObservingAppleIDCredentialRevoked()
             AccountService.loadDefaultAccountCookies()
         } else {

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -415,11 +415,6 @@ import Foundation
     case jetpackSiteCreationOverlayButtonTapped
     case jetpackSiteCreationOverlayDismissed
 
-    // WordPress to Jetpack Migration
-    case migrationEmailTriggered
-    case migrationEmailSent
-    case migrationEmailFailed
-
     /// A String that represents the event
     var value: String {
         switch self {
@@ -1129,14 +1124,6 @@ import Foundation
         case .jetpackSiteCreationOverlayDismissed:
             return "remove_site_creation_overlay_dismissed"
 
-        // WordPress to Jetpack Migration
-        case .migrationEmailTriggered:
-            return "migration_email_triggered"
-        case .migrationEmailSent:
-            return "migration_email_sent"
-        case .migrationEmailFailed:
-            return "migration_email_failed"
-
         } // END OF SWITCH
     }
 

WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift

@@ -160,30 +160,47 @@ class BloggingRemindersScheduler {
 
     private static func copyStoreToSharedFile() {
         guard let store = try? defaultStore(),
-              let fileUrl = try? defaultDataFileURL(),
               let sharedFileUrl = sharedDataFileURL() else {
             return
         }
 
-        // Only copy the file if we have at least one reminder schedule
-        if store.configuration.count > 0 {
-            try? FileManager.default.copyItem(at: fileUrl, to: sharedFileUrl)
+        ContextManager.shared.performAndSave { context in
+            var configuration = [String: ScheduledReminders]()
+            for (blogIdentifier, schedule) in store.configuration {
+                guard let objectID = context.persistentStoreCoordinator?.managedObjectID(forURIRepresentation: blogIdentifier),
+                      let blog = context.object(with: objectID) as? Blog,
+                      let url = blog.url else {
+                    continue
+                }
+                configuration[url] = schedule
+            }
+
+            if configuration.count > 0 {
+                try? PropertyListEncoder().encode(configuration).write(to: sharedFileUrl)
+            }
         }
     }
 
     private static func copyStoreToLocalFile() {
         guard let localStore = try? defaultStore(),
               let sharedFileUrl = sharedDataFileURL(),
               FileManager.default.fileExists(at: sharedFileUrl),
-              let sharedStore = try? BloggingRemindersStore(dataFileURL: sharedFileUrl) else {
+              let data = try? Data(contentsOf: sharedFileUrl),
+              let sharedConfig = try? PropertyListDecoder().decode([String: ScheduledReminders].self, from: data) else {
             return
         }
 
         // Only copy if the existing local store contains no schedules
         if localStore.configuration.count == 0 {
-            for blogIdentifier in sharedStore.configuration.keys {
-                let schedule = sharedStore.scheduledReminders(for: blogIdentifier)
-                try? localStore.save(scheduledReminders: schedule, for: blogIdentifier)
+            ContextManager.shared.performAndSave { context in
+                for (blogUrl, schedule) in sharedConfig {
+                    guard let blog = try? BlogQuery().hostname(matching: blogUrl).blog(in: context) else {
+                        continue
+                    }
+                    let blogIdentifier = blog.objectID.uriRepresentation()
+                    try? localStore.save(scheduledReminders: schedule, for: blogIdentifier)
+                }
+                try? FileManager.default.removeItem(at: sharedFileUrl)
             }
         }
     }

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -113,9 +113,9 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .jetpackPowered:
             return true
         case .jetpackPoweredBottomSheet:
-            return false
+            return true
         case .contentMigration:
-            return false
+            return true
         case .newJetpackLandingScreen:
             return true
         case .newWordPressLandingScreen:

WordPress/Classes/Utility/Universal Links/Migration/MigrationDeepLinkRouter.swift

@@ -0,0 +1,54 @@
+/// A router that specifically handles deeplinks.
+/// Note that the capability of this router is very limited; it can only handle up to one path component (e.g.: `wordpress://intent`).
+///
+/// This is meant to be used during the WP->JP migratory period. Once we decide to move on from this phase, this class may be removed.
+///
+struct MigrationDeepLinkRouter: LinkRouter {
+
+    let routes: [Route]
+
+    /// when this is set, the router ensures that the URL has a scheme that matches this value.
+    private var scheme: String? = nil
+
+    init(routes: [Route]) {
+        self.routes = routes
+    }
+
+    init(scheme: String?, routes: [Route]) {
+        self.init(routes: routes)
+        self.scheme = scheme
+    }
+
+    init(urlForScheme: URL?, routes: [Route]) {
+        self.init(scheme: urlForScheme?.scheme, routes: routes)
+    }
+
+    func canHandle(url: URL) -> Bool {
+        // if the scheme is set, check if the URL fulfills the requirement.
+        if let scheme, url.scheme != scheme {
+            return false
+        }
+
+        /// deeplinks have their paths start at `host`, unlike universal links.
+        /// e.g. wordpress://intent -> "intent" is the URL's host.
+        ///
+        /// Ensure that the deeplink URL has a "host" that we can run against the `routes`' path.
+        guard let deepLinkPath = url.host else {
+            return false
+        }
+
+        return routes
+            .map { $0.path.removingPrefix("/") }
+            .contains { $0 == deepLinkPath }
+    }
+
+    func handle(url: URL, shouldTrack track: Bool = false, source: DeepLinkSource? = nil) {
+        guard let deepLinkPath = url.host,
+              let route = routes.filter({ $0.path.removingPrefix("/") == deepLinkPath }).first else {
+            return
+        }
+
+        // there's no need to pass any arguments or parameters since most of the migration deeplink routes are standalone.
+        route.action.perform([:], source: nil, router: self)
+    }
+}