Skip to content

Commit d43fa03

Browse files
author
Stanislav
authored
Merge pull request #87 from Backendless/grin/12727/send-email
Change send email response
2 parents 6562576 + fd35b63 commit d43fa03

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

src/backendless.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,8 +556,8 @@ declare module __Backendless {
556556
publishSync(channelName:string, message:string|Object, publishOptions?:Backendless.PublishOptions, deliveryOptions?:Backendless.DeliveryOptions):Object;
557557
publish(channelName:string, message:string|Object, publishOptions?:Backendless.PublishOptions, deliveryOptions?:Backendless.DeliveryOptions):Promise<Object>;
558558

559-
sendEmailSync(subject:string, bodyParts:Backendless.Bodyparts, recipients:string[], attachments:string[]):Object;
560-
sendEmail(subject:string, bodyParts:Backendless.Bodyparts, recipients:string[], attachments:string[]):Promise<Object>;
559+
sendEmailSync(subject:string, bodyParts:Backendless.Bodyparts, recipients:string[], attachments?:string[]):String;
560+
sendEmail(subject:string, bodyParts:Backendless.Bodyparts, recipients:string[], attachments?:string[]):Promise<String>;
561561

562562
cancelSync(messageId:string):boolean;
563563
cancel(messageId:string):Promise<boolean>;

src/backendless.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3882,16 +3882,18 @@
38823882
if (!Utils.isEmpty(attachments)) {
38833883
data.attachment = attachments;
38843884
}
3885-
} else {
3886-
throw new Error('Attachments must be an array of file IDs from File Service');
38873885
}
38883886
}
38893887

3888+
function responseMessageStatus(res) {
3889+
return res.status
3890+
}
3891+
38903892
return Backendless._ajax({
38913893
method : 'POST',
38923894
url : this.restUrl + '/email',
38933895
isAsync : isAsync,
3894-
asyncHandler: responder,
3896+
asyncHandler: Utils.wrapAsync(responder, responseMessageStatus),
38953897
data : JSON.stringify(data)
38963898
});
38973899
},

test/tsd.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,10 @@ function testMessaging() {
484484
var messageId:string = 'str';
485485
var message:string|Object = 'str';
486486
var resultObj:Object;
487+
var resultString:String;
487488
var resultBool:boolean = true;
488489
var promiseObject:Promise<Object>;
490+
var PromiseString:Promise<String>;
489491
var bodyParts:Backendless.Bodyparts = new Backendless.Bodyparts();
490492
var recipients:string[] = ['str'];
491493
var attachments:string[] = ['str'];
@@ -505,8 +507,8 @@ function testMessaging() {
505507
resultObj = Backendless.Messaging.publishSync(channelName, message, publishOptions, deliveryOptions);
506508
promiseObject = Backendless.Messaging.publish(channelName, message, publishOptions, deliveryOptions);
507509

508-
resultObj = Backendless.Messaging.sendEmailSync(subject, bodyParts, recipients, attachments);
509-
promiseObject = Backendless.Messaging.sendEmail(subject, bodyParts, recipients, attachments);
510+
resultString = Backendless.Messaging.sendEmailSync(subject, bodyParts, recipients, attachments);
511+
PromiseString = Backendless.Messaging.sendEmail(subject, bodyParts, recipients, attachments);
510512

511513
resultBool = Backendless.Messaging.cancelSync(messageId);
512514
promiseObject = Backendless.Messaging.cancel(messageId);

0 commit comments

Comments
 (0)