Skip to content

Commit

Permalink
Fix #841: Add warning when push notification cannot be sent (#880)
Browse files Browse the repository at this point in the history 
* Fix #841: Add warning when push notification cannot be sent due to an invalid userId or userId+activationId combination
  • Loading branch information
@banterCZ
banterCZ authored Oct 1, 2024
1 parent 36b4725 commit 485aaa2
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 29 deletions.
14 changes: 11 additions & 3 deletions powerauth-push-server/src/main/java/io/getlime/push/service/PushMessageSenderService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,16 +261,24 @@ private AppCredentialsEntity getAppCredentials(String appId) throws PushServerEx
}

// Return list of devices related to given user or activation ID (if present). List of devices is related to particular application as well.
private List<PushDeviceRegistrationEntity> getPushDevices(Long id, String userId, String activationId) throws PushServerException {
private List<PushDeviceRegistrationEntity> getPushDevices(Long appCredentialsId, String userId, String activationId) throws PushServerException {
if (userId == null || userId.isEmpty()) {
logger.error("No userId was specified");
throw new PushServerException("No userId was specified");
}

final List<PushDeviceRegistrationEntity> devices;
if (activationId != null) { // in case the message should go to the specific device
return pushDeviceRepository.findByUserIdAndAppCredentialsIdAndActivationId(userId, id, activationId);
devices = pushDeviceRepository.findByUserIdAndAppCredentialsIdAndActivationId(userId, appCredentialsId, activationId);
} else {
return pushDeviceRepository.findByUserIdAndAppCredentialsId(userId, id);
devices = pushDeviceRepository.findByUserIdAndAppCredentialsId(userId, appCredentialsId);
}

if (devices.isEmpty()) {
logger.warn("No device found for userId={}, appCredentialsId={}, activationId={}", userId, appCredentialsId, activationId);
}

return devices;
}

// Prepare and cache APNS, FCM, and HMS clients for provided app
Expand Down
2 changes: 2 additions & 0 deletions powerauth-push-server/src/test/java/io/getlime/push/controller/MockPowerAuthController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ public ObjectResponse<GetApplicationDetailResponse> getApplicationDetail() {
public ObjectResponse<GetActivationStatusResponse> getActivationStatus(@RequestBody ObjectRequest<GetActivationStatusRequest> request) {
final GetActivationStatusResponse response = new GetActivationStatusResponse();
response.setActivationId(request.getRequestObject().getActivationId());
response.setUserId(PushServerTestClientFactory.TEST_USER_ID);

if (blockedActivations.contains(request.getRequestObject().getActivationId())) {
response.setActivationStatus(ActivationStatus.BLOCKED);
} else {
Expand Down
62 changes: 36 additions & 26 deletions powerauth-push-server/src/test/java/io/getlime/push/tests/PushServerTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,63 +164,69 @@ void updateDeviceStatusTest() throws Exception {
}

@Test
@SuppressWarnings("unchecked") //known parameters of HashMap
void sendPushMessageTest() throws Exception {
boolean result = pushServerClient.createDevice(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN, MobilePlatform.ANDROID, powerAuthTestClient.getActivationId());
final boolean result = pushServerClient.createDevice(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN, MobilePlatform.ANDROID, powerAuthTestClient.getActivationId());
assertTrue(result);
PushMessage pushMessage = new PushMessage();
PushMessageAttributes attributes = new PushMessageAttributes();
PushMessageBody pushMessageBody = new PushMessageBody();

final PushMessageAttributes attributes = new PushMessageAttributes();
attributes.setSilent(false);
attributes.setPersonal(true);

final PushMessageBody pushMessageBody = new PushMessageBody();
pushMessageBody.setTitle("Balance update");
pushMessageBody.setBody("Your balance is now $745.00");
pushMessageBody.setBadge(3);
pushMessageBody.setSound("riff.wav");
pushMessageBody.setCategory("balance-update");
pushMessageBody.setCollapseKey("balance-update");
pushMessageBody.setValidUntil(Instant.now());
pushMessageBody.setExtras((Map<String, Object>) new HashMap<String, Object>().put("_comment", "Any custom data."));
attributes.setSilent(false);
attributes.setPersonal(true);
pushMessage.setUserId("Test_User");
pushMessageBody.setExtras(Map.of("_comment", "Any custom data."));

final PushMessage pushMessage = new PushMessage();
pushMessage.setUserId(PushServerTestClientFactory.TEST_USER_ID);
pushMessage.setActivationId(powerAuthTestClient.getActivationId());
pushMessage.setAttributes(attributes);
pushMessage.setBody(pushMessageBody);
pushMessage.setAttributes(attributes);
ObjectResponse<PushMessageSendResult> actual = pushServerClient.sendPushMessage(powerAuthTestClient.getApplicationId(), Mode.SYNCHRONOUS, pushMessage);

final ObjectResponse<PushMessageSendResult> actual = pushServerClient.sendPushMessage(powerAuthTestClient.getApplicationId(), Mode.SYNCHRONOUS, pushMessage);
assertEquals("OK", actual.getStatus());
List<PushDeviceRegistrationEntity> devices = pushDeviceRepository.findByAppCredentialsAppIdAndPushToken(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN);

final List<PushDeviceRegistrationEntity> devices = pushDeviceRepository.findByAppCredentialsAppIdAndPushToken(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN);
pushDeviceRepository.deleteAll(devices);
}


@Test
@SuppressWarnings("unchecked") //known parameters of HashMap
void sendPushMessageBatchTest() throws Exception {
boolean result = pushServerClient.createDevice(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN, MobilePlatform.ANDROID, powerAuthTestClient.getActivationId());
assertTrue(result);
List<PushMessage> batch = new ArrayList<>();
PushMessage pushMessage = new PushMessage();
PushMessageAttributes attributes = new PushMessageAttributes();
PushMessageBody pushMessageBody = new PushMessageBody();

final PushMessageBody pushMessageBody = new PushMessageBody();
pushMessageBody.setTitle("Balance update");
pushMessageBody.setBody("Your balance is now $745.00");
pushMessageBody.setBadge(3);
pushMessageBody.setSound("riff.wav");
pushMessageBody.setCategory("balance-update");
pushMessageBody.setCollapseKey("balance-update");
pushMessageBody.setValidUntil(Instant.now());
pushMessageBody.setExtras((Map<String, Object>) new HashMap<String, Object>().put("_comment", "Any custom data."));
pushMessageBody.setExtras(Map.of("_comment", "Any custom data."));

final PushMessageAttributes attributes = new PushMessageAttributes();
attributes.setSilent(false);
attributes.setPersonal(true);
pushMessage.setUserId("Test_User");

final PushMessage pushMessage = new PushMessage();
pushMessage.setUserId(PushServerTestClientFactory.TEST_USER_ID);
pushMessage.setActivationId(powerAuthTestClient.getActivationId());
pushMessage.setAttributes(attributes);
pushMessage.setBody(pushMessageBody);
pushMessage.setAttributes(attributes);
batch.add(pushMessage);
ObjectResponse<PushMessageSendResult> actual = pushServerClient.sendPushMessageBatch(powerAuthTestClient.getApplicationId(), Mode.SYNCHRONOUS, batch);

final List<PushMessage> batch = List.of(pushMessage);

final ObjectResponse<PushMessageSendResult> actual = pushServerClient.sendPushMessageBatch(powerAuthTestClient.getApplicationId(), Mode.SYNCHRONOUS, batch);
assertEquals("OK", actual.getStatus());
List<PushDeviceRegistrationEntity> devices = pushDeviceRepository.findByAppCredentialsAppIdAndPushToken(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN);

final List<PushDeviceRegistrationEntity> devices = pushDeviceRepository.findByAppCredentialsAppIdAndPushToken(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN);
pushDeviceRepository.deleteAll(devices);
}

Expand Down Expand Up @@ -289,14 +295,18 @@ void deleteUsersFromCampaignTest() throws Exception {

@Test
void sendTestingCampaignTest() throws Exception {
boolean actual = pushServerClient.sendTestCampaign(1L, "Test_User");
boolean result = pushServerClient.createDevice(powerAuthTestClient.getApplicationId(), MOCK_PUSH_TOKEN, MobilePlatform.ANDROID, powerAuthTestClient.getActivationId());
assertTrue(result);

final Long campaignId = createCampaign().getResponseObject().getId();
boolean actual = pushServerClient.sendTestCampaign(campaignId, PushServerTestClientFactory.TEST_USER_ID);
assertTrue(actual);
}

@Test
void sendCampaignTest() throws Exception {
createCampaign();
boolean result = pushServerClient.sendCampaign(1L);
final Long campaignId = createCampaign().getResponseObject().getId();
boolean result = pushServerClient.sendCampaign(campaignId);
assertTrue(result);
}

Expand Down

0 comments on commit 485aaa2

Please sign in to comment.