Merge pull request #74 from SourcePointUSA/develop

Nevazhnovu · web-flow · commit 4dbba6a5ee98 · 2025-12-23T14:34:55.000+01:00
Release 3.2.0
diff --git a/Assets/ConsentManagementProvider/Scripts/model/SpConsents.cs b/Assets/ConsentManagementProvider/Scripts/model/SpConsents.cs
@@ -2,9 +2,11 @@
 {
     public class SpConsents
     {
-        public SpGdprConsent gdpr;
-        public SpCcpaConsent ccpa;
-        public SpUsnatConsent usnat;
+#nullable enable
+        public SpGdprConsent? gdpr;
+        public SpCcpaConsent? ccpa;
+        public SpUsnatConsent? usnat;
+#nullable disable
 
         public SpConsents(SpGdprConsent gdpr, SpCcpaConsent ccpa, SpUsnatConsent usnat)
         {
diff --git a/Assets/ConsentManagementProvider/Scripts/model/common/CcpaConsent.cs b/Assets/ConsentManagementProvider/Scripts/model/common/CcpaConsent.cs
@@ -7,32 +7,32 @@ namespace ConsentManagementProvider
     public class CcpaConsent
     {
         public string uuid;
-        public string status;
         public string uspstring;
         public List<string> rejectedVendors;
         public List<string> rejectedCategories;
-        public string childPmId;
         public bool applies;
+        public Dictionary<string, object> GPPData;
 #nullable enable
+        public string? status;
+        public string? childPmId;
         public bool? signedLspa;
-        public string webConsentPayload;
+        public string? webConsentPayload;
 		public ConsentStatus? consentStatus;
-        public Dictionary<string, object>? GPPData;
 #nullable disable
 
         public CcpaConsent(
 #nullable enable
                         string uuid,
-                        string status,
+                        string? status,
                         string uspstring,
                         List<string> rejectedVendors,
                         List<string> rejectedCategories,
-                        string childPmId,
+                        string? childPmId,
                         bool applies,
                         bool? signedLspa,
-                        string webConsentPayload,
+                        string? webConsentPayload,
                         ConsentStatus? consentStatus,
-                        Dictionary<string, object>? GPPData
+                        Dictionary<string, object> GPPData
 #nullable disable
         ) {
             this.uuid = uuid;
@@ -52,16 +52,16 @@ public CcpaConsent(
         public CcpaConsent(
 #nullable enable
                         string uuid,
-                        string status,
+                        string? status,
                         string uspstring,
                         string[] rejectedVendors,
                         string[] rejectedCategories,
-                        string childPmId,
+                        string? childPmId,
                         bool applies,
                         bool? signedLspa,
-                        string webConsentPayload,
-						ConsentStatus consentStatus,
-                        Dictionary<string, object>? GPPData
+                        string? webConsentPayload,
+						ConsentStatus? consentStatus,
+                        Dictionary<string, object> GPPData
 #nullable disable
         ) {
             this.uuid = uuid;
diff --git a/Assets/ConsentManagementProvider/Scripts/model/common/GdprConsent.cs b/Assets/ConsentManagementProvider/Scripts/model/common/GdprConsent.cs
@@ -6,14 +6,14 @@ namespace ConsentManagementProvider
     public class GdprConsent
     {
         public bool applies;
-        public string uuid;
-        public string webConsentPayload;
         public string euconsent;
-        public Dictionary<string, object> TCData;
         public Dictionary<string, SpVendorGrant> grants;
-		public List<string> acceptedCategories;
-        public ConsentStatus consentStatus;
+        public Dictionary<string, object> TCData;
 #nullable enable
+        public string? uuid;
+        public string? webConsentPayload;
+		public List<string>? acceptedCategories;
+        public ConsentStatus? consentStatus;
         public SPGCMData? googleConsentMode;
 #nullable disable
 
diff --git a/Assets/ConsentManagementProvider/Scripts/model/common/UsnatConsent.cs b/Assets/ConsentManagementProvider/Scripts/model/common/UsnatConsent.cs
@@ -6,15 +6,15 @@ namespace ConsentManagementProvider
 {
     public class UsnatConsent
     {
-#nullable enable
-        public string? uuid;
-        public Dictionary<string, object>? GPPData;
-#nullable disable
         public bool applies;
         public List<ConsentString> consentStrings;
         public List<Consentable> vendors;
         public List<Consentable> categories;
-		public StatusesUsnat statuses;
+#nullable enable
+        public string? uuid;
+        public Dictionary<string, object>? GPPData;
+		public StatusesUsnat? statuses;
+#nullable disable
 
         public UsnatConsent(
 #nullable enable
@@ -97,9 +97,11 @@ public string ToFullString()
 
     public class StatusesUsnat
     {        
+#nullable enable
         public bool? rejectedAny, consentedToAll, consentedToAny,
             hasConsentData, sellStatus, shareStatus,
             sensitiveDataStatus, gpcStatus, previousOptInAll;
+#nullable disable
 
         internal static StatusesUsnat collectData(ConsentStatus status)
         {
diff --git a/Assets/ExampleApp/Scripts/PrivacySettings.cs b/Assets/ExampleApp/Scripts/PrivacySettings.cs
@@ -32,9 +32,9 @@ public class PrivacySettings : MonoBehaviour, IOnConsentReady, IOnConsentSpFinis
     public Button clearDataButton;
     public Text sdkStatus;
 
-    public static string statusCampaignGDPR = "custom";
-    public static string statusCampaignCCPA = "custom";
-    public static string statusCampaignUSNAT = "custom";
+    public static string statusCampaignGDPR = "default";
+    public static string statusCampaignCCPA = "default";
+    public static string statusCampaignUSNAT = "default";
 
     private MESSAGE_LANGUAGE language
     {
@@ -166,7 +166,7 @@ public void OnClearDataPress()
 
     public void OnConsentReady(SpConsents consents)
     {
-        storedConsentString = consents.gdpr.consents.euconsent ?? "--";
+        storedConsentString = consents.gdpr?.consents.euconsent ?? "--";
         if(CMP.Instance.UseGDPR) 
             CmpDebugUtil.Log(consents.gdpr.consents.ToFullString());
         if(CMP.Instance.UseCCPA) 
@@ -221,35 +221,35 @@ string UpdateStatuses(SpConsents consents, CAMPAIGN_TYPE campaign)
     {
         if (campaign == CAMPAIGN_TYPE.GDPR)
         {
-            bool rejectedAny = (bool)consents.gdpr.consents.consentStatus.rejectedAny;
-            bool rejectedLI = (bool)consents.gdpr.consents.consentStatus.rejectedLI;
-            bool consentedAll = (bool)consents.gdpr.consents.consentStatus.consentedAll;
-            bool consentedToAny = (bool)consents.gdpr.consents.consentStatus.consentedToAny;
+            bool rejectedAny = consents.gdpr?.consents.consentStatus.rejectedAny ?? false;
+            bool rejectedLI = consents.gdpr?.consents.consentStatus.rejectedLI ?? false;
+            bool consentedAll = consents.gdpr?.consents.consentStatus.consentedAll ?? false;
+            bool consentedToAny = consents.gdpr?.consents.consentStatus.consentedToAny ?? false;
 
             if (consentedAll && consentedToAny)
                 return "accepted";
-            else if (rejectedAny && rejectedLI)
+            else if (rejectedAny && rejectedLI && !consentedAll && !consentedToAny)
                 return "rejected";
         }
         if (campaign == CAMPAIGN_TYPE.CCPA)
         {
-            if (consents.ccpa.consents.status == "consentedAll")
+            if (consents.ccpa?.consents.status == "consentedAll")
                 return "accepted";
-            else if (consents.ccpa.consents.status == "rejectedAll")
+            else if (consents.ccpa?.consents.status == "rejectedAll")
                 return "rejected";
         }
         if (campaign == CAMPAIGN_TYPE.USNAT)
         {
-            bool rejectedAny = (bool)consents.usnat.consents.statuses.rejectedAny;
-            bool consentedToAll = (bool)consents.usnat.consents.statuses.consentedToAll;
-            bool consentedToAny = (bool)consents.usnat.consents.statuses.consentedToAny;
+            bool rejectedAny = consents.usnat?.consents.statuses.rejectedAny ?? false;
+            bool consentedToAll = consents.usnat?.consents.statuses.consentedToAll ?? false;
+            bool consentedToAny = consents.usnat?.consents.statuses.consentedToAny ?? false;
 
             if (consentedToAll && consentedToAny)
                 return "accepted";
             else if (rejectedAny)
                 return "rejected";            
         }
-        return "custom";
+        return "default";
     }
 
     private void OnDestroy()
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 3.2.0
+* [DIA-5501](https://sourcepoint.atlassian.net/browse/DIA-5501) Update consent classes according to native SDK class structure. Several things were made nullable.
+
+# 3.1.1 
+* [DIA-5912](https://sourcepoint.atlassian.net/browse/DIA-5912) In `CMPPostProcessBuild.cs`, during `OnPostProcessBuild`, move `SwiftBridge.swift` to the `Pod/ConsentViewController` folder.
+* [DIA-3802](https://sourcepoint.atlassian.net/browse/DIA-3802) Alt-Tester UI tests pipeline added
+
 # 3.1.0
 * [DIA-4326](https://sourcepoint.atlassian.net/browse/DIA-4326) Unity SDK is bumped to v7.10.1 Android & v7.7.1 iOS native SDK
 * Programmatic rejectAll feature added [#67](https://github.com/SourcePointUSA/unity-sdk/pull/67)
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.sourcepoint.unitycmp",
   "displayName": "Sourcepoint Consent Message Plugin",
-  "version": "3.1.1",
+  "version": "3.2.0",
   "unity": "2022.3",
   "description": "Native UI Privacy Manager for both GDPR and CCPA legislations.",
   "author": {
diff --git a/unitypackage/ConsentManagementProvider.unitypackage b/unitypackage/ConsentManagementProvider.unitypackage

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`	`{`
`3`	`3`	`public class SpConsents`
`4`	`4`	`{`
`5`		`- public SpGdprConsent gdpr;`
`6`		`- public SpCcpaConsent ccpa;`
`7`		`- public SpUsnatConsent usnat;`
	`5`	`+#nullable enable`
	`6`	`+ public SpGdprConsent? gdpr;`
	`7`	`+ public SpCcpaConsent? ccpa;`
	`8`	`+ public SpUsnatConsent? usnat;`
	`9`	`+#nullable disable`
`8`	`10`
`9`	`11`	`public SpConsents(SpGdprConsent gdpr, SpCcpaConsent ccpa, SpUsnatConsent usnat)`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "com.sourcepoint.unitycmp",`
`3`	`3`	`"displayName": "Sourcepoint Consent Message Plugin",`
`4`		`- "version": "3.1.1",`
	`4`	`+ "version": "3.2.0",`
`5`	`5`	`"unity": "2022.3",`
`6`	`6`	`"description": "Native UI Privacy Manager for both GDPR and CCPA legislations.",`
`7`	`7`	`"author": {`