Added external data collection filter back in

- updated way products are mapped to PaywallProducts

Sources/SuperwallKit/Analytics/Internal Tracking/Tracking.swift

@@ -58,7 +58,10 @@ extension Superwall {
       disableVerboseEvents: verboseEvents,
       isSandbox: dependencyContainer.makeIsSandbox()
     ) {
-      await dependencyContainer.eventsQueue.enqueue(event: eventData.jsonData)
+      await dependencyContainer.eventsQueue.enqueue(
+        data: eventData.jsonData,
+        from: event
+      )
     }
     dependencyContainer.storage.coreDataManager.saveEventData(eventData)
 

Sources/SuperwallKit/Models/Product/ProductVariable.swift

@@ -11,6 +11,7 @@ struct ProductVariable: Encodable, Equatable {
   let name: String
   let attributes: JSON
 
+  /// Encodes in the format `"name": [attributes]`
   func encode(to encoder: Encoder) throws {
     // Create a container for the custom key (the product name)
     var container = encoder.container(keyedBy: DynamicCodingKey.self)

Sources/SuperwallKit/Paywall/Presentation/Internal/Presentation Request/PaywallOverrides.swift

@@ -146,16 +146,31 @@ public final class PaywallOverrides: NSObject, Sendable {
   private static func mapToPaywallProducts(
     _ products: [String: StoreProduct]
   ) -> PaywallProducts? {
-    var paywallProducts: PaywallProducts?
+    var primaryProduct: StoreProduct?
+    var secondaryProduct: StoreProduct?
+    var tertiaryProduct: StoreProduct?
+
     if let primary = products["primary"] {
-      paywallProducts = PaywallProducts(primary: primary)
+        primaryProduct = primary
     }
     if let secondary = products["secondary"] {
-      paywallProducts = PaywallProducts(secondary: secondary)
+        secondaryProduct = secondary
     }
     if let tertiary = products["tertiary"] {
-      paywallProducts = PaywallProducts(tertiary: tertiary)
+        tertiaryProduct = tertiary
     }
+
+    var paywallProducts: PaywallProducts?
+
+    // Only initialise PaywallProducts if at least one product is not nil
+    if primaryProduct != nil || secondaryProduct != nil || tertiaryProduct != nil {
+        paywallProducts = PaywallProducts(
+          primary: primaryProduct,
+          secondary: secondaryProduct,
+          tertiary: tertiaryProduct
+        )
+    }
+
     return paywallProducts
   }
 }

Sources/SuperwallKit/Storage/EventsQueue.swift

@@ -66,8 +66,26 @@ actor EventsQueue {
       }
   }
 
-  func enqueue(event: JSON) {
-    elements.append(event)
+  func enqueue(
+    data: JSON,
+    from event: Trackable
+  ) {
+    guard externalDataCollectionAllowed(from: event) else {
+      return
+    }
+    elements.append(data)
+  }
+
+  private func externalDataCollectionAllowed(from event: Trackable) -> Bool {
+    if Superwall.shared.options.isExternalDataCollectionEnabled {
+      return true
+    }
+    if event is InternalSuperwallEvent.TriggerFire
+      || event is InternalSuperwallEvent.Attributes
+      || event is UserInitiatedEvent.Track {
+      return false
+    }
+    return true
   }
 
   func flushInternal(depth: Int = 10) {