Merge pull request #10 from SourcePointUSA/develop

Release 2.0.0
SourcePointUSA · Aug 18, 2023 · c4c3eed · c4c3eed
2 parents ac8b8ec + 316c924
commit c4c3eed
Show file tree

Hide file tree

Showing 72 changed files with 1,460 additions and 172 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,4 +53,6 @@ Thumbs.db.meta
 *.DS_Store
 
 # VS Code
-*.vscode
+*.vscode
+
+*.keystore
diff --git a/Assets/ConsentManagementProvider/Plugins/Android.meta b/Assets/ConsentManagementProvider/Plugins/Android.meta
diff --git a/Assets/ConsentManagementProvider/Plugins/Android/cmp.meta b/Assets/ConsentManagementProvider/Plugins/Android/cmp.meta
diff --git a/Assets/ConsentManagementProvider/Plugins/iOS/Source/Unity.mm b/Assets/ConsentManagementProvider/Plugins/iOS/Source/Unity.mm
@@ -19,9 +19,9 @@ void _addTargetingParamForCampaignType(int campaignType, char * key, char * valu
         [unityBridgePlugin addTargetingParamForCampaignType:campaignType :key :value];
     }
 
-    void _consrtuctLib(int accountId, char* propName, int arrSize, int campaignTypes[], int campaignsEnvironment, long timeOutSeconds)
+    void _consrtuctLib(int accountId, int propId, char* propName, int arrSize, int campaignTypes[], int campaignsEnvironment, long timeOutSeconds)
     {
-        [unityBridgePlugin consrtuctLib:accountId _:propName _:arrSize _:campaignTypes _: campaignsEnvironment _: timeOutSeconds];
+        [unityBridgePlugin consrtuctLib:accountId _:propId _:propName _:arrSize _:campaignTypes _: campaignsEnvironment _: timeOutSeconds];
     }
 
     void _loadMessage(char * authId)

diff --git a/Assets/ConsentManagementProvider/Plugins/iOS/Source/UnityController.h b/Assets/ConsentManagementProvider/Plugins/iOS/Source/UnityController.h
@@ -7,7 +7,7 @@
 
 -(void) setUnityCallback :(const char *)gameObjectName;
 
