register method update

CriteoAdViewer/Sources/AdViewer/AdViewerViewController.swift

@@ -251,7 +251,7 @@ class AdViewerViewController: FormViewController {
     Criteo.resetSharedCriteo()
     let criteo = Criteo.shared()
     criteo.networkManagerDelegate = LogManager.sharedInstance()
-    criteo.registerPublisherId(publisherId, with: adUnits)
+    criteo.registerPublisherId(publisherId, withStoreId: "testStoreid", with: adUnits)
     return criteo
   }
 

CriteoAdViewer/Sources/CriteoGoogleAdapter/CRBannerCustomEvent.m

@@ -43,7 +43,9 @@ - (void)loadBannerForAdUnit:(CRBannerAdUnit *)adUnit
             mediationParams:(CRGoogleMediationParameters *)params
      childDirectedTreatment:(NSNumber *)childDirectedTreatment {
   /// Set the publicher id to
-  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId withAdUnits:@[ adUnit ]];
+  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId
+                                     withStoreId:params.storeId
+                                     withAdUnits:@[ adUnit ]];
   /// Set child directed treatment flag to Criteo SDK.
   [Criteo.sharedCriteo setChildDirectedTreatment:childDirectedTreatment];
   if (self.bannerView == nil) {

CriteoAdViewer/Sources/CriteoGoogleAdapter/CRGoogleMediationParameters.h

@@ -24,12 +24,15 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CRGoogleMediationParameters : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
-- (id)initWithPublisherId:(NSString *)publisherId adUnitId:(NSString *)adUnitId;
+- (id)initWithPublisherId:(NSString *)publisherId
+                  storeId:(NSString *)storeId
+                 adUnitId:(NSString *)adUnitId;
 + (nullable CRGoogleMediationParameters *)parametersFromJSONString:(NSString *)jsonString
                                                              error:(NSError **)outError;
 
 @property(copy, readonly) NSString *publisherId;
 @property(copy, readonly) NSString *adUnitId;
+@property(copy, readonly) NSString *storeId;
 
 @end
 

CriteoAdViewer/Sources/CriteoGoogleAdapter/CRGoogleMediationParameters.m

@@ -22,6 +22,7 @@
 
 static NSString *const criteoGoogleMediationPublisherIdKey = @"cpId";
 static NSString *const criteoGoogleMediationAdUnitIdKey = @"adUnitId";
+static NSString *const criteoGoogleMediationStoreIdKey = @"storeId";
 
 static void setJSONParsingError(NSError **error) {
   if (error != nil) {
@@ -42,13 +43,16 @@ static void setJSONParsingError(NSError **error) {
 
 @implementation CRGoogleMediationParameters
 
-- (id)initWithPublisherId:(NSString *)publisherId adUnitId:(NSString *)adUnitId {
+- (id)initWithPublisherId:(NSString *)publisherId
+                  storeId:(NSString *)storeId
+                 adUnitId:(NSString *)adUnitId {
   self = [super init];
   if (self == nil) {
     return nil;
   }
   _publisherId = [NSString stringWithString:publisherId];
   _adUnitId = [NSString stringWithString:adUnitId];
+  _storeId = [NSString stringWithString:storeId];
   return self;
 }
 
@@ -70,13 +74,16 @@ + (nullable CRGoogleMediationParameters *)parametersFromJSONString:(NSString *)j
   }
   NSString *pubId = nonEmptyStringFromObj(jsonDict[criteoGoogleMediationPublisherIdKey]);
   NSString *adId = nonEmptyStringFromObj(jsonDict[criteoGoogleMediationAdUnitIdKey]);
+  NSString *storeId = nonEmptyStringFromObj(jsonDict[criteoGoogleMediationStoreIdKey]);
   if (pubId == nil || adId == nil) {
     setJSONParsingError(error);
     return nil;
   }
   if (error != nil) {
     *error = nil;
   }
-  return [[CRGoogleMediationParameters alloc] initWithPublisherId:pubId adUnitId:adId];
+  return [[CRGoogleMediationParameters alloc] initWithPublisherId:pubId
+                                                          storeId:storeId
+                                                         adUnitId:adId];
 }
 @end

CriteoAdViewer/Sources/CriteoGoogleAdapter/CRInterstitialCustomEvent.m

@@ -42,7 +42,9 @@ @implementation CRInterstitialCustomEvent
 - (void)loadInterstitialForAdUnit:(CRInterstitialAdUnit *)adUnit
                   adConfiguration:(CRGoogleMediationParameters *)params
            childDirectedTreatment:(NSNumber *)childDirectedTreatment {
-  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId withAdUnits:@[ adUnit ]];
+  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId
+                                     withStoreId:params.storeId
+                                     withAdUnits:@[ adUnit ]];
   /// Set child directed treatment flag to Criteo SDK.
   [Criteo.sharedCriteo setChildDirectedTreatment:childDirectedTreatment];
   if (!self.interstitial) {

CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/CRBannerCustomEvent.m

@@ -43,7 +43,9 @@ - (void)loadBannerForAdUnit:(CRBannerAdUnit *)adUnit
             mediationParams:(CRGoogleMediationParameters *)params
      childDirectedTreatment:(NSNumber *)childDirectedTreatment {
   /// Set the publicher id to
-  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId withAdUnits:@[ adUnit ]];
+  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId
+                                     withStoreId:params.storeId
+                                     withAdUnits:@[ adUnit ]];
   /// Set child directed treatment flag to Criteo SDK.
   [Criteo.sharedCriteo setChildDirectedTreatment:childDirectedTreatment];
   if (self.bannerView == nil) {

CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/CRGoogleMediationParameters.h

@@ -24,12 +24,15 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CRGoogleMediationParameters : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
-- (id)initWithPublisherId:(NSString *)publisherId adUnitId:(NSString *)adUnitId;
+- (id)initWithPublisherId:(NSString *)publisherId
+                  storeId:(NSString *)storeId
+                 adUnitId:(NSString *)adUnitId;
 + (nullable CRGoogleMediationParameters *)parametersFromJSONString:(NSString *)jsonString
                                                              error:(NSError **)outError;
 
 @property(copy, readonly) NSString *publisherId;
 @property(copy, readonly) NSString *adUnitId;
+@property(copy, readonly) NSString *storeId;
 
 @end
 

CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/CRGoogleMediationParameters.m

@@ -22,6 +22,7 @@
 
 static NSString *const criteoGoogleMediationPublisherIdKey = @"cpId";
 static NSString *const criteoGoogleMediationAdUnitIdKey = @"adUnitId";
+static NSString *const criteoGoogleMediationStoreIdKey = @"storeId";
 
 static void setJSONParsingError(NSError **error) {
   if (error != nil) {
@@ -42,13 +43,16 @@ static void setJSONParsingError(NSError **error) {
 
 @implementation CRGoogleMediationParameters
 
-- (id)initWithPublisherId:(NSString *)publisherId adUnitId:(NSString *)adUnitId {
+- (id)initWithPublisherId:(NSString *)publisherId
+                  storeId:(NSString *)storeId
+                 adUnitId:(NSString *)adUnitId {
   self = [super init];
   if (self == nil) {
     return nil;
   }
   _publisherId = [NSString stringWithString:publisherId];
   _adUnitId = [NSString stringWithString:adUnitId];
+  _storeId = [NSString stringWithString:storeId];
   return self;
 }
 
@@ -70,13 +74,16 @@ + (nullable CRGoogleMediationParameters *)parametersFromJSONString:(NSString *)j
   }
   NSString *pubId = nonEmptyStringFromObj(jsonDict[criteoGoogleMediationPublisherIdKey]);
   NSString *adId = nonEmptyStringFromObj(jsonDict[criteoGoogleMediationAdUnitIdKey]);
+  NSString *storeId = nonEmptyStringFromObj(jsonDict[criteoGoogleMediationStoreIdKey]);
   if (pubId == nil || adId == nil) {
     setJSONParsingError(error);
     return nil;
   }
   if (error != nil) {
     *error = nil;
   }
-  return [[CRGoogleMediationParameters alloc] initWithPublisherId:pubId adUnitId:adId];
+  return [[CRGoogleMediationParameters alloc] initWithPublisherId:pubId
+                                                          storeId:storeId
+                                                         adUnitId:adId];
 }
 @end

CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/CRInterstitialCustomEvent.m

@@ -42,7 +42,9 @@ @implementation CRInterstitialCustomEvent
 - (void)loadInterstitialForAdUnit:(CRInterstitialAdUnit *)adUnit
                   adConfiguration:(CRGoogleMediationParameters *)params
            childDirectedTreatment:(NSNumber *)childDirectedTreatment {
-  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId withAdUnits:@[ adUnit ]];
+  [Criteo.sharedCriteo registerCriteoPublisherId:params.publisherId
+                                     withStoreId:params.storeId
+                                     withAdUnits:@[ adUnit ]];
   /// Set child directed treatment flag to Criteo SDK.
   [Criteo.sharedCriteo setChildDirectedTreatment:childDirectedTreatment];
   if (!self.interstitial) {

CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRBannerCustomEventTests.m

@@ -51,7 +51,8 @@ - (instancetype)initWithBanner:(CRBannerView *)ad {
 
 @end
 
-#define SERVER_PARAMETER @"{\"cpId\":\"testCpId\",\"adUnitId\":\"testAdUnitId\"}"
+#define SERVER_PARAMETER \
+  @"{\"cpId\":\"testCpId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
 
 @implementation CRBannerCustomEventTests
 
@@ -69,7 +70,9 @@ - (void)testRequestBannerAdSuccess {
 
   id mockCriteo = OCMClassMock([Criteo class]);
   OCMStub([mockCriteo sharedCriteo]).andReturn(mockCriteo);
-  OCMStub([mockCriteo registerCriteoPublisherId:@"testCpId" withAdUnits:@[ bannerAdUnit ]]);
+  OCMStub([mockCriteo registerCriteoPublisherId:@"testCpId"
+                                    withStoreId:@"testStoreId"
+                                    withAdUnits:@[ bannerAdUnit ]]);
   OCMStub([mockCriteo setChildDirectedTreatment:mockChildDirectedTreatment]);
 
   [customEvent loadBannerForAdUnit:bannerAdUnit
@@ -78,7 +81,9 @@ - (void)testRequestBannerAdSuccess {
 
   OCMVerify([mockCRBannerView loadAd]);
   OCMVerify([mockCRBannerView setDelegate:customEvent]);
-  OCMVerify([mockCriteo registerCriteoPublisherId:@"testCpId" withAdUnits:@[ bannerAdUnit ]]);
+  OCMVerify([mockCriteo registerCriteoPublisherId:@"testCpId"
+                                      withStoreId:@"testStoreId"
+                                      withAdUnits:@[ bannerAdUnit ]]);
   OCMVerify([mockCriteo setChildDirectedTreatment:mockChildDirectedTreatment]);
 }
 

CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRGoogleMediationParametersTests.m

@@ -29,19 +29,20 @@ - (void)testGoogleMediationParametersNormal {
   NSError *error;
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"adUnitId\": \"/140800857/Endeavour_320x50\"}"
+          @"{\"cpId\":\"B-056946\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:&error];
   XCTAssertNotNil(gmp);
   XCTAssertEqualObjects(gmp.publisherId, @"B-056946");
   XCTAssertEqualObjects(gmp.adUnitId, @"/140800857/Endeavour_320x50");
+  XCTAssertEqualObjects(gmp.storeId, @"B-056946");
 }
 
 // Normal case - check that the error is set to nil
 - (void)testGoogleMediationParametersErrorSetToNil {
   NSError *error = [NSError new];
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"adUnitId\": \"/140800857/Endeavour_320x50\"}"
+          @"{\"cpId\":\"B-056946\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:&error];
   XCTAssertNil(error);
 }
@@ -50,11 +51,12 @@ - (void)testGoogleMediationParametersErrorSetToNil {
 - (void)testGoogleMediationParametersNilError {
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"adUnitId\": \"/140800857/Endeavour_320x50\"}"
+          @"{\"cpId\":\"B-056946\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:nil];
   XCTAssertNotNil(gmp);
   XCTAssertEqualObjects(gmp.publisherId, @"B-056946");
   XCTAssertEqualObjects(gmp.adUnitId, @"/140800857/Endeavour_320x50");
+  XCTAssertEqualObjects(gmp.storeId, @"B-056946");
 }
 
 // Nil input string

CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRInterstitialCustomEventTests.m

@@ -55,7 +55,8 @@ - (instancetype)initWithInterstitial:(CRInterstitial *)interstitial {
 
 @end
 
-#define SERVER_PARAMETER @"{\"cpId\":\"testCpId\",\"adUnitId\":\"testAdUnitId\"}"
+#define SERVER_PARAMETER \
+  @"{\"cpId\":\"testCpId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
 
 @implementation CRInterstitialCustomEventTests
 
@@ -76,7 +77,9 @@ - (void)testLoadAndPresentFromRootViewController {
 
   id mockCriteo = OCMStrictClassMock([Criteo class]);
   OCMStub([mockCriteo sharedCriteo]).andReturn(mockCriteo);
-  OCMStub([mockCriteo registerCriteoPublisherId:@"testCpId" withAdUnits:@[ interstitialAdUnit ]]);
+  OCMStub([mockCriteo registerCriteoPublisherId:@"testCpId"
+                                    withStoreId:@"testStoreId"
+                                    withAdUnits:@[ interstitialAdUnit ]]);
   OCMStub([mockCriteo setChildDirectedTreatment:mockChildDirectedTreatment]);
 
   [customEvent loadInterstitialForAdUnit:interstitialAdUnit
@@ -87,7 +90,9 @@ - (void)testLoadAndPresentFromRootViewController {
   OCMVerify([mockCRInterstitial loadAd]);
   OCMVerify([mockCRInterstitial setDelegate:customEvent]);
   OCMVerify([mockCRInterstitial presentFromRootViewController:realVC]);
-  OCMVerify([mockCriteo registerCriteoPublisherId:@"testCpId" withAdUnits:@[ interstitialAdUnit ]]);
+  OCMVerify([mockCriteo registerCriteoPublisherId:@"testCpId"
+                                      withStoreId:@"testStoreId"
+                                      withAdUnits:@[ interstitialAdUnit ]]);
   OCMVerify([mockCriteo setChildDirectedTreatment:mockChildDirectedTreatment]);
 }
 

CriteoPublisherSdk/Sources/Configuration/CR_Config.h

@@ -38,7 +38,7 @@ FOUNDATION_EXTERN NSString *const CR_ConfigConfigurationUrl;
 @property(copy, nonatomic) NSString *adTagUrlMode;
 @property(copy, nonatomic) NSString *viewportWidthMacro;
 @property(copy, nonatomic) NSString *displayURLMacro;
-
+@property(copy, nonatomic, nullable) NSString *storeId;
 #pragma mark CSM
 
 @property(assign, nonatomic, getter=isCsmEnabled) BOOL csmEnabled;
@@ -77,11 +77,15 @@ FOUNDATION_EXTERN NSString *const CR_ConfigConfigurationUrl;
 #pragma mark - Lifecycle
 
 - (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId
+                                  storeId:(nullable NSString *)storeId
                                    cdbUrl:(NSString *)cdbUrl
                              appEventsUrl:(NSString *)appEventsUrl
                                 configUrl:(NSString *)configUrl
                              userDefaults:(NSUserDefaults *)userDefaults NS_DESIGNATED_INITIALIZER;
 
+- (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId
+                                  storeId:(nullable NSString *)storeId;
+
 - (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId;
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults;

CriteoPublisherSdk/Sources/Configuration/CR_Config.m

@@ -43,6 +43,7 @@ @interface CR_Config ()
 @implementation CR_Config
 
 - (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId
+                                  storeId:(nullable NSString *)storeId
                                    cdbUrl:(NSString *)cdbUrl
                              appEventsUrl:(NSString *)appEventsUrl
                                 configUrl:(NSString *)configUrl
@@ -73,12 +74,24 @@ - (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId
     _remoteLogLevel = [userDefaults cr_valueForRemoteLogLevel];
     _userDefaults = userDefaults;
     _mraidEnabled = [userDefaults cr_valueForMRAID];
+    _storeId = storeId;
   }
   return self;
 }
 
 - (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId {
   return [self initWithCriteoPublisherId:criteoPublisherId
+                                 storeId:nil
+                                  cdbUrl:CR_ConfigCdbUrl
+                            appEventsUrl:CR_ConfigAppEventsUrl
+                               configUrl:CR_ConfigConfigurationUrl
+                            userDefaults:[NSUserDefaults standardUserDefaults]];
+}
+
+- (instancetype)initWithCriteoPublisherId:(nullable NSString *)criteoPublisherId
+                                  storeId:(nullable NSString *)storeId {
+  return [self initWithCriteoPublisherId:criteoPublisherId
+                                 storeId:storeId
                                   cdbUrl:CR_ConfigCdbUrl
                             appEventsUrl:CR_ConfigAppEventsUrl
                                configUrl:CR_ConfigConfigurationUrl
@@ -91,6 +104,7 @@ - (instancetype)init {
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults {
   return [self initWithCriteoPublisherId:nil
+                                 storeId:nil
                                   cdbUrl:CR_ConfigCdbUrl
                             appEventsUrl:CR_ConfigAppEventsUrl
                                configUrl:CR_ConfigConfigurationUrl

CriteoPublisherSdk/Sources/Criteo.m

@@ -93,16 +93,22 @@ + (void)resetSharedCriteo {
 }
 
 - (void)registerCriteoPublisherId:(NSString *)criteoPublisherId
+                      withStoreId:(NSString *)storeId
                       withAdUnits:(NSArray<CRAdUnit *> *)adUnits {
   if (criteoPublisherId == nil || criteoPublisherId.length == 0) {
     CRLogError(@"Registration", @"Invalid Criteo publisher ID: \"%@\"", criteoPublisherId);
   }
+  if (storeId == nil || storeId.length == 0) {
+    CRLogError(@"Registration", @"Invalid store ID: \"%@\"", storeId);
+  }
   @synchronized(self) {
     if (!self.isRegistered) {
       self.registered = true;
       @try {
         [self.dependencyProvider.threadManager dispatchAsyncOnGlobalQueue:^{
-          [self _registerCriteoPublisherId:criteoPublisherId withAdUnits:adUnits];
+          [self _registerCriteoPublisherId:criteoPublisherId
+                               withStoreId:storeId
+                               withAdUnits:adUnits];
           CRLogInfo(@"Registration",
                     @"Criteo SDK version %@ is registered with Publisher ID %@ and %d ad units: %@",
                     CRITEO_PUBLISHER_SDK_VERSION, criteoPublisherId, adUnits.count, adUnits);
@@ -187,8 +193,10 @@ - (instancetype)initWithDependencyProvider:(CR_DependencyProvider *)dependencyPr
 }
 
 - (void)_registerCriteoPublisherId:(NSString *)criteoPublisherId
+                       withStoreId:(NSString *)storeId
                        withAdUnits:(NSArray<CRAdUnit *> *)adUnits {
   self.config.criteoPublisherId = criteoPublisherId;
+  self.config.storeId = storeId;
   [self.appEvents registerForIosEvents];
   [self.appEvents sendLaunchEvent];
   [self.configManager refreshConfig:self.config];

CriteoPublisherSdk/Sources/Network/CR_ApiQueryKeys.h

@@ -79,6 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(class, nonatomic, readonly) NSString *wrapperVersion;
 @property(class, nonatomic, readonly) NSString *zoneId;
 @property(class, nonatomic, readonly) NSString *regs;
+@property(class, nonatomic, readonly) NSString *storeId;
 
 /// Used to map childDirectedTreatment property.
 @property(class, nonatomic, readonly) NSString *coppa;

CriteoPublisherSdk/Sources/Network/CR_ApiQueryKeys.m

@@ -171,5 +171,8 @@ + (NSString *)banner {
 + (NSString *)api {
   return @"api";
 }
++ (NSString *)storeId {
+  return @"storeId";
+}
 
 @end