Skip to content
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

Re-Enable Endpoints before sending push and allow sending push to Topic #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Re-Enable Endpoints before sending push and allow sending push to Topic #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9b2e24
Update SNSPushAdapter.js
benishak Aug 3, 2016
6d60db3
Enabled attr must be string
benishak Aug 3, 2016
140620c
edit test
benishak Aug 3, 2016
98d7985
allow sending to topic
Aug 3, 2016
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
83 changes: 58 additions & 25 deletions spec/SNSPushAdapter.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('SNSPushAdapter', () => {

it('can send push notifications', (done) => {
// Mock SNS sender
var snsSender = jasmine.createSpyObj('sns', ['createPlatformEndpoint', 'publish']);
var snsSender = jasmine.createSpyObj('sns', ['createPlatformEndpoint', 'publish', 'setEndpointAttributes']);
snsPushAdapter.sns = snsSender;

// Mock android ios senders
Expand Down Expand Up @@ -178,11 +178,16 @@ describe('SNSPushAdapter', () => {

it('can send SNS Payload', (done) => {
// Mock out Amazon SNS token exchange
var snsSender = jasmine.createSpyObj('sns', ['publish'])
snsSender.publish.and.callFake(function (object, callback) {
var snsSender = jasmine.createSpyObj('sns', ['publish', 'setEndpointAttributes'])

snsSender.setEndpointAttributes.and.callFake(function (params, callback) {
callback(null, '123');
});


//snsSender.publish.and.callFake(function (object, callback) {
// callback(null, '123');
//});

snsPushAdapter.sns = snsSender;

// Mock installations
Expand All @@ -195,8 +200,10 @@ describe('SNSPushAdapter', () => {

var callback = jasmine.createSpy();
promise.then(function (response) {
expect(snsSender.publish).toHaveBeenCalled();
var args = snsSender.publish.calls.first().args;
expect(snsSender.setEndpointAttributes).toHaveBeenCalled();
var args = snsSender.setEndpointAttributes.calls.first().args;
//expect(snsSender.publish).toHaveBeenCalled();
//var args = snsSender.publish.calls.first().args;
expect(args[0].MessageStructure).toEqual("json");
expect(args[0].TargetArn).toEqual("123");
expect(args[0].Message).toEqual('{"test":"hello"}');
Expand All @@ -207,7 +214,7 @@ describe('SNSPushAdapter', () => {

it('errors exchanging ARNS', (done) => {
// Mock out Amazon SNS token exchange
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint']);
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint', 'setEndpointAttributes']);

snsSender.createPlatformEndpoint.and.callFake(function (object, callback) {
callback("error", {});
Expand All @@ -221,10 +228,15 @@ describe('SNSPushAdapter', () => {

it('errors sending SNS Payload to Android and iOS', (done) => {

var snsSender = jasmine.createSpyObj('sns', ['publish'])
snsSender.publish.and.callFake(function (object, callback) {
callback({'stack': 'abc'}, {});
var snsSender = jasmine.createSpyObj('sns', ['publish', 'setEndpointAttributes'])

snsSender.setEndpointAttributes.and.callFake(function (params, callback) {
callback(null, '123');
});

//snsSender.publish.and.callFake(function (object, callback) {
// callback({'stack': 'abc'}, {});
//});

snsPushAdapter.sns = snsSender;

Expand All @@ -238,7 +250,8 @@ describe('SNSPushAdapter', () => {

var callback = jasmine.createSpy();
promise.catch(function (response) {
expect(snsSender.publish).toHaveBeenCalled();
expect(snsSender.setEndpointAttributes).toHaveBeenCalled();
//expect(snsSender.publish).toHaveBeenCalled();
expect(response.transmitted).toBeFalsy();
expect(response.response).toEqual('abc');
done();
Expand All @@ -247,15 +260,19 @@ describe('SNSPushAdapter', () => {

it('can send SNS Payload to Android and iOS', (done) => {
// Mock out Amazon SNS token exchange
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint']);
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint','setEndpointAttributes']);

snsSender.createPlatformEndpoint.and.callFake(function (object, callback) {
callback(null, {'EndpointArn': 'ARN'});
});

snsSender.publish.and.callFake(function (object, callback) {
snsSender.setEndpointAttributes.and.callFake(function (params, callback) {
callback(null, '123');
});

//snsSender.publish.and.callFake(function (object, callback) {
// callback(null, '123');
//});

snsPushAdapter.sns = snsSender;

Expand All @@ -274,45 +291,56 @@ describe('SNSPushAdapter', () => {
var promise = snsPushAdapter.send({"test": "hello"}, installations);

promise.then(function () {
expect(snsSender.publish).toHaveBeenCalled();
expect(snsSender.publish.calls.count()).toEqual(2);
expect(snsSender.setEndpointAttributes).toHaveBeenCalled();
expect(snsSender.setEndpointAttributes.calls.count()).toEqual(2);
//expect(snsSender.publish).toHaveBeenCalled();
//expect(snsSender.publish.calls.count()).toEqual(2);
done();
});
});

it('can send to APNS with known identifier', (done) => {
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint']);
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint','setEndpointAttributes']);

snsSender.createPlatformEndpoint.and.callFake(function (object, callback) {
callback(null, {'EndpointArn': 'ARN'});
});

snsSender.publish.and.callFake(function (object, callback) {
snsSender.setEndpointAttributes.and.callFake(function (params, callback) {
callback(null, '123');
});

//snsSender.publish.and.callFake(function (object, callback) {
// callback(null, '123');
//});

snsPushAdapter.sns = snsSender;

var promises = snsPushAdapter.sendToAPNS({"test": "hello"}, [makeDevice("ios", "com.parseplatform.myapp")]);
expect(promises.length).toEqual(1);

Promise.all(promises).then(function () {
expect(snsSender.publish).toHaveBeenCalled();
expect(snsSender.setEndpointAttributes).toHaveBeenCalled();
//expect(snsSender.publish).toHaveBeenCalled();
done();
});

});

it('can send to APNS with unknown identifier', (done) => {
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint']);
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint','setEndpointAttributes']);

snsSender.createPlatformEndpoint.and.callFake(function (object, callback) {
callback(null, {'EndpointArn': 'ARN'});
});

snsSender.publish.and.callFake(function (object, callback) {
snsSender.setEndpointAttributes.and.callFake(function (params, callback) {
callback(null, '123');
});

//snsSender.publish.and.callFake(function (object, callback) {
// callback(null, '123');
//});

snsPushAdapter.sns = snsSender;

Expand All @@ -335,23 +363,28 @@ describe('SNSPushAdapter', () => {

snsPushAdapter = new SNSPushAdapter(pushConfig);

var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint']);
var snsSender = jasmine.createSpyObj('sns', ['publish', 'createPlatformEndpoint','setEndpointAttributes']);

snsSender.createPlatformEndpoint.and.callFake(function (object, callback) {
callback(null, {'EndpointArn': 'APNS_PROD_ID'});
});

snsSender.publish.and.callFake(function (object, callback) {
snsSender.setEndpointAttributes.and.callFake(function (params, callback) {
callback(null, '123');
});
//snsSender.publish.and.callFake(function (object, callback) {
// callback(null, '123');
//});

snsPushAdapter.sns = snsSender;

var promises = snsPushAdapter.sendToAPNS({"test": "hello"}, [makeDevice("ios", "beta.parseplatform.myapp")]);
expect(promises.length).toEqual(1);
Promise.all(promises).then(function () {
expect(snsSender.publish).toHaveBeenCalled();
var args = snsSender.publish.calls.first().args[0];
expect(snsSender.setEndpointAttributes).toHaveBeenCalled();
var args = snsSender.setEndpointAttributes.calls.first().args[0];
//expect(snsSender.publish).toHaveBeenCalled();
//var args = snsSender.publish.calls.first().args[0];
expect(args.Message).toEqual("{\"APNS_SANDBOX\":\"{}\"}");
done();
});
Expand Down
78 changes: 68 additions & 10 deletions src/SNSPushAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ SNSPushAdapter.prototype.exchangeTokenPromise = function (device, platformARN) {
* Send the Message, MessageStructure, and Target Amazon Resource Number (ARN) to SNS
* @param arn Amazon Resource ID
* @param payload JSON-encoded message
* @param device Device info (used for returning push status)
* @returns {Parse.Promise}
*/
SNSPushAdapter.prototype.sendSNSPayload = function (arn, payload, device) {
Expand All @@ -199,6 +198,11 @@ SNSPushAdapter.prototype.sendSNSPayload = function (arn, payload, device) {
MessageStructure: 'json',
TargetArn: arn
};

if (device.deviceToken.startsWith("arn")) {
object.TargetArn = undefined;
object.TopicArn = device.deviceToken;
}

return new Parse.Promise((resolve, reject) => {
var response = {
Expand All @@ -207,24 +211,72 @@ SNSPushAdapter.prototype.sendSNSPayload = function (arn, payload, device) {
deviceToken: device.deviceToken.toString('hex')
}
};

// publish to topic
if (object.TopicArn) {
return this.sns.publish(object, (err, data) => {
if (err != null) {
log.error(LOG_PREFIX, "Error sending push " + err);
response.transmitted = false;
if (err.stack) {
response.response = err.stack;
}
return reject(response);
}

this.sns.publish(object, (err, data) => {
if (data && data.MessageId) {
log.verbose(LOG_PREFIX, "Successfully sent push to " + data.MessageId);
}

response.transmitted = true;
response.response = data;
resolve(response);
});
}

/*
* Amazon SNS will set Endpoint to false when a notification service indicates to Amazon SNS
* that the endpoint is invalid. We need to set it back to true
*/

var params = {
Attributes: {
Enabled: "true",
},
EndpointArn: arn
};

this.sns.setEndpointAttributes(params, (err, data) => {
if (err != null) {
log.error(LOG_PREFIX, "Error sending push " + err);
log.error(LOG_PREFIX, "Error enabling Endpoints " + err);
response.transmitted = false;
if (err.stack) {
response.response = err.stack;
}
return reject(response);
}

if (data && data.MessageId) {
log.verbose(LOG_PREFIX, "Successfully sent push to " + data.MessageId);

// send the push after re-enabling Endpoint
if (data) {
this.sns.publish(object, (err, data) => {
if (err != null) {
log.error(LOG_PREFIX, "Error sending push " + err);
response.transmitted = false;
if (err.stack) {
response.response = err.stack;
}
return reject(response);
}

if (data && data.MessageId) {
log.verbose(LOG_PREFIX, "Successfully sent push to " + data.MessageId);
}

response.transmitted = true;
response.response = data;
resolve(response);
});
}

response.transmitted = true;
response.response = data;
resolve(response);
});
});
}
Expand All @@ -234,6 +286,12 @@ SNSPushAdapter.prototype.sendSNSPayload = function (arn, payload, device) {
*/

SNSPushAdapter.prototype.send = function (data, installations) {
if(installations.arn){
installations = installations.arn;
for (installation of installations){
installation.deviceToken = installation.topicArn;
}
}
let deviceMap = utils.classifyInstallations(installations, this.availablePushTypes);

let sendPromises = Object.keys(deviceMap).forEach((pushType) => {
Expand Down