Adds ability to manage plugins for self hosted sites that aren't connected to Jetpack

Podfile

@@ -47,9 +47,9 @@ def wordpress_ui
 end
 
 def wordpress_kit
-    pod 'WordPressKit', '~> 4.35.0-beta.1'
+    #pod 'WordPressKit', '~> 4.35.0-beta.1'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :tag => ''
-    # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'fix/response-code-for-org-failed-login'
+    pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :branch => 'task/16595-self-hosted-plugins'
     # pod 'WordPressKit', :git => 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', :commit => ''
     # pod 'WordPressKit', :path => '../WordPressKit-iOS'
 end

Podfile.lock

@@ -401,7 +401,7 @@ PODS:
     - WordPressKit (~> 4.18-beta)
     - WordPressShared (~> 1.12-beta)
     - WordPressUI (~> 1.7-beta)
-  - WordPressKit (4.35.0-beta.1):
+  - WordPressKit (4.35.0-beta.2):
     - Alamofire (~> 4.8.0)
     - CocoaLumberjack (~> 3.4)
     - NSObject-SafeExpectations (= 0.0.4)
@@ -499,7 +499,7 @@ DEPENDENCIES:
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.19.4)
   - WordPressAuthenticator (~> 1.38.0-beta)
-  - WordPressKit (~> 4.35.0-beta.1)
+  - WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, branch `task/16595-self-hosted-plugins`)
   - WordPressMocks (~> 0.0.12)
   - WordPressShared (~> 1.16.0)
   - WordPressUI (~> 1.12.1-beta)
@@ -551,7 +551,6 @@ SPEC REPOS:
     - UIDeviceIdentifier
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressKit
     - WordPressMocks
     - WordPressShared
     - WPMediaPicker
@@ -651,6 +650,9 @@ EXTERNAL SOURCES:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.55.0
+  WordPressKit:
+    :branch: task/16595-self-hosted-plugins
+    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
   Yoga:
     :podspec: https://raw.githubusercontent.com/wordpress-mobile/gutenberg-mobile/v1.55.0/third-party-podspecs/Yoga.podspec.json
 
@@ -666,6 +668,9 @@ CHECKOUT OPTIONS:
     :git: https://github.com/wordpress-mobile/gutenberg-mobile.git
     :submodules: true
     :tag: v1.55.0
+  WordPressKit:
+    :commit: 97ac7934272260dc2b70a5291365a0b4ae4bfff4
+    :git: https://github.com/wordpress-mobile/WordPressKit-iOS.git
 
 SPEC CHECKSUMS:
   1PasswordExtension: f97cc80ae58053c331b2b6dc8843ba7103b33794
@@ -747,7 +752,7 @@ SPEC CHECKSUMS:
   WordPress-Aztec-iOS: 870c93297849072aadfc2223e284094e73023e82
   WordPress-Editor-iOS: 068b32d02870464ff3cb9e3172e74234e13ed88c
   WordPressAuthenticator: 6031e2aa349113aa6a36a8ce489fb2c75d273e00
-  WordPressKit: 5894cd7385898bc7dfaf75073bcce0ffdd1a1807
+  WordPressKit: 86804222637c3e5d7f2b897d7a55741f6917372c
   WordPressMocks: 2783c51aaa34eca64d6ebbad13837951c374baf2
   WordPressShared: 0f7f10e96f8354d64f951c223ae61e8de7495a46
   WordPressUI: 3696cfef6f0ca595fb19df64f5bee6d2b3021e7e
@@ -763,6 +768,6 @@ SPEC CHECKSUMS:
   ZendeskSupportSDK: e100a7a0a1bb5d7d43abbde3338727d985a4986d
   ZIPFoundation: e27423c004a5a1410c15933407747374e7c6cb6e
 
-PODFILE CHECKSUM: f7f4f2c65e783b0179359225cf9232394157b8ae
+PODFILE CHECKSUM: c7632605b59234b9f5794883f68793535452d2d5
 
 COCOAPODS: 1.10.1

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+17.7
+-----
+* [**] Self hosted sites that do not use Jetpack can now manage (install, modify active, uninstall) their plugins [#16675]
+
 17.6
 -----
 * [**] Reader Post details: now shows a summary of Likes for the post. Tapping it displays the full list of Likes. [#16628]

WordPress/Classes/Models/Blog.m

@@ -628,11 +628,22 @@ - (BOOL)supportsPluginManagement
     BOOL hasRequiredJetpack = [self hasRequiredJetpackVersion:@"5.6"];
 
     BOOL isTransferrable = self.isHostedAtWPcom
-        && self.hasBusinessPlan
-        && self.siteVisibility != SiteVisibilityPrivate
+    && self.hasBusinessPlan
+    && self.siteVisibility != SiteVisibilityPrivate
+    && self.isAdmin;
+
+    BOOL supports = isTransferrable || hasRequiredJetpack;
+
+    // If the site is not hosted on WP.com we can still manage plugins directly using the WP.org rest API
+    // Reference: https://make.wordpress.org/core/2020/07/16/new-and-modified-rest-api-endpoints-in-wordpress-5-5/
+    if(!supports && !self.account){
+        supports = !self.isHostedAtWPcom
+        && self.wordPressOrgRestApi
+        && [self hasRequiredWordPressVersion:@"5.5"]
         && self.isAdmin;
+    }
 
-    return isTransferrable || hasRequiredJetpack;
+    return supports;
 }
 
 - (BOOL)supportsStories
@@ -853,6 +864,13 @@ - (BOOL)hasRequiredJetpackVersion:(NSString *)requiredJetpackVersion
     && [self.jetpack.version compare:requiredJetpackVersion options:NSNumericSearch] != NSOrderedAscending;
 }
 
+/// Checks the blogs installed WordPress version is more than or equal to the requiredVersion
+/// @param requiredVersion The minimum version to check for
+- (BOOL)hasRequiredWordPressVersion:(NSString *)requiredVersion
+{
+    return [self.version compare:requiredVersion options:NSNumericSearch] != NSOrderedAscending;
+}
+
 #pragma mark - Private Methods
 
 - (id)getOptionValue:(NSString *)name

WordPress/Classes/Models/JetpackSiteRef.swift

@@ -17,20 +17,53 @@ struct JetpackSiteRef: Hashable, Codable {
     let homeURL: String
 
     private var hasBackup = false
-
     private var hasPaidPlan = false
 
+    // Self Hosted Non Jetpack Support
+    // Ideally this would be a different "ref" object but the JetpackSiteRef
+    // is so coupled into the plugin management that the amount of changes and work needed to change
+    // would be very large. This is a workaround for that.
+    let isSelfHostedWithoutJetpack: Bool
+
+    /// The XMLRPC path for the site, only applies to self hosted sites with no Jetpack connected
+    var xmlRPC: String? = nil
+
     init?(blog: Blog) {
-        guard let username = blog.account?.username,
-            let siteID = blog.dotComID as? Int,
-            let homeURL = blog.homeURL as String? else {
+
+        // Init for self hosted and no Jetpack
+        if blog.account == nil, !blog.isHostedAtWPcom {
+            guard
+                let username = blog.username,
+                let homeURL = blog.homeURL as String?,
+                let xmlRPC = blog.xmlrpc
+            else {
                 return nil
+            }
+
+            self.isSelfHostedWithoutJetpack = true
+            self.username = username
+            self.siteID = Constants.selfHostedSiteID
+            self.homeURL = homeURL
+            self.xmlRPC = xmlRPC
+        }
+
+        // Init for normal Jetpack connected sites
+        else {
+            guard
+                let username = blog.account?.username,
+                let siteID = blog.dotComID as? Int,
+                let homeURL = blog.homeURL as String?
+            else {
+                return nil
+            }
+
+            self.isSelfHostedWithoutJetpack = false
+            self.siteID = siteID
+            self.username = username
+            self.homeURL = homeURL
+            self.hasBackup = blog.isBackupsAllowed()
+            self.hasPaidPlan = blog.hasPaidPlan
         }
-        self.siteID = siteID
-        self.username = username
-        self.homeURL = homeURL
-        self.hasBackup = blog.isBackupsAllowed()
-        self.hasPaidPlan = blog.hasPaidPlan
     }
 
     public func hash(into hasher: inout Hasher) {
@@ -48,4 +81,8 @@ struct JetpackSiteRef: Hashable, Codable {
     func shouldShowActivityLogFilter() -> Bool {
         hasBackup || hasPaidPlan
     }
+
+    struct Constants {
+        static let selfHostedSiteID = -1
+    }
 }

WordPress/Classes/Networking/Plugin Management/JetpackPluginManagementClient.swift

@@ -0,0 +1,55 @@
+import Foundation
+import WordPressKit
+
+class JetpackPluginManagementClient: PluginManagementClient {
+    private let siteID: Int
+    private let remote: PluginServiceRemote
+
+    required init?(with site: JetpackSiteRef) {
+        guard let token = CredentialsService().getOAuthToken(site: site) else {
+            return nil
+        }
+
+        siteID = site.siteID
+
+        let api = WordPressComRestApi.defaultApi(oAuthToken: token, userAgent: WPUserAgent.wordPress())
+        remote = PluginServiceRemote(wordPressComRestApi: api)
+    }
+
+    func getPlugins(success: @escaping (SitePlugins) -> Void, failure: @escaping (Error) -> Void) {
+        remote.getPlugins(siteID: siteID, success: success, failure: failure)
+    }
+
+    func updatePlugin(pluginID: String, success: @escaping (PluginState) -> Void, failure: @escaping (Error) -> Void) {
+        remote.updatePlugin(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+    }
+
+    func activatePlugin(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
+        remote.activatePlugin(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+    }
+
+    func deactivatePlugin(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
+        remote.deactivatePlugin(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+    }
+
+    func enableAutoupdates(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
+        remote.enableAutoupdates(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+
+    }
+
+    func disableAutoupdates(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
+        remote.disableAutoupdates(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+    }
+
+    func activateAndEnableAutoupdates(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
+        remote.activateAndEnableAutoupdates(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+    }
+
+    func install(pluginSlug: String, success: @escaping (PluginState) -> Void, failure: @escaping (Error) -> Void) {
+        remote.install(pluginSlug: pluginSlug, siteID: siteID, success: success, failure: failure)
+    }
+
+    func remove(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void) {
+        remote.remove(pluginID: pluginID, siteID: siteID, success: success, failure: failure)
+    }
+}

WordPress/Classes/Networking/Plugin Management/PluginManagementClient.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+protocol PluginManagementClient {
+    init?(with site: JetpackSiteRef)
+
+    func getPlugins(success: @escaping (SitePlugins) -> Void, failure: @escaping (Error) -> Void)
+    func updatePlugin(pluginID: String, success: @escaping (PluginState) -> Void, failure: @escaping (Error) -> Void)
+    func activatePlugin(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void)
+    func deactivatePlugin(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void)
+    func enableAutoupdates(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void)
+    func disableAutoupdates(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void)
+    func activateAndEnableAutoupdates(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void)
+    func install(pluginSlug: String, success: @escaping (PluginState) -> Void, failure: @escaping (Error) -> Void)
+    func remove(pluginID: String, success: @escaping () -> Void, failure: @escaping (Error) -> Void)
+}