Skip to content

Commit

Permalink
removed deviceId from get remote config request
Browse files Browse the repository at this point in the history
  • Loading branch information
Valeriu Popa authored and vapopa committed Jul 25, 2023
1 parent 649a5ba commit 01d5f03
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 22 deletions.
3 changes: 1 addition & 2 deletions CriteoPublisherSdk/Sources/Configuration/CR_ConfigManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ - (instancetype)initWithApiHandler:(CR_ApiHandler *)apiHandler
- (void)refreshConfig:(CR_Config *)config {
CR_RemoteConfigRequest *request =
[CR_RemoteConfigRequest requestWithConfig:config
profileId:_integrationRegistry.profileId
deviceId:_deviceInfo.deviceId];
profileId:_integrationRegistry.profileId];
[_apiHandler getConfig:request
ahConfigHandler:^(NSDictionary *configValues) {
if (configValues[@"killSwitch"] &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,8 @@ NS_ASSUME_NONNULL_BEGIN
@property(copy, nonatomic, readonly) NSDictionary *postBody;

+ (instancetype)requestWithConfig:(CR_Config *)config
profileId:(NSNumber *)profileId
deviceId:(NSString *)deviceId;
profileId:(NSNumber *)profileId;

@end

NS_ASSUME_NONNULL_END
NS_ASSUME_NONNULL_END
13 changes: 3 additions & 10 deletions CriteoPublisherSdk/Sources/Configuration/CR_RemoteConfigRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,27 @@ @interface CR_RemoteConfigRequest ()
@property(copy, nonatomic) NSNumber *profileId;
@property(copy, nonatomic) NSString *deviceModel;
@property(copy, nonatomic) NSString *deviceOs;
@property(copy, nonatomic) NSString *deviceId;

- (instancetype)initWithCriteoPublisherId:(NSString *)criteoPublisherId
sdkVersion:(NSString *)sdkVersion
appId:(NSString *)appId
profileId:(NSNumber *)profileId
deviceModel:(NSString *)deviceModel
deviceOs:(NSString *)deviceOs
deviceId:(NSString *)deviceId
configUrl:(NSString *)configUrl;

@end

@implementation CR_RemoteConfigRequest

+ (instancetype)requestWithConfig:(CR_Config *)config
profileId:(NSNumber *)profileId
deviceId:(NSString *)deviceId {
profileId:(NSNumber *)profileId {
return [CR_RemoteConfigRequest.alloc initWithCriteoPublisherId:config.criteoPublisherId
sdkVersion:config.sdkVersion
appId:config.appId
profileId:profileId
deviceModel:config.deviceModel
deviceOs:config.deviceOs
deviceId:deviceId
configUrl:config.configUrl];
}

Expand All @@ -62,7 +58,6 @@ - (instancetype)initWithCriteoPublisherId:(NSString *)criteoPublisherId
profileId:(NSNumber *)profileId
deviceModel:(NSString *)deviceModel
deviceOs:(NSString *)deviceOs
deviceId:(NSString *)deviceId
configUrl:(NSString *)configUrl {
if (self = [super init]) {
_criteoPublisherId = criteoPublisherId;
Expand All @@ -71,7 +66,6 @@ - (instancetype)initWithCriteoPublisherId:(NSString *)criteoPublisherId
_profileId = profileId;
_deviceModel = deviceModel;
_deviceOs = deviceOs;
_deviceId = deviceId;
_configUrl = configUrl;
}
return self;
Expand All @@ -84,9 +78,8 @@ - (NSDictionary *)postBody {
@"sdkVersion" : self.sdkVersion,
@"rtbProfileId" : self.profileId,
@"deviceModel" : self.deviceModel,
@"deviceOs" : self.deviceOs,
@"deviceId" : self.deviceId
@"deviceOs" : self.deviceOs
};
}

@end
@end
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,21 @@ - (void)testToPostPayload_GivenConfig {
OCMStub(config.deviceModel).andReturn(@"myDeviceModel");
OCMStub(config.deviceOs).andReturn(@"myDeviceOs");
NSNumber *profileId = @42;
NSString *deviceId = @"123-456";

CR_RemoteConfigRequest *request = [CR_RemoteConfigRequest requestWithConfig:config
profileId:profileId
deviceId:deviceId];
profileId:profileId];
NSDictionary *postBody = request.postBody;

NSDictionary *expected = @{
@"cpId" : @"myCpId",
@"bundleId" : @"myAppId",
@"sdkVersion" : @"1.3.3.7",
@"rtbProfileId" : profileId,
@"deviceId" : deviceId,
@"deviceModel" : @"myDeviceModel",
@"deviceOs" : @"myDeviceOs"
};

XCTAssertEqualObjects(postBody, expected);
}

@end
@end
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,7 @@ - (void)testGetConfig {
OCMStub([mockConfig deviceOs]).andReturn(@"deviceOs");

CR_RemoteConfigRequest *request = [CR_RemoteConfigRequest requestWithConfig:mockConfig
profileId:@42
deviceId:@"123-456"];
profileId:@42];

CR_ApiHandler *apiHandler = [self buildApiHandler];

Expand Down

0 comments on commit 01d5f03

Please sign in to comment.