--(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (int[]) campaignTypes _: (int) campaignsEnvironment _: (long) timeOutSeconds;
+-(void) consrtuctLib : (int) accountId _:(int) propId _:(char*) propName _: (int) arrSize _: (int[]) campaignTypes _: (int) campaignsEnvironment _: (long) timeOutSeconds;
 
 -(void) loadMessage : (char*) authId;
 

diff --git a/Assets/ConsentManagementProvider/Plugins/iOS/Source/UnityController.m b/Assets/ConsentManagementProvider/Plugins/iOS/Source/UnityController.m
@@ -109,7 +109,7 @@ - (void) addTargetingParamForCampaignType : (int) campaignType : (char*) key : (
 //    NSLog(@"params => %@", params);
 }
 
--(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (int[]) campaignTypes _: (int) campaignsEnvironment _: (long) timeOutSeconds
+-(void) consrtuctLib : (int) accountId _:(int) propId _:(char*) propName _: (int) arrSize _: (int[]) campaignTypes _: (int) campaignsEnvironment _: (long) timeOutSeconds
 {
     SPError * err = [self checkIfPropNameNotNull: propName];
     if(err != nil)
@@ -129,6 +129,8 @@ -(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (i
             NSMutableDictionary<NSString *, NSString *> * gdprParams;
             NSMutableDictionary<NSString *, NSString *> * ccpaParams;
             NSMutableDictionary<NSString *, NSString *> * ios14Params;
+
+
 
             for (int index=0; index < arrSize; index++)
             {
@@ -149,7 +151,9 @@ -(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (i
 //                            initWithEnvironment:env
 //                            targetingParams:gdprParams];
                     gdpr = [[SPCampaign alloc]
-                            initWithTargetingParams:gdprParams];
+                            initWithTargetingParams:gdprParams
+                            groupPmId:nil
+                            gppConfig:nil];
 
                 }else if(type == SPCampaignTypeCcpa){
                     ccpaParams = campaignParams;
@@ -160,7 +164,10 @@ -(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (i
 //                            initWithEnvironment:env
 //                            targetingParams: ccpaParams];
                     ccpa = [[SPCampaign alloc]
-                            initWithTargetingParams: ccpaParams];
+                            initWithTargetingParams: ccpaParams
+                            groupPmId:nil
+                            gppConfig:nil];
+
                 }else if(type == SPCampaignTypeIos14){
                     ios14Params = campaignParams;
                     if([ios14Params count] == 0){
@@ -170,7 +177,10 @@ -(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (i
 //                             initWithEnvironment:env
 //                             targetingParams: ios14Params];
                     ios14 = [[SPCampaign alloc]
-                             initWithTargetingParams: ios14Params];
+                             initWithTargetingParams: ios14Params
+                             groupPmId:nil
+                             gppConfig:nil];
+
                 }else{
                     SPError *myErr = [SPError errorWithDomain:@"SPConsentManager"
                                               code:100
@@ -182,19 +192,22 @@ -(void) consrtuctLib : (int) accountId _:(char*) propName _: (int) arrSize _: (i
             }
 //            NSLog(@"%@ ||| %@ ||| %@", gdpr.description, ccpa.description, ios14.description);
 
+            SPCampaignEnv * env = campaignsEnvironment;
+
             SPCampaigns * campaigns = [[SPCampaigns alloc]
                                        initWithGdpr: gdpr
                                        ccpa: ccpa
-                                       ios14: ios14];
+                                       ios14: ios14
+                                       environment:env];
 
-            SPCampaignEnv * env = campaignsEnvironment;
             NSLog(@" ENVIRONMENT: %ld", (long)env);
 
             consentManager = [[SPConsentManager alloc]
                     initWithAccountId:accountId
+                    propertyId:propId
                     propertyName: propertyName
-                    campaignsEnv: env
                     campaigns: campaigns
+                    language: nil
                     delegate: self];
             consentManager.messageTimeoutInSeconds = timeOutSeconds;
         } @catch (SPError *exception) {
@@ -209,10 +222,10 @@ -(void) loadMessage : (char*) authId
     {
         NSString * nsAuthId = [self convertCharToNSString: authId];
         if ([nsAuthId isEqual: @""] || authId == nil) {
-            [consentManager loadMessageForAuthId: NULL];
+            [consentManager loadMessageForAuthId: NULL publisherData: NULL];
 //            NSLog(@"loadMessage");
         }else{
-            [consentManager loadMessageForAuthId: nsAuthId];
+            [consentManager loadMessageForAuthId: nsAuthId publisherData: NULL];
 //            NSLog(@"loadMessage with authId");
         }
     }
@@ -222,7 +235,7 @@ - (void) loadGDPRPrivacyManager : (char *) pmId _: (int) tabId{
     if([self checkIfConsentManagerNotNull]){
         NSString * nsPmId = [self convertCharToNSString:pmId];
         SPPrivacyManagerTab tab = tabId;
-        [consentManager loadGDPRPrivacyManagerWithId:nsPmId tab:tab];
+        [consentManager loadGDPRPrivacyManagerWithId:nsPmId tab:tab useGroupPmIfAvailable:NULL];
     }
 }
 
@@ -231,7 +244,7 @@ - (void) loadCCPAPrivacyManager : (char *) pmId _: (int) tabId{
         NSString * nsPmId = [self convertCharToNSString:pmId];
         SPPrivacyManagerTab tab = tabId;
 //        NSLog(@"pmId %s", pmId);
-        [consentManager loadCCPAPrivacyManagerWithId:nsPmId tab:tab];
+        [consentManager loadCCPAPrivacyManagerWithId:nsPmId tab:tab useGroupPmIfAvailable:NULL];
     }
 }
 

diff --git a/Assets/ConsentManagementProvider/Scripts/facade/CMP.cs b/Assets/ConsentManagementProvider/Scripts/facade/CMP.cs
@@ -15,10 +15,11 @@ public static class CMP
                                         || Application.platform == RuntimePlatform.WindowsEditor
                                         || Application.platform == RuntimePlatform.OSXEditor;
 
-
         public static void Initialize(
             List<SpCampaign> spCampaigns, 
-            int accountId, string propertyName, 
+            int accountId,
+            int propertyId,
+            string propertyName, 
             MESSAGE_LANGUAGE language, 
             CAMPAIGN_ENV campaignsEnvironment,
             long messageTimeoutInSeconds = 3)
@@ -39,6 +40,7 @@ public static void Initialize(
                 }
                 ConsentWrapperAndroid.Instance.InitializeLib(spCampaigns: spCampaigns,
                                                             accountId: accountId,
+                                                            propertyId: propertyId,
                                                             propertyName: propertyName,
                                                             language: language,
                                                             campaignsEnvironment: campaignsEnvironment,
@@ -50,6 +52,7 @@ public static void Initialize(
                 CreateBroadcastExecutorGO();
                 ConsentWrapperIOS.Instance.InitializeLib(spCampaigns: spCampaigns,
                                                         accountId: accountId,
+                                                        propertyId: propertyId,
                                                         propertyName: propertyName,
                                                         language: language,
                                                         campaignsEnvironment: campaignsEnvironment,

diff --git a/Assets/ConsentManagementProvider/Scripts/interface/IOnConsentSpFinished.cs b/Assets/ConsentManagementProvider/Scripts/interface/IOnConsentSpFinished.cs
@@ -0,0 +1,11 @@
+using System;
+using ConsentManagementProviderLib.EventHandlerInterface;
+using UnityEngine.EventSystems;
+
+namespace ConsentManagementProviderLib
+{
+    public interface IOnConsentSpFinished : IConsentEventHandler
+    {
+        void OnConsentSpFinished(SpConsents spConsent);
+    }
+}
diff --git a/Assets/ConsentManagementProvider/Scripts/interface/IOnConsentSpFinished.cs.meta b/Assets/ConsentManagementProvider/Scripts/interface/IOnConsentSpFinished.cs.meta