Skip to content

hotfix/cp-11317-ios-android-ensure-channelid-validation-before-executing-api #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snuricp merged 2 commits into from
Apr 16, 2026
Merged

hotfix/cp-11317-ios-android-ensure-channelid-validation-before-executing-api #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50da2ce
hotfix/cp-11317-ios-android-ensure-channelid-validation-before-execut…
cpandya25 Apr 16, 2026
292736c
hotfix/cp-11317-ios-android-ensure-channelid-validation-before-execut…
cpandya25 Apr 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CleverPush/Source/CPAppBannerModuleInstance.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ - (void)getBanners:(NSString*)channelId completion:(void(^)(NSMutableArray<CPApp

#pragma mark - Get the banner details by api call and load the banner data in to class variables
- (void)getBanners:(NSString*)channelId bannerId:(NSString*)bannerId notificationId:(NSString*)notificationId groupId:(NSString*)groupId completion:(void(^)(NSMutableArray<CPAppBanner*>*))callback {
if (channelId == nil || ![channelId isKindOfClass:[NSString class]] || [channelId length] == 0) {
[CPLog error:@"Failed getting app banners because channel ID is nil or empty"];
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: getBanners: channelId is nil or empty, skipping API call"];
return;
}

Expand Down Expand Up @@ -1680,6 +1680,11 @@ - (void)sendBannerEvent:(NSString*)event forBanner:(CPAppBanner*)banner forScree
return;
}

if ([CPUtils isNullOrEmpty:banner.channel]) {
[CPLog error:@"CleverPush: sendBannerEvent: channelId is nil or empty, skipping API call"];
return;
}

NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:[NSString stringWithFormat:@"app-banner/event/%@", event]];

NSString* subscriptionId = nil;
Expand Down
10 changes: 9 additions & 1 deletion CleverPush/Source/CPInboxView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,11 @@ - (void)showBanner:(CPAppBanner*)banner force:(BOOL)force {

#pragma mark - Get the banner details by api call and load the banner data in to class variables
- (void)getBanners:(NSString*)channelId bannerId:(NSString*)bannerId notificationId:(NSString*)notificationId groupId:(NSString*)groupId completion:(void(^)(NSMutableArray<CPAppBanner*>*))callback {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: CPInboxView getBanners: channelId is nil or empty, skipping API call"];
return;
}

NSString* bannersPath = [NSString stringWithFormat:@"channel/%@/app-banners?platformName=iOS", channelId];

if ([CleverPush isDevelopmentModeEnabled]) {
Expand Down Expand Up @@ -462,7 +467,10 @@ - (void)getBanners:(NSString*)channelId bannerId:(NSString*)bannerId notificatio
}

- (void)sendBannerEvent:(NSString*)event forBanner:(CPAppBanner*)banner forScreen:(CPAppBannerCarouselBlock*)screen forButtonBlock:(CPAppBannerButtonBlock*)block forImageBlock:(CPAppBannerImageBlock*)image blockType:(NSString*)type {

if ([CPUtils isNullOrEmpty:banner.channel]) {
[CPLog error:@"CleverPush: CPInboxView sendBannerEvent: channelId is nil or empty, skipping API call"];
return;
}

NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:[NSString stringWithFormat:@"app-banner/event/%@", event]];

Expand Down
96 changes: 95 additions & 1 deletion CleverPush/Source/CleverPushInstance.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,6 +1188,10 @@ - (void)areNotificationsEnabled:(void(^ _Nullable)(BOOL))callback {
#pragma mark - channel subscription
- (void)setConfirmAlertShown {
[self getChannelConfig:^(NSDictionary* channelConfig) {
if ([CPUtils isNullOrEmpty:channelId]) {
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
[CPLog error:@"CleverPush: setConfirmAlertShown: channelId is nil or empty, skipping API call"];
return;
}
confirmAlertShown = YES;
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:[NSString stringWithFormat:@"channel/confirm-alert"]];

Expand Down Expand Up @@ -1508,6 +1512,10 @@ - (void)unsubscribe:(void(^ _Nullable)(BOOL))callback onFailure:(CPFailureBlock
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(syncSubscription:) object:nil];

if (subscriptionId) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: unsubscribe: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/unsubscribe"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -1715,6 +1723,12 @@ - (void)makeSyncSubscriptionRequest:(CPFailureBlock)failureBlock successBlock:(v
channelId = [self getChannelIdFromUserDefaults];
}

if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: makeSyncSubscriptionRequest: channelId is nil or empty, skipping API call"];
[self setSubscriptionInProgress:false];
return;
}

NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:[NSString stringWithFormat:@"subscription/sync/%@", channelId]];

[self areNotificationsEnabled:^(BOOL notificationsEnabled) {
Expand Down Expand Up @@ -2136,6 +2150,10 @@ - (void)setNotificationDelivered:(NSDictionary*)notification {
}

- (void)setNotificationDelivered:(NSDictionary*)notification withChannelId:(NSString*)channelId withSubscriptionId:(NSString*)subscriptionId {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: setNotificationDelivered: channelId is nil or empty, skipping API call"];
return;
}
NSString*notificationId = [notification valueForKey:@"_id"];

NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"notification/delivered"];
Expand Down Expand Up @@ -2191,6 +2209,10 @@ - (void)setNotificationClicked:(NSString*)notificationId {
}

- (void)setNotificationClicked:(NSString*)notificationId withChannelId:(NSString*)channelId withSubscriptionId:(NSString*)subscriptionId withAction:(NSString*)action {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: setNotificationClicked: channelId is nil or empty, skipping API call"];
return;
}
[CPLog debug:@"setNotificationClicked notification:%@, subscription:%@, channel:%@, action:%@", notificationId, subscriptionId, channelId, action];

NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"notification/clicked"];
Expand Down Expand Up @@ -2415,6 +2437,13 @@ - (void)removeSubscriptionTagFromApi:(NSString* _Nullable)tagId callback:(void(^
return;
}
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: removeSubscriptionTagFromApi: channelId is nil or empty, skipping API call"];
if (callback) {
callback(tagId);
}
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/untag"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -2484,6 +2513,10 @@ - (void)removeSubscriptionAttributeFromApi:(NSString* _Nullable)attributeId call
return;
}
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: removeSubscriptionAttributeFromApi: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/attribute/clear"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -2548,6 +2581,13 @@ - (void)addSubscriptionTagToApi:(NSString* _Nullable)tagId callback:(void(^ _Nul
return;
}
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: addSubscriptionTagToApi: channelId is nil or empty, skipping API call"];
if (callback) {
callback(tagId);
}
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/tag"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -2620,6 +2660,10 @@ - (void)removeSubscriptionTagsAndAttributes {

- (void)stopCampaigns {
if (subscriptionId != nil) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: stopCampaigns: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/stop-campaigns"];
NSMutableDictionary* dataDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand All @@ -2642,6 +2686,10 @@ - (void)startLiveActivity:(NSString* _Nullable)activityId pushToken:(NSString* _

- (void)startLiveActivity:(NSString* _Nullable)activityId pushToken:(NSString* _Nullable)token onSuccess:(CPResultSuccessBlock _Nullable)successBlock onFailure:(CPFailureBlock _Nullable)failureBlock {
if (subscriptionId != nil) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: startLiveActivity: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:[NSString stringWithFormat:@"subscription/sync/%@", channelId]];
NSMutableDictionary* dataDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -2714,6 +2762,10 @@ - (void)setSubscriptionAttributeObjectImplementation:(NSString*)attributeId obje
return;
}
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: setSubscriptionAttributeObjectImplementation: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/attribute"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -2766,6 +2818,10 @@ - (void)pushSubscriptionAttributeValue:(NSString* _Nullable)attributeId value:(N
}

dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: pushSubscriptionAttributeValue: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/attribute/push-value"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -2833,6 +2889,10 @@ - (void)pullSubscriptionAttributeValue:(NSString* _Nullable)attributeId value:(N
}

dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: pullSubscriptionAttributeValue: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/attribute/pull-value"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -3103,6 +3163,10 @@ - (void)addSubscriptionTopic:(NSString* _Nullable)topicId callback:(void(^ _Null
}

dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: addSubscriptionTopic: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/topic/add"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -3171,6 +3235,10 @@ - (void)removeSubscriptionTopic:(NSString* _Nullable)topicId callback:(void(^ _N
[topics removeObject:topicId];

dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(void) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: removeSubscriptionTopic: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/topic/remove"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -3305,6 +3373,13 @@ - (void)getNotifications:(BOOL)combineWithApi callback:(void(^ _Nullable)(NSArra
- (void)getNotifications:(BOOL)combineWithApi limit:(int)limit skip:(int)skip callback:(void(^ _Nullable)(NSArray<CPNotification*>* _Nullable))callback {
NSMutableArray<CPNotification*>* notifications = [[self getNotifications] mutableCopy];
if (combineWithApi) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: getNotifications: channelId is nil or empty, skipping API call"];
if (callback) {
callback(notifications);
}
return;
}
NSString*combinedURL = [self generateGetReceivedNotificationsPath:limit skip:skip];
[self getReceivedNotificationsFromApi:combinedURL callback:^(NSArray*remoteNotifications) {
for (NSDictionary*remoteNotification in remoteNotifications) {
Expand Down Expand Up @@ -3346,6 +3421,10 @@ - (void)getNotifications:(BOOL)combineWithApi limit:(int)limit skip:(int)skip ca
#pragma mark - Track inbox clicked
- (void)trackInboxClicked:(NSString* _Nullable)notificationId {
if (![CPUtils isNullOrEmpty:notificationId]) {
if ([CPUtils isNullOrEmpty:[CleverPush channelId]]) {
[CPLog error:@"CleverPush: trackInboxClicked: channelId is nil or empty, skipping API call"];
return;
}
NSString* path = [NSString stringWithFormat:@"/channel/%@/panel/clicked", [CleverPush channelId]];
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:path];

Expand Down Expand Up @@ -3496,6 +3575,10 @@ - (void)trackEvent:(NSString* _Nullable)eventName properties:(NSDictionary* _Nul
[CPLog debug:@"CleverPushInstance: trackEvent: There is no subscription for CleverPush SDK."];
return;
}
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: trackEvent: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/conversion"];
NSMutableDictionary* dataDic = [NSMutableDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -3552,6 +3635,10 @@ - (void)triggerFollowUpEvent:(NSString* _Nullable)eventName parameters:(NSDictio
[CPLog debug:@"CleverPushInstance: triggerFollowUpEvent: There is no subscription for CleverPush SDK."];
return;
}
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: triggerFollowUpEvent: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/event"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -3895,6 +3982,10 @@ - (void)trackSessionStart {
NSUserDefaults* groupUserDefaults = [CPUtils getUserDefaultsAppGroup];
NSString* lastNotificationId = [groupUserDefaults stringForKey:CLEVERPUSH_LAST_NOTIFICATION_ID_KEY];

if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: trackSessionStart: channelId is nil or empty, skipping API call"];
return;
}
NSMutableURLRequest* request = [[CleverPushHTTPClient sharedClient] requestWithMethod:HTTP_POST path:@"subscription/session/start"];
NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
channelId, @"channelId",
Expand Down Expand Up @@ -3960,7 +4051,10 @@ - (void)trackSessionEnd {
long sessionDuration = sessionEndedTimestamp - sessionStartedTimestamp;
long visits = MAX(sessionVisits, 0);

if (channelId == nil || subscriptionId == nil || deviceToken == nil || sessionDuration < 0) {
if ([CPUtils isNullOrEmpty:channelId] || subscriptionId == nil || deviceToken == nil || sessionDuration < 0) {
if ([CPUtils isNullOrEmpty:channelId]) {
[CPLog error:@"CleverPush: trackSessionEnd: channelId is nil or empty, skipping API call"];
}
return;
}

Expand Down
Loading