Merge branch 'develop' into feature/stripe-sdk-2

Author: allendav

Networking/Networking.xcodeproj/project.pbxproj

@@ -0,0 +1,11 @@
+import Foundation
+
+
+/// Mapper: Ignore responses
+///
+struct IgnoringResponseMapper: Mapper {
+
+    func map(response: Data) throws -> Void {
+        // Do nothing, accept any type of response, including null
+    }
+}

Networking/Networking/Mapper/IgnoringResponseMapper.swift

@@ -0,0 +1,45 @@
+import Foundation
+
+/// Mapper: System Status
+///
+struct SystemStatusMapper: Mapper {
+
+    /// Site Identifier associated to the system plugins that will be parsed.
+    /// We're injecting this field via `JSONDecoder.userInfo` because the remote endpoints don't return the SiteID in the system plugin endpoint.
+    ///
+    let siteID: Int64
+
+    /// (Attempts) to convert a dictionary into [SystemPlugin].
+    ///
+    func map(response: Data) throws -> [SystemPlugin] {
+        let decoder = JSONDecoder()
+        decoder.userInfo = [
+            .siteID: siteID
+        ]
+
+        let systemStatus = try decoder.decode(SystemStatusEnvelope.self, from: response).systemStatus
+
+        /// For now, we're going to override the networkActivated Bool in each plugin to convey active or inactive -- in order to
+        /// avoid a core data change to add a Bool for activated
+        /// This will be undone in #5269
+        let activePlugins = systemStatus.activePlugins.map {
+            $0.overrideNetworkActivated(isNetworkActivated: true)
+        }
+        let inactivePlugins = systemStatus.inactivePlugins.map {
+            $0.overrideNetworkActivated(isNetworkActivated: false)
+        }
+
+        return activePlugins + inactivePlugins
+    }
+}
+
+/// System Status endpoint returns the requested account in the `data` key. This entity
+/// allows us to parse it with JSONDecoder.
+///
+private struct SystemStatusEnvelope: Decodable {
+    let systemStatus: SystemStatus
+
+    private enum CodingKeys: String, CodingKey {
+        case systemStatus = "data"
+    }
+}

Networking/Networking/Mapper/SystemPluginsMapper.swift

@@ -27,6 +27,12 @@ public struct SiteAPI: Decodable, Equatable, GeneratedFakeable {
         return .none
     }
 
+    /// Check if telemetry reporting namespace is available
+    ///
+    public var telemetryIsAvailable: Bool {
+        return namespaces.contains(WooAPIVersion.wcTelemetry.rawValue)
+    }
+
     /// Decodable Conformance.
     ///
     public init(from decoder: Decoder) throws {

Networking/Networking/Mapper/SystemStatusMapper.swift

@@ -88,6 +88,22 @@ public struct SystemPlugin: Decodable, GeneratedFakeable, GeneratedCopiable {
     }
 }
 
+extension SystemPlugin {
+    func overrideNetworkActivated(isNetworkActivated: Bool) -> SystemPlugin {
+        SystemPlugin(
+            siteID: self.siteID,
+            plugin: self.plugin,
+            name: self.name,
+            version: self.version,
+            versionLatest: self.versionLatest,
+            url: self.url,
+            authorName: self.authorName,
+            authorUrl: self.authorUrl,
+            networkActivated: isNetworkActivated
+        )
+    }
+}
+
 /// Defines all of the SystemPlugin CodingKeys.
 ///
 private extension SystemPlugin {

Networking/Networking/Model/SiteAPI.swift

@@ -0,0 +1,35 @@
+/// Represent a System Status.
+/// Note: We are only decoding the active and inactive plugins portions at the moment.
+///
+public struct SystemStatus: Decodable {
+    let activePlugins: [SystemPlugin]
+    let inactivePlugins: [SystemPlugin]
+
+    public init(
+        activePlugins: [SystemPlugin],
+        inactivePlugins: [SystemPlugin]
+    ) {
+        self.activePlugins = activePlugins
+        self.inactivePlugins = inactivePlugins
+    }
+
+    /// The public initializer for System Status.
+    ///
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let activePlugins = try container.decode([SystemPlugin].self, forKey: .activePlugins)
+        let inactivePlugins = try container.decode([SystemPlugin].self, forKey: .inactivePlugins)
+
+        self.init(
+            activePlugins: activePlugins,
+            inactivePlugins: inactivePlugins
+        )
+    }
+}
+
+private extension SystemStatus {
+    enum CodingKeys: String, CodingKey {
+        case activePlugins = "active_plugins"
+        case inactivePlugins = "inactive_plugins"
+    }
+}

