Update app version to 8.0.0.0 for testing.

Merge branch 'develop' into issue/5032-new-push-notification-payload

# Conflicts:
#	config/Version.Public.xcconfig

Author: jaclync

Hardware/Hardware/CardReader/CardReaderServiceError.swift

@@ -186,6 +186,9 @@ public enum UnderlyingError: Error {
     /// The SDK will attempt to auto-disconnect for you and you should instruct your user to reconnect it.
     case readerSessionExpired
 
+    /// The underlying request returned an API error.
+    case processorAPIError
+
     /// Catch-all error case. Indicates there is something wrong with the
     /// internal state of the CardReaderService.
     case internalServiceError
@@ -305,6 +308,9 @@ updating the application or using a different reader
         case .readerSessionExpired:
             return NSLocalizedString("The card reader session has expired - please disconnect and reconnect the card reader and then try again",
                                      comment: "Error message when the card reader session has timed out.")
+        case .processorAPIError:
+            return NSLocalizedString("The payment can not be processed by the payment processor.",
+                                     comment: "Error message when the payment can not be processed (i.e. order amount is below the minimum amount allowed.)")
         case .internalServiceError:
             return NSLocalizedString("Sorry, this payment couldn’t be processed",
                                      comment: "Error message when the card reader service experiences an unexpected internal service error.")

Hardware/Hardware/CardReader/StripeCardReader/UnderlyingError+Stripe.swift

@@ -79,6 +79,8 @@ extension UnderlyingError {
             self = .requestTimedOut
         case ErrorCode.Code.sessionExpired.rawValue:
             self = .readerSessionExpired
+        case ErrorCode.Code.stripeAPIError.rawValue:
+            self = .processorAPIError
         default:
             self = .internalServiceError
         }

Hardware/HardwareTests/ErrorCodesTests.swift

@@ -154,6 +154,10 @@ final class CardReaderServiceErrorTests: XCTestCase {
         XCTAssertEqual(.readerSessionExpired, domainError(stripeCode: 9060))
     }
 
+    func test_stripe_error_api_maps_to_stripeAPI() {
+        XCTAssertEqual(.processorAPIError, domainError(stripeCode: 9020))
+    }
+
     func test_stripe_catch_all_error() {
         // Any error code not mapped to an specific error will be
         // mapped to `internalServiceError`

Networking/Networking.xcodeproj/project.pbxproj

@@ -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,12 +27,12 @@ public struct ProductCategory: Codable, Equatable, GeneratedFakeable {
     /// Public initializer for ProductCategory.
     ///
     public init(from decoder: Decoder) throws {
-        guard let siteID = decoder.userInfo[.siteID] as? Int64 else {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+
+        guard let siteID = ProductCategory.siteID(from: decoder, container: container) else {
             throw ProductCategoryDecodingError.missingSiteID
         }
 
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-
         let categoryID = try container.decode(Int64.self, forKey: .categoryID)
         // Some product endpoints don't include the parent category ID
         let parentID = container.failsafeDecodeIfPresent(Int64.self, forKey: .parentID) ?? 0
@@ -48,6 +48,8 @@ public struct ProductCategory: Codable, Equatable, GeneratedFakeable {
         try container.encode(categoryID, forKey: .categoryID)
         try container.encode(name, forKey: .name)
         try container.encode(slug, forKey: .slug)
+        try container.encode(siteID, forKey: .siteID)
+        try container.encode(parentID, forKey: .parentID)
     }
 }
 
@@ -56,13 +58,30 @@ public struct ProductCategory: Codable, Equatable, GeneratedFakeable {
 ///
 private extension ProductCategory {
     enum CodingKeys: String, CodingKey {
+        case siteID     = "siteID"
         case categoryID = "id"
         case name       = "name"
         case slug       = "slug"
         case parentID   = "parent"
     }
 }
 
+private extension ProductCategory {
+    /// Provides the siteID, that can be found as a encoded value or in the Decoder user info
+    ///
+    private static func siteID(from decoder: Decoder, container: KeyedDecodingContainer<ProductCategory.CodingKeys>) -> Int64? {
+        var siteID: Int64?
+
+        if let userInfoSiteID = decoder.userInfo[.siteID] as? Int64 {
+            siteID = userInfoSiteID
+        } else if let decodedSiteID = try? container.decode(Int64.self, forKey: .siteID) {
+            siteID = decodedSiteID
+        }
+
+        return siteID
+    }
+}
+
 
 // MARK: - Comparable Conformance
 //

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/Product/ProductCategory.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

@@ -4,6 +4,13 @@ public struct WCPayAccount: Decodable {
     public static let gatewayID = "woocommerce-payments"
 
     public let status: WCPayAccountStatusEnum
+    /// Indicates whether the payment gateway is a live account that can accept actual payments, or just a test/developer account.
+    /// Not to be confused with "test mode" which is a separate concept (see `isInTestMode`)
+    ///
+    public let isLiveAccount: Bool
+    /// Indicates whether the payment gateway is currently in "Test" or "Debug" mode
+    ///
+    public let isInTestMode: Bool
     public let hasPendingRequirements: Bool
     public let hasOverdueRequirements: Bool
     public let currentDeadline: Date?
@@ -22,6 +29,8 @@ public struct WCPayAccount: Decodable {
 
     public init(
         status: WCPayAccountStatusEnum,
+        isLiveAccount: Bool,
+        isInTestMode: Bool,
         hasPendingRequirements: Bool,
         hasOverdueRequirements: Bool,
         currentDeadline: Date?,
@@ -32,6 +41,8 @@ public struct WCPayAccount: Decodable {
         isCardPresentEligible: Bool
     ) {
         self.status = status
+        self.isLiveAccount = isLiveAccount
+        self.isInTestMode = isInTestMode
         self.hasPendingRequirements = hasPendingRequirements
         self.hasOverdueRequirements = hasOverdueRequirements
         self.currentDeadline = currentDeadline
@@ -47,6 +58,8 @@ public struct WCPayAccount: Decodable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let status = try container.decode(WCPayAccountStatusEnum.self, forKey: .status)
+        let isLiveAccount = try container.decode(Bool.self, forKey: .isLive)
+        let isInTestMode = try container.decode(Bool.self, forKey: .testMode)
         let hasPendingRequirements = try container.decode(Bool.self, forKey: .hasPendingRequirements)
         let hasOverdueRequirements = try container.decode(Bool.self, forKey: .hasOverdueRequirements)
         let currentDeadline = try container.decodeIfPresent(Date.self, forKey: .currentDeadline)
@@ -60,6 +73,8 @@ public struct WCPayAccount: Decodable {
 
         self.init(
             status: status,
+            isLiveAccount: isLiveAccount,
+            isInTestMode: isInTestMode,
             hasPendingRequirements: hasPendingRequirements,
             hasOverdueRequirements: hasOverdueRequirements,
             currentDeadline: currentDeadline,
@@ -75,6 +90,8 @@ public struct WCPayAccount: Decodable {
 public extension WCPayAccount {
     static let noAccount = WCPayAccount(
         status: .noAccount,
+        isLiveAccount: false,
+        isInTestMode: false,
         hasPendingRequirements: false,
         hasOverdueRequirements: false,
         currentDeadline: nil,
@@ -89,17 +106,19 @@ public extension WCPayAccount {
 private extension WCPayAccount {
     enum CodingKeys: String, CodingKey {
         case status = "status"
+        case isLive = "is_live"
+        case testMode = "test_mode"
         case hasPendingRequirements = "has_pending_requirements"
         case hasOverdueRequirements = "has_overdue_requirements"
         case currentDeadline = "current_deadline"
         case statementDescriptor = "statement_descriptor"
         case storeCurrencies = "store_currencies"
-        case country = "country"
+        case country
         case cardPresentEligible = "card_present_eligible"
     }
 
     enum CurrencyCodingKeys: String, CodingKey {
         case defaultCurrency = "default"
-        case supported = "supported"
+        case supported
     }
 }