Skip to content

Add support for passing collapse-id to APNS #79

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
merged 2 commits into from
May 10, 2017
Merged

Add support for passing collapse-id to APNS #79

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
7aee2bb
Add support for passing collapseId to APNS
Amnell May 3, 2017
4b6dc09
Rename appIdentifier header to topic
Amnell May 8, 2017
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
11 changes: 10 additions & 1 deletion spec/APNS.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,9 @@ describe('APNS', () => {
'keyAgain': 'valueAgain'
};
let expirationTime = 1454571491354;
let collapseId = "collapseIdentifier";

let notification = APNS._generateNotification(data, expirationTime);
let notification = APNS._generateNotification(data, { expirationTime: expirationTime, collapseId: collapseId });

expect(notification.aps.alert).toEqual(data.alert);
expect(notification.aps.badge).toEqual(data.badge);
Expand All @@ -183,6 +184,7 @@ describe('APNS', () => {
'keyAgain': 'valueAgain'
});
expect(notification.expiry).toEqual(expirationTime / 1000);
expect(notification.collapseId).toEqual(collapseId);
done();
});

Expand Down Expand Up @@ -239,7 +241,9 @@ describe('APNS', () => {
});
// Mock data
let expirationTime = 1454571491354;
let collapseId = "collapseIdentifier";
let data = {
'collapse_id': collapseId,
'expiration_time': expirationTime,
'data': {
'alert': 'alert'
Expand Down Expand Up @@ -270,6 +274,7 @@ describe('APNS', () => {
let notification = calledArgs[0];
expect(notification.aps.alert).toEqual(data.data.alert);
expect(notification.expiry).toEqual(data['expiration_time'] / 1000);
expect(notification.collapseId).toEqual(data['collapse_id']);
let apnDevices = calledArgs[1];
expect(apnDevices.length).toEqual(4);
done();
Expand Down Expand Up @@ -306,7 +311,9 @@ describe('APNS', () => {
apns.providers = [provider, providerDev];
// Mock data
let expirationTime = 1454571491354;
let collapseId = "collapseIdentifier";
let data = {
'collapse_id': collapseId,
'expiration_time': expirationTime,
'data': {
'alert': 'alert'
Expand Down Expand Up @@ -343,6 +350,7 @@ describe('APNS', () => {
let notification = calledArgs[0];
expect(notification.aps.alert).toEqual(data.data.alert);
expect(notification.expiry).toEqual(data['expiration_time'] / 1000);
expect(notification.collapseId).toEqual(data['collapse_id']);
let apnDevices = calledArgs[1];
expect(apnDevices.length).toBe(3);

Expand All @@ -351,6 +359,7 @@ describe('APNS', () => {
notification = calledArgs[0];
expect(notification.aps.alert).toEqual(data.data.alert);
expect(notification.expiry).toEqual(data['expiration_time'] / 1000);
expect(notification.collapseId).toEqual(data['collapse_id']);
apnDevices = calledArgs[1];
expect(apnDevices.length).toBe(2);
done();
Expand Down
16 changes: 10 additions & 6 deletions src/APNS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export class APNS {
send(data, allDevices) {
let coreData = data.data;
let expirationTime = data['expiration_time'];
let collapseId = data['collapse_id'];
let allPromises = [];

let devicesPerAppIdentifier = {};
Expand All @@ -95,7 +96,8 @@ export class APNS {
continue;
}

let notification = APNS._generateNotification(coreData, expirationTime, appIdentifier);
let headers = { expirationTime: expirationTime, topic: appIdentifier, collapseId: collapseId }
let notification = APNS._generateNotification(coreData, headers);
const deviceIds = devices.map(device => device.deviceToken);
let promise = this.sendThroughProvider(notification, deviceIds, providers);
allPromises.push(promise.then(this._handlePromise.bind(this)));
Expand Down Expand Up @@ -164,11 +166,10 @@ export class APNS {
/**
* Generate the apns Notification from the data we get from api request.
* @param {Object} coreData The data field under api request body
* @param {number} expirationTime The expiration time in milliseconds since Jan 1 1970
* @param {String} topic Topic the Notification is sent to
* @param {Object} headers The header properties for the notification (topic, expirationTime, collapseId)
* @returns {Object} A apns Notification
*/
static _generateNotification(coreData, expirationTime, topic) {
static _generateNotification(coreData, headers) {
let notification = new apn.Notification();
let payload = {};
for (let key in coreData) {
Expand Down Expand Up @@ -198,9 +199,12 @@ export class APNS {
break;
}
}
notification.topic = topic;

notification.payload = payload;
notification.expiry = expirationTime / 1000;

notification.topic = headers.topic;
notification.expiry = headers.expirationTime / 1000;
notification.collapseId = headers.collapseId;
return notification;
}

Expand Down