Merge branch 'trunk' into woomob-1124-remote-feature-flag

Author: itsmeichigo

Modules/Sources/Fakes/Networking.generated.swift

@@ -1774,7 +1774,10 @@ extension Networking.Site {
             isAdmin: .fake(),
             wasEcommerceTrial: .fake(),
             hasSSOEnabled: .fake(),
-            applicationPasswordAvailable: .fake()
+            applicationPasswordAvailable: .fake(),
+            isGarden: false,
+            gardenName: nil,
+            gardenPartner: nil
         )
     }
 }

Modules/Sources/Networking/Model/Copiable/Models+Copiable.generated.swift

@@ -2747,7 +2747,10 @@ extension Networking.Site {
         isAdmin: CopiableProp<Bool> = .copy,
         wasEcommerceTrial: CopiableProp<Bool> = .copy,
         hasSSOEnabled: CopiableProp<Bool> = .copy,
-        applicationPasswordAvailable: CopiableProp<Bool> = .copy
+        applicationPasswordAvailable: CopiableProp<Bool> = .copy,
+        isGarden: CopiableProp<Bool> = .copy,
+        gardenName: CopiableProp<String?> = .copy,
+        gardenPartner: CopiableProp<String?> = .copy
     ) -> Networking.Site {
         let siteID = siteID ?? self.siteID
         let name = name ?? self.name
@@ -2772,6 +2775,9 @@ extension Networking.Site {
         let wasEcommerceTrial = wasEcommerceTrial ?? self.wasEcommerceTrial
         let hasSSOEnabled = hasSSOEnabled ?? self.hasSSOEnabled
         let applicationPasswordAvailable = applicationPasswordAvailable ?? self.applicationPasswordAvailable
+        let isGarden = isGarden ?? self.isGarden
+        let gardenName = gardenName ?? self.gardenName
+        let gardenPartner = gardenPartner ?? self.gardenPartner
 
         return Networking.Site(
             siteID: siteID,
@@ -2796,7 +2802,10 @@ extension Networking.Site {
             isAdmin: isAdmin,
             wasEcommerceTrial: wasEcommerceTrial,
             hasSSOEnabled: hasSSOEnabled,
-            applicationPasswordAvailable: applicationPasswordAvailable
+            applicationPasswordAvailable: applicationPasswordAvailable,
+            isGarden: isGarden,
+            gardenName: gardenName,
+            gardenPartner: gardenPartner
         )
     }
 }

Modules/Sources/Networking/Model/Product/Product.swift

@@ -457,7 +457,7 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
                                                                     // `true`
                                                                     value.lowercased() == Values.manageStockParent ? true : false
                                                                 })
-        ]) ?? false
+                                                            ]) ?? false
 
         // Even though WooCommerce Core returns Int or null values,
         // some plugins alter the field value from Int to Decimal or String.
@@ -535,15 +535,17 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
         let menuOrder = try container.decode(Int.self, forKey: .menuOrder)
 
         // Filter out metadata if the key is prefixed with an underscore (internal meta keys)
-        let customFields = (try? container.decode([MetaData].self, forKey: .metadata).filter({ !$0.key.hasPrefix("_")})) ?? []
+        // Support both array format and object keyed by index strings
+        let allMetaData = [MetaData].decodeFlexibly(from: container, forKey: .metadata)
+        let customFields = allMetaData.filter { !$0.key.hasPrefix("_") }
 
         // In some isolated cases, it appears to be some malformed meta-data that causes this line to throw hence the whole product decoding to throw.
         // Since add-ons are optional, `try?` will be used to prevent the whole decoding to stop.
         // https://github.com/woocommerce/woocommerce-ios/issues/4205
         let addOns = (try? container.decodeIfPresent(ProductAddOnEnvelope.self, forKey: .metadata)?.revolve()) ?? []
 
