DIA-5124 add support globalcmp

README.md

@@ -68,6 +68,7 @@ Refer to the table below regarding the different campaigns that can be implement
 | `gdpr: {}`          | Used if your property runs a GDPR TCF or GDPR Standard campaign |
 | `usnat: {}`         | Used if your property runs a U.S. Multi-State Privacy campaign  |
 | `preferences: {}`   | Used if your property runs a Preferences campaign               |
+| `globalCMP: {}`     | Used if your property runs a Global CMP campaign                |
 
 ### Set up callbacks in instance of `SPConsentManager`
 

ReactNativeCmp.podspec

@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.platforms    = { :ios => min_ios_version_supported }
   s.source       = { :git => "https://github.com/SourcePointUSA/react-native-sourcepoint-cmp.git", :tag => "#{s.version}" }
 
-  s.dependency "ConsentViewController", "7.9.1"
+  s.dependency "ConsentViewController", "7.10.0"
   s.source_files = "ios/**/*.{h,m,mm,cpp,swift}"
   s.private_header_files = "ios/**/*.h"
 

android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:8.7.2"
+    classpath "com.android.tools.build:gradle:8.7.3"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${getExtOrDefault('kotlinVersion')}"
   }
@@ -77,7 +77,7 @@ dependencies {
   implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3"
   implementation "org.jetbrains.kotlinx:kotlinx-datetime:0.6.1"
 
-  implementation "com.sourcepoint.cmplibrary:cmplibrary:7.14.1-beta2"
+  implementation "com.sourcepoint.cmplibrary:cmplibrary:7.15.0"
 }
 
 react {

android/src/main/java/com/sourcepoint/reactnativecmp/RNSourcepointCmpTypes.kt

@@ -2,14 +2,15 @@ package com.sourcepoint.reactnativecmp
 
 import com.facebook.react.bridge.ReadableMap
 import com.sourcepoint.cmplibrary.model.CampaignsEnv
+import com.sourcepoint.cmplibrary.model.CampaignsEnv.*
 import com.sourcepoint.cmplibrary.model.exposed.ActionType
 import com.sourcepoint.cmplibrary.model.exposed.ActionType.*
 import com.sourcepoint.cmplibrary.model.exposed.TargetingParam
 
 fun campaignsEnvFrom(rawValue: String?): CampaignsEnv? =
   when (rawValue) {
-    "Public" -> CampaignsEnv.PUBLIC
-    "Stage" -> CampaignsEnv.STAGE
+    "Public" -> PUBLIC
+    "Stage" -> STAGE
     else -> { null }
 }
 
@@ -18,13 +19,16 @@ data class SPCampaign(
   val supportLegacyUSPString: Boolean,
   val groupPmId: String? = null,
 ) {
-  val targetingParams = rawTargetingParam?.toHashMap()?.map { TargetingParam(it.key, it.value.toString()) } ?: emptyList()
+  val targetingParams = rawTargetingParam?.toHashMap()?.map {
+    TargetingParam(it.key, it.value.toString())
+  } ?: emptyList()
 }
 
 data class SPCampaigns(
   val gdpr: SPCampaign?,
   val usnat: SPCampaign?,
   val preferences: SPCampaign?,
+  val globalcmp: SPCampaign?,
   val environment: CampaignsEnv?
 )
 
@@ -55,5 +59,6 @@ fun ReadableMap.SPCampaigns() = SPCampaigns(
   gdpr = this.getMap("gdpr")?.SPCampaign(),
   usnat = this.getMap("usnat")?.SPCampaign(),
   preferences = this.getMap("preferences")?.SPCampaign(),
+  globalcmp = this.getMap("globalcmp")?.SPCampaign(),
   environment = campaignsEnvFrom(rawValue = this.getString("environment"))
 )

android/src/main/java/com/sourcepoint/reactnativecmp/ReactNativeCmpModule.kt

@@ -11,10 +11,10 @@ import com.sourcepoint.cmplibrary.NativeMessageController
 import com.sourcepoint.cmplibrary.SpClient
 import com.sourcepoint.cmplibrary.SpConsentLib
 import com.sourcepoint.cmplibrary.core.nativemessage.MessageStructure
-import com.sourcepoint.cmplibrary.creation.ConfigOption
+import com.sourcepoint.cmplibrary.creation.ConfigOption.SUPPORT_LEGACY_USPSTRING
 import com.sourcepoint.cmplibrary.creation.SpConfigDataBuilder
 import com.sourcepoint.cmplibrary.creation.makeConsentLib
-import com.sourcepoint.cmplibrary.data.network.util.CampaignType
+import com.sourcepoint.cmplibrary.data.network.util.CampaignType.*
 import com.sourcepoint.cmplibrary.model.ConsentAction
 import com.sourcepoint.cmplibrary.model.exposed.SPConsents
 import com.sourcepoint.cmplibrary.util.clearAllData
@@ -47,18 +47,21 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
       addPropertyId(propertyId.toInt())
       addMessageTimeout(30000)
       convertedCampaigns.gdpr?.let {
-        addCampaign(campaignType = CampaignType.GDPR, params = it.targetingParams, groupPmId = it.groupPmId)
+        addCampaign(campaignType = GDPR, params = it.targetingParams, groupPmId = it.groupPmId)
       }
       convertedCampaigns.usnat?.let {
         addCampaign(
-          campaignType = CampaignType.USNAT,
+          campaignType = USNAT,
           params = it.targetingParams,
           groupPmId = it.groupPmId,
-          configParams = if(it.supportLegacyUSPString) setOf(ConfigOption.SUPPORT_LEGACY_USPSTRING) else emptySet()
+          configParams = if(it.supportLegacyUSPString) setOf(SUPPORT_LEGACY_USPSTRING) else emptySet()
         )
       }
       convertedCampaigns.preferences?.let {
-        addCampaign(campaignType = CampaignType.PREFERENCES, params = it.targetingParams, groupPmId = it.groupPmId)
+        addCampaign(campaignType = PREFERENCES, params = it.targetingParams, groupPmId = it.groupPmId)
+      }
+      convertedCampaigns.globalcmp?.let {
+        addCampaign(campaignType = GLOBALCMP, params = it.targetingParams, groupPmId = it.groupPmId)
       }
     }.build()
 
@@ -95,12 +98,16 @@ class ReactNativeCmpModule(reactContext: ReactApplicationContext) : NativeReactN
 
   @ReactMethod
   override fun loadGDPRPrivacyManager(pmId: String) {
-    runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, CampaignType.GDPR) }
+    runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, GDPR) }
   }
 
   @ReactMethod
   override fun loadUSNatPrivacyManager(pmId: String) {
-    runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, CampaignType.USNAT) }
+    runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, USNAT) }
+  }
+
+  override fun loadGlobalCmpPrivacyManager(pmId: String) {
+    runOnMainThread { spConsentLib?.loadPrivacyManager(pmId, GLOBALCMP) }
   }
 
   companion object {

android/src/main/java/com/sourcepoint/reactnativecmp/consents/RNSPConsentable.kt

@@ -0,0 +1,17 @@
+package com.sourcepoint.reactnativecmp.consents
+
+import com.facebook.react.bridge.Arguments.createMap
+import com.facebook.react.bridge.ReadableMap
+import com.sourcepoint.cmplibrary.model.exposed.Consentable
+
+data class RNSPConsentable(override val id: String, override val consented: Boolean): Consentable, RNMappable {
+  constructor(spConsentable: Consentable): this(
+    id = spConsentable.id,
+    consented = spConsentable.consented
+  )
+
+  override fun toRN(): ReadableMap = createMap().apply {
+    putString("id", id)
+    putBoolean("consented", consented)
+  }
+}

android/src/main/java/com/sourcepoint/reactnativecmp/consents/RNSPGlobalCMPConsent.kt

@@ -0,0 +1,33 @@
+package com.sourcepoint.reactnativecmp.consents
+
+import com.facebook.react.bridge.Arguments.createArray
+import com.facebook.react.bridge.Arguments.createMap
+import com.facebook.react.bridge.ReadableMap
+import com.sourcepoint.cmplibrary.model.exposed.GlobalCmpConsent
+
+data class RNSPGlobalCMPConsent(
+  val uuid: String?,
+  val applies: Boolean,
+  val createdDate: String?,
+  val expirationDate: String?,
+  val vendors: List<RNSPConsentable>,
+  val categories: List<RNSPConsentable>
+): RNMappable {
+  constructor(globalCMP: GlobalCmpConsent) : this(
+    uuid = globalCMP.uuid,
+    applies = globalCMP.applies,
+    createdDate = globalCMP.dateCreated,
+    expirationDate = null,
+    vendors = globalCMP.vendors?.map { RNSPConsentable(it) } ?: emptyList(),
+    categories = globalCMP.categories?.map { RNSPConsentable(it) } ?: emptyList()
+  )
+
+  override fun toRN(): ReadableMap = createMap().apply {
+    putString("uuid", uuid)
+    putBoolean("applies", applies)
+    putString("createdDate", createdDate)
+    putString("expirationDate", expirationDate)
+    putArray("vendors", createArray().apply { vendors.forEach { pushMap(it.toRN()) } })
+    putArray("categories", createArray().apply { categories.forEach { pushMap(it.toRN()) } })
+  }
+}

android/src/main/java/com/sourcepoint/reactnativecmp/consents/RNSPUSNatConsent.kt

@@ -4,13 +4,10 @@ import com.facebook.react.bridge.Arguments.createArray
 import com.facebook.react.bridge.Arguments.createMap
 import com.facebook.react.bridge.ReadableMap
 import com.sourcepoint.cmplibrary.data.network.model.optimized.USNatConsentData.ConsentString
-import com.sourcepoint.cmplibrary.model.exposed.Consentable
 import com.sourcepoint.cmplibrary.model.exposed.UsNatConsent
 import com.sourcepoint.cmplibrary.model.exposed.UsNatStatuses
 import com.sourcepoint.reactnativecmp.arguments.putAny
 
-typealias SPConsentable = Consentable
-
 data class RNSPUSNatConsent(
   val uuid: String?,
   val applies: Boolean,
@@ -19,8 +16,8 @@ data class RNSPUSNatConsent(
   val consentSections: List<ConsentSection>,
   val statuses: Statuses,
   val gppData:  Map<String, Any?>,
-  val vendors: List<Consentable>,
-  val categories: List<Consentable>
+  val vendors: List<RNSPConsentable>,
+  val categories: List<RNSPConsentable>
 ): RNMappable {
   data class ConsentSection(val id: Int?, val name: String?, val consentString: String?) {
     constructor(section: ConsentString): this(
@@ -66,18 +63,6 @@ data class RNSPUSNatConsent(
     }
   }
 
-  data class Consentable(override val id: String, override val consented: Boolean): SPConsentable, RNMappable {
-    constructor(spConsentable: SPConsentable): this(
-      id = spConsentable.id,
-      consented = spConsentable.consented
-    )
-
-    override fun toRN(): ReadableMap = createMap().apply {
-      putString("id", id)
-      putBoolean("consented", consented)
-    }
-  }
-
   constructor(usnat: UsNatConsent) : this(
     uuid = usnat.uuid,
     applies = usnat.applies,
@@ -86,8 +71,8 @@ data class RNSPUSNatConsent(
     consentSections = usnat.consentStrings?.map { ConsentSection(section = it) } ?: emptyList(),
     statuses = Statuses(status = usnat.statuses),
     gppData = usnat.gppData,
-    vendors = usnat.vendors?.map { Consentable(it) } ?: emptyList(),
-    categories = usnat.categories?.map { Consentable(it) } ?: emptyList(),
+    vendors = usnat.vendors?.map { RNSPConsentable(it) } ?: emptyList(),
+    categories = usnat.categories?.map { RNSPConsentable(it) } ?: emptyList(),
   )
 
   override fun toRN(): ReadableMap = createMap().apply {

android/src/main/java/com/sourcepoint/reactnativecmp/consents/RNSPUserData.kt

@@ -1,9 +1,7 @@
 package com.sourcepoint.reactnativecmp.consents
 
-import com.facebook.react.bridge.Arguments.createArray
 import com.facebook.react.bridge.Arguments.createMap
 import com.facebook.react.bridge.ReadableMap
-import com.sourcepoint.cmplibrary.model.exposed.PreferencesConsent
 import com.sourcepoint.cmplibrary.model.exposed.SPConsents
 
 interface RNMappable {
@@ -13,17 +11,20 @@ interface RNMappable {
 data class RNSPUserData(
   val gdpr: RNSPGDPRConsent?,
   val usnat: RNSPUSNatConsent?,
-  val preferences: RNSPPreferencesConsent?
+  val preferences: RNSPPreferencesConsent?,
+  val globalCMP: RNSPGlobalCMPConsent?
 ): RNMappable {
   constructor(spData: SPConsents): this(
     gdpr = spData.gdpr?.let { RNSPGDPRConsent(gdpr = it.consent)},
     usnat = spData.usNat?.let { RNSPUSNatConsent(usnat = it.consent)},
-    preferences = spData.preferences?.let { RNSPPreferencesConsent(preferences = it.consent) }
+    preferences = spData.preferences?.let { RNSPPreferencesConsent(preferences = it.consent) },
+    globalCMP = spData.globalcmp?.let { RNSPGlobalCMPConsent(globalCMP = it.consent) }
   )
 
   override fun toRN(): ReadableMap = createMap().apply {
     gdpr?.let { putMap("gdpr", it.toRN()) }
     usnat?.let { putMap("usnat", it.toRN()) }
     preferences?.let { putMap("preferences", it.toRN()) }
+    globalCMP?.let { putMap("globalcmp", it.toRN()) }
   }
 }

example/ios/Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
   - boost (1.84.0)
-  - ConsentViewController (7.9.1):
+  - ConsentViewController (7.10.0):
     - Down (~> 0.11.0)
-    - SPMobileCore (= 0.1.7)
+    - SPMobileCore (= 0.1.9)
   - DoubleConversion (1.1.6)
   - fast_float (6.1.4)
   - FBLazyVector (0.79.2)
@@ -1660,7 +1660,7 @@ PODS:
     - React-perflogger (= 0.79.2)
     - React-utils (= 0.79.2)
   - ReactNativeCmp (1.0.0):
-    - ConsentViewController (= 7.9.1)
+    - ConsentViewController (= 7.10.0)
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1685,7 +1685,7 @@ PODS:
     - ReactCommon/turbomodule/core
     - Yoga
   - SocketRocket (0.7.1)
-  - SPMobileCore (0.1.7)
+  - SPMobileCore (0.1.9)
   - Yoga (0.0.0)
 
 DEPENDENCIES:
@@ -1919,7 +1919,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
-  ConsentViewController: cdd57de154538b2240285cdb5480d3e2fe067fa0
+  ConsentViewController: 079fad8b149491cfb52ec8bd7cf47c67eabb2b47
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: 06eeec4fe712a76acc9376682e4808b05ce978b6
   FBLazyVector: 84b955f7b4da8b895faf5946f73748267347c975
@@ -1989,9 +1989,9 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: 04d5eb15eb46be6720e17a4a7fa92940a776e584
   ReactCodegen: c63eda03ba1d94353fb97b031fc84f75a0d125ba
   ReactCommon: 76d2dc87136d0a667678668b86f0fca0c16fdeb0
-  ReactNativeCmp: 176df14602bf3363e3fe2e1c4bef16ab8ad91a6f
+  ReactNativeCmp: dd8f9f3e203c312712d937263fdc16e7bd1ba3d7
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  SPMobileCore: 880a2689597578811af343a9626311d34b462a50
+  SPMobileCore: c3bfa7dacf26f6101900afa096a9b945a89f726a
   Yoga: c758bfb934100bb4bf9cbaccb52557cee35e8bdf
 
 PODFILE CHECKSUM: decdc7519d77aa5eae65b167fa59bcfce25e15d2

example/src/App.tsx

@@ -33,10 +33,12 @@
   propertyName: 'mobile.multicampaign.demo',
   gdprPMId: '488393',
   usnatPMId: '988851',
+  globalCmpPMId: '1323762',
   campaigns: {
     gdpr: {},
     usnat: { supportLegacyUSPString: true },
     preferences: {},
+    globalcmp: {},
     environment: SPCampaignEnvironment.Public,
   } as SPCampaigns,
   ...launchArgs?.config,
@@ -108,6 +110,11 @@
     consentManager.current?.loadUSNatPrivacyManager(config.usnatPMId);
   }, []);
 
+  const onGlobalCMPPress = useCallback(() => {
+    setSDKStatus(SDKStatus.Networking);
+    consentManager.current?.loadGlobalCmpPrivacyManager(config.globalCmpPMId);
+  }, []);
+
   const onClearDataPress = useCallback(() => {
     consentManager.current?.clearLocalData();
     consentManager.current?.build(
@@ -146,12 +153,17 @@
         <Button
           title="Load GDPR PM"
           onPress={onGDPRPMPress}
-          disabled={disable}
+          disabled={disable || config.campaigns.gdpr == undefined}
         />
         <Button
           title="Load USNAT PM"
           onPress={onUSNATPMPress}
-          disabled={disable}
+          disabled={disable || config.campaigns.usnat == undefined}
+        />
+        <Button
+          title="Load GlobalCMP PM"
+          onPress={onGlobalCMPPress}
+          disabled={disable || config.campaigns.globalcmp == undefined}
         />
         <Button title="Clear All" onPress={onClearDataPress} />
         <Text testID="sdkStatus" style={styles.status}>

ios/RNSPUserData/RNSPConsentable.swift

@@ -0,0 +1,13 @@
+import ConsentViewController
+
+struct RNSPConsentable: Encodable {
+  let id: String
+  let consented: Bool
+}
+
+extension RNSPConsentable {
+  init(from consentable: SPConsentable) {
+    id = consentable.id
+    consented = consentable.consented
+  }
+}