Networking/Networking/Model/SystemPlugin.swift

@@ -1,8 +1,8 @@
 import Foundation
 
-/// SystemPlugins: Remote Endpoints
+/// System Status: Remote Endpoint
 ///
-public class SystemPluginsRemote: Remote {
+public class SystemStatusRemote: Remote {
 
     /// Retrieves all of the `SystemPlugin`s for a given site.
     ///
@@ -12,26 +12,27 @@ public class SystemPluginsRemote: Remote {
     ///
     public func loadSystemPlugins(for siteID: Int64,
                             completion: @escaping (Result<[SystemPlugin], Error>) -> Void) {
-        let path = Constants.systemPluginsPath
+        let path = Constants.systemStatusPath
         let parameters = [
-            ParameterKeys.fields: ParameterValues.activeFieldValues
+            ParameterKeys.fields: [ParameterValues.activePlugins, ParameterValues.inactivePlugins]
         ]
         let request = JetpackRequest(wooApiVersion: .mark3, method: .get, siteID: siteID, path: path, parameters: parameters)
-        let mapper = SystemPluginsMapper(siteID: siteID)
+        let mapper = SystemStatusMapper(siteID: siteID)
 
         enqueue(request, mapper: mapper, completion: completion)
     }
 }
 
 // MARK: - Constants!
 //
-private extension SystemPluginsRemote {
+private extension SystemStatusRemote {
     enum Constants {
-        static let systemPluginsPath: String = "system_status"
+        static let systemStatusPath: String = "system_status"
     }
 
     enum ParameterValues {
-        static let activeFieldValues: String = "active_plugins"
+        static let activePlugins: String = "active_plugins"
+        static let inactivePlugins: String = "inactive_plugins"
     }
 
     enum ParameterKeys {

Networking/Networking/Model/SystemStatus.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+
+/// Site API: Remote Endpoints
+///
+public class TelemetryRemote: Remote {
+
+    /// Sends data to the telemetry endpoint via the Jetpack tunnel for the provided siteID.
+    /// Response is expected to be null.
+    ///
+    /// - Parameters:
+    ///   - siteID: Site for which we'll fetch the API settings.
+    ///   - versionString: App version to report.
+    ///   - completion: Closure to be executed upon completion.
+    ///
+    public func sendTelemetry(for siteID: Int64, versionString: String, completion: @escaping (Result<Void, Error>) -> Void) {
+        let path = "tracker"
+        let parameters = ["platform": "ios", "version": versionString]
+        let request = JetpackRequest(wooApiVersion: .wcTelemetry, method: .post, siteID: siteID, path: path, parameters: parameters)
+        let mapper = IgnoringResponseMapper()
+
+        enqueue(request, mapper: mapper, completion: completion)
+    }
+}

…working/Remote/SystemPluginsRemote.swift …tworking/Remote/SystemStatusRemote.swiftNetworking/Networking/Remote/SystemPluginsRemote.swift renamed to Networking/Networking/Remote/SystemStatusRemote.swift Networking/Networking/Remote/SystemPluginsRemote.swift renamed to Networking/Networking/Remote/SystemStatusRemote.swift

@@ -38,6 +38,11 @@ public enum WooAPIVersion: String {
     ///
     case addOnsV1 = "wc-product-add-ons/v1"
 
+    /// WooCommerce Telemetry.
+    /// Only works on WC 5.9.0 and up.
+    ///
+    case wcTelemetry = "wc-telemetry"
+
     /// Returns the path for the current API Version
     ///
     var path: String {