-        let metaDataExtractor = try? container.decodeIfPresent(ProductMetadataExtractor.self, forKey: .metadata)
-        let isSampleItem = (metaDataExtractor?.extractStringValue(forKey: MetadataKeys.headStartPost) == Values.headStartValue)
+        let metaDataExtractor = ProductMetadataExtractor(metadata: allMetaData)
+        let isSampleItem = (metaDataExtractor.extractStringValue(forKey: MetadataKeys.headStartPost) == Values.headStartValue)
 
         // Product Bundle properties
         // Uses failsafe decoding because non-bundle product types can return unexpected value types.
@@ -561,7 +563,7 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
         let compositeComponents = try container.decodeIfPresent([ProductCompositeComponent].self, forKey: .compositeComponents) ?? []
 
         // Subscription properties
-        let subscription = try? metaDataExtractor?.extractProductSubscription()
+        let subscription = try? metaDataExtractor.extractProductSubscription()
 
         // Min/Max Quantities properties
         let minAllowedQuantity = container.failsafeDecodeIfPresent(stringForKey: .minAllowedQuantity)

Modules/Sources/Networking/Model/Product/ProductMetadataExtractor.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressShared
+import NetworkingCore
 
 /// Helper to extract specific data from inside `Product` metadata.
 /// Sample Json:
@@ -21,25 +22,23 @@ import WordPressShared
 /// }
 /// ]
 ///
-internal struct ProductMetadataExtractor: Decodable {
+struct ProductMetadataExtractor {
 
-    private typealias DecodableDictionary = [String: AnyDecodable]
     private typealias AnyDictionary = [String: Any?]
 
     /// Internal metadata representation
     ///
-    private let metadata: [DecodableDictionary]
+    private let metadata: [MetaData]
 
-    /// Decode main metadata array as an untyped dictionary.
+    /// Initialize with already-decoded metadata array
     ///
-    init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        self.metadata = try container.decode([DecodableDictionary].self)
+    init(metadata: [MetaData]) {
+        self.metadata = metadata
     }
 
     /// Searches product metadata for subscription data and converts it to a `ProductSubscription` if possible.
     ///
-    internal func extractProductSubscription() throws -> ProductSubscription? {
+    func extractProductSubscription() throws -> ProductSubscription? {
         let subscriptionMetadata = filterMetadata(with: Constants.subscriptionPrefix)
 
         guard !subscriptionMetadata.isEmpty else {
@@ -54,30 +53,33 @@ internal struct ProductMetadataExtractor: Decodable {
 
     /// Extracts a `String` metadata value for the provided key.
     ///
-    internal func extractStringValue(forKey key: String) -> String? {
+    func extractStringValue(forKey key: String) -> String? {
         let metaData = filterMetadata(with: key)
         let keyValueMetadata = getKeyValueDictionary(from: metaData)
         return keyValueMetadata.valueAsString(forKey: key)
     }
 
     /// Filters product metadata using the provided prefix.
     ///
-    private func filterMetadata(with prefix: String) -> [DecodableDictionary] {
-        metadata.filter { object in
-            let objectKey = object["key"]?.value as? String ?? ""
-            return objectKey.hasPrefix(prefix)
-        }
+    private func filterMetadata(with prefix: String) -> [MetaData] {
+        metadata.filter { $0.key.hasPrefix(prefix) }
     }
 
     /// Parses provided metadata to return a dictionary with each metadata object's key and value.
     ///
-    private func getKeyValueDictionary(from metadata: [DecodableDictionary]) -> AnyDictionary {
-        metadata.reduce(AnyDictionary()) { (dict, object) in
-            var newDict = dict
-            let objectKey = object["key"]?.value as? String ?? ""
-            let objectValue = object["value"]?.value
-            newDict.updateValue(objectValue, forKey: objectKey)
-            return newDict
+    private func getKeyValueDictionary(from metadata: [MetaData]) -> AnyDictionary {
+        metadata.reduce(into: AnyDictionary()) { dict, object in
+            // For JSON values, decode them to get the actual object
+            if object.value.isJson {
+                if let data = object.value.stringValue.data(using: .utf8),
+                   let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []) {
+                    dict[object.key] = jsonObject
+                } else {
+                    dict[object.key] = object.value.stringValue
+                }
+            } else {
+                dict[object.key] = object.value.stringValue
+            }
         }
     }
 

Modules/Sources/Networking/Model/Product/ProductVariation.swift

@@ -279,7 +279,7 @@ public struct ProductVariation: Codable, GeneratedCopiable, Equatable, Generated
                                                                     }
                                                                     return false
                                                                 })
-        ]) ?? false
+                                                            ]) ?? false
 
         // Even though WooCommerce Core returns Int or null values,
         // some plugins alter the field value from Int to Decimal or String.
@@ -309,7 +309,9 @@ public struct ProductVariation: Codable, GeneratedCopiable, Equatable, Generated
         let menuOrder = try container.decode(Int64.self, forKey: .menuOrder)
 
         // Subscription settings for subscription variations
-        let subscription = try? container.decodeIfPresent(ProductMetadataExtractor.self, forKey: .metadata)?.extractProductSubscription()
+        let allMetaData = [MetaData].decodeFlexibly(from: container, forKey: .metadata)
+        let metaDataExtractor = ProductMetadataExtractor(metadata: allMetaData)
+        let subscription = try? metaDataExtractor.extractProductSubscription()
 
         // Min/Max Quantities properties
         let minAllowedQuantity = container.failsafeDecodeIfPresent(stringForKey: .minAllowedQuantity)

Modules/Sources/Networking/Model/Site.swift

@@ -97,6 +97,18 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
     ///
     public let applicationPasswordAvailable: Bool
 
+    /// Whether the site is running on Garden architecture
+    ///
+    public let isGarden: Bool
+
+    /// The site Garden name is present
+    ///
+    public let gardenName: String?
+
+    /// The site Garden partner if present
+    ///
+    public let gardenPartner: String?
+
     /// Decodable Conformance.
     ///
     public init(from decoder: Decoder) throws {
@@ -140,6 +152,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
             return jetpackModules.contains(OptionKeys.sso.rawValue) == true
         }()
 
+        let isGarden = try siteContainer.decodeIfPresent(Bool.self, forKey: .isGarden) ?? false
+        let gardenName = try siteContainer.decodeIfPresent(String.self, forKey: .gardenName)
+        let gardenPartner = try siteContainer.decodeIfPresent(String.self, forKey: .gardenPartner)
+
         self.init(siteID: siteID,
                   name: name,
                   description: description,
@@ -162,7 +178,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                   isAdmin: isAdmin,
                   wasEcommerceTrial: wasEcommerceTrial,
                   hasSSOEnabled: hasSSOEnabled,
-                  applicationPasswordAvailable: false) // to be updated by fetching SiteAPI
+                  applicationPasswordAvailable: false, // to be updated by fetching SiteAPI
+                  isGarden: isGarden,
+                  gardenName: gardenName,
+                  gardenPartner: gardenPartner)
     }
 
     /// Designated Initializer.
@@ -189,7 +208,10 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
                 isAdmin: Bool,
                 wasEcommerceTrial: Bool,
                 hasSSOEnabled: Bool,
-                applicationPasswordAvailable: Bool) {
+                applicationPasswordAvailable: Bool,
+                isGarden: Bool,
+                gardenName: String?,
+                gardenPartner: String?) {
         self.siteID = siteID
         self.name = name
         self.description = description
@@ -213,6 +235,9 @@ public struct Site: Decodable, Equatable, Hashable, GeneratedFakeable, Generated
         self.wasEcommerceTrial = wasEcommerceTrial
         self.hasSSOEnabled = hasSSOEnabled
         self.applicationPasswordAvailable = applicationPasswordAvailable
+        self.isGarden = isGarden
+        self.gardenName = gardenName
+        self.gardenPartner = gardenPartner
     }
 }
 
@@ -264,6 +289,9 @@ private extension Site {
         case isJetpackConnected          = "jetpack_connection"
         case wasEcommerceTrial           = "was_ecommerce_trial"
         case jetpackModules = "jetpack_modules"
+        case isGarden = "is_garden"
+        case gardenName = "garden_name"
+        case gardenPartner = "garden_partner"
     }
 
     enum PlanInfo: String, CodingKey {

Modules/Sources/Networking/Model/WordPressSite.swift

@@ -110,7 +110,10 @@ public extension WordPressSite {
               isAdmin: false,
               wasEcommerceTrial: false,
               hasSSOEnabled: false,
-              applicationPasswordAvailable: false)
+              applicationPasswordAvailable: false,
+              isGarden: false,
+              gardenName: nil,
+              gardenPartner: nil)
     }
 
     struct Authentication: Decodable {

Modules/Sources/Networking/Remote/SiteRemote.swift

@@ -338,12 +338,37 @@ extension SiteRemote {
     enum SiteParameter {
         enum Fields {
             static let key = "fields"
-            static let value = "ID,name,description,URL,options,jetpack,jetpack_connection,capabilities,was_ecommerce_trial,plan,jetpack_modules"
+            static let value = [
+                "ID",
+                "name",
+                "description",
+                "URL",
+                "options",
+                "jetpack",
+                "jetpack_connection",
+                "capabilities",
+                "was_ecommerce_trial",
+                "plan",
+                "jetpack_modules",
+                "is_garden",
+                "garden_name",
+                "garden_partner"
+            ].joined(separator: ",")
         }
         enum Options {
             static let key = "options"
-            static let value =
-            "timezone,is_wpcom_store,woocommerce_is_active,gmt_offset,jetpack_connection_active_plugins,admin_url,login_url,frame_nonce,blog_public,can_blaze"
+            static let value = [
+                "timezone",
+                "is_wpcom_store",
+                "woocommerce_is_active",
+                "gmt_offset",
+                "jetpack_connection_active_plugins",
+                "admin_url",
+                "login_url",
+                "frame_nonce",
+                "blog_public",
+                "can_blaze"
+            ].joined(separator: ",")
         }
     }
 }

Modules/Sources/NetworkingCore/Model/MetaDataArray+FlexibleDecoding.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+/// Extension to support flexible decoding of MetaData arrays
+/// Handles both standard array format and object format keyed by index strings
+extension Array where Element == MetaData {
+
+    /// Custom decoding from container that supports both array and dictionary formats
+    public static func decodeFlexibly<K>(from container: KeyedDecodingContainer<K>,
+                                         forKey key: KeyedDecodingContainer<K>.Key) -> [MetaData] {
+        // Try to decode as array first (standard format)
+        if let metaDataArray = try? container.decode([MetaData].self, forKey: key) {
+            return metaDataArray
+        }
+
+        // Try to decode as object keyed by index strings
+        if let metaDataDict = try? container.decode([String: MetaData].self, forKey: key) {
+            return Array(metaDataDict.values)
+        }
+
+        // Fallback to empty array
+        DDLogWarn("⚠️ Could not decode metadata as either an array or object keyed by index strings. Falling back to empty array.")
+        return []
+    }
+}

Modules/Sources/NetworkingCore/Model/Order.swift

@@ -201,7 +201,10 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
         // "payment_url" is only available on stores with version >= 6.4
         let paymentURL = try container.decodeIfPresent(URL.self, forKey: .paymentURL)
 
-        let allOrderMetaData = try? container.decode([MetaData].self, forKey: .metadata)
+        let allOrderMetaData: [MetaData]? = {
+            let metadata = [MetaData].decodeFlexibly(from: container, forKey: .metadata)
+            return metadata.isEmpty ? nil : metadata
+        }()
         var chargeID: String? = nil
         chargeID = allOrderMetaData?.first(where: { $0.key == "_charge_id" })?.value.stringValue