Merge pull request #55 from SourcePointUSA/release-2.3.2

Release 2.3.2

Author: Nevazhnovu

Assets/ConsentManagementProvider/Plugins/iOS/Source/SwiftBridge.swift

@@ -165,13 +165,14 @@ import UIKit
 
 // MARK: - Manage lib
     @objc public func loadMessage(authId: String? = nil) {
-        print("PURE SWIFT loadMessage")
-        (consentManager != nil) ? 
+        print("PURE SWIFT loadMessage with authId="+(authId ?? "nil"))
+        (consentManager != nil) ?
             consentManager?.loadMessage(forAuthId: authId) :
             self.runCallback(callback: self.callbackOnErrorCallback, arg: "Library was not initialized correctly!")
     }
 
     @objc public func onClearConsentTap() {
+        print("PURE SWIFT onClearConsentTap")
         SPConsentManager.clearAllData()
         myVendorAccepted = .Unknown
     }

Assets/ConsentManagementProvider/Plugins/iOS/Source/Unity.mm

@@ -86,7 +86,12 @@ void _configLib(int accountId, int propertyId, char* propertyName, bool gdpr, bo
         [swiftBridge configLibWithAccountId:accountId propertyId:propertyId propertyName:[NSString stringWithFormat:@"%s", propertyName] gdpr:gdpr ccpa:ccpa usnat:usnat language:language gdprPmId:[NSString stringWithFormat:@"%s", gdprPmId] ccpaPmId:[NSString stringWithFormat:@"%s", ccpaPmId] usnatPmId:[NSString stringWithFormat:@"%s", usnatPmId]];
     }
 
-    void _loadMessage(char * authId)
+    void _loadMessage()
+    {
+        [swiftBridge loadMessageWithAuthId:nil];
+    }
+
+    void _loadMessageWithAuthId(char * authId)
     {
         [swiftBridge loadMessageWithAuthId:[NSString stringWithFormat:@"%s", authId]];
     }

Assets/ConsentManagementProvider/Scripts/json/JsonUnwrapper.cs

@@ -271,8 +271,8 @@ private static GdprConsent UnwrapGdprConsent(GdprConsentWrapper wrapped)
 
                     var vendorGrantValue = JToken.FromObject(vendorGrantWrapper.Value);
 
-                    if (vendorGrantValue["granted"] != null)
-                        isGranted = vendorGrantValue["granted"].ToObject<bool>();
+                    if (vendorGrantValue["vendorGrant"] != null)
+                        isGranted = vendorGrantValue["vendorGrant"].ToObject<bool>();
 
                     if (vendorGrantValue["purposeGrants"] != null)
                     {
@@ -410,4 +410,4 @@ private static UsnatConsent UnwrapUsnatConsent(UsnatConsentWrapper wrapped)
         }
         #endregion
     }
-}
+}

Assets/ConsentManagementProvider/Scripts/wrapper/iOS/ConsentWrapperIOS.cs

@@ -39,7 +39,9 @@ private set
         [DllImport("__Internal")]
         private static extern void _configLib(int accountId, int propertyId, string propertyName, bool gdpr, bool ccpa, bool usnat, MESSAGE_LANGUAGE language, string gdprPmId, string ccpaPmId, string usnatPmId);
         [DllImport("__Internal")]
-        private static extern void _loadMessage(string authId);
+        private static extern void _loadMessage();
+        [DllImport("__Internal")]
+        private static extern void _loadMessageWithAuthId(string authId);
         [DllImport("__Internal")]
         private static extern void _loadGDPRPrivacyManager();
         [DllImport("__Internal")]
@@ -126,7 +128,16 @@ public void InitializeLib(
         public void LoadMessage(string authId = null)
         {
 #if UNITY_IOS && !UNITY_EDITOR_OSX
-            _loadMessage(authId);
+            if (string.IsNullOrEmpty(authId))
+            {
+                CmpDebugUtil.Log("Calling load message without authId");
+                _loadMessage();
+            }
+            else 
+            {
+                CmpDebugUtil.Log($"Calling load message with authId={authId}");
+                _loadMessageWithAuthId(authId);
+            }
 #endif
         }
 

Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml

@@ -31,7 +31,7 @@
          * "subspecs" (optional)
            Subspecs to include for the pod.
      -->
-    <iosPod name="ConsentViewController" version="7.6.4" bitcodeEnabled="true"
+    <iosPod name="ConsentViewController" version="7.6.8" bitcodeEnabled="true"
             minTargetSdk="10.0" addToAllTargets="true">
 
     </iosPod>

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.3.2
+* Unity SDK brought v7.6.8 iOS [#55](https://github.com/SourcePointUSA/unity-sdk/pull/55)
+* [DIA-4048] (https://sourcepoint.atlassian.net/browse/DIA-4048) Fix: of the null authId interpreted as "" (an empty string) [#55](https://github.com/SourcePointUSA/unity-sdk/pull/55) 
+* Fix: JsonUnwrapper on iOS has incorrect key for VendorGrant [#57](https://github.com/SourcePointUSA/unity-sdk/pull/57) by @OmarVector 
+
 # 2.3.1
 * [DIA-3844](https://sourcepoint.atlassian.net/browse/DIA-3844) Destroy CMPiOSListenerHelper GameObject in Dispose() call and re-initialize it in CMP.Initialize() call if needed. Also, ClearAllData() method for IOS clears cached value in c# [#53](https://github.com/SourcePointUSA/unity-sdk/pull/53)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.sourcepoint.unitycmp",
   "displayName": "Sourcepoint Consent Message Plugin",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "unity": "2021.3",
   "description": "Native UI Privacy Manager for both GDPR and CCPA legislations.",
   "author": {