BKNDLSS-26559 Adapt the sendEmailFromTemplate method if no templateValue is provided (#221)

Author: stanislaw-grin

backendless.d.ts

@@ -377,6 +377,8 @@ declare module Backendless {
 
         function sendEmailFromTemplate(templateName: string, emailEnvelope: Backendless.EmailEnvelope, templateValues?: object, attachments?: string[]): Promise<object>;
 
+        function sendEmailFromTemplate(templateName: string, emailEnvelope: Backendless.EmailEnvelope, attachments?: string[]): Promise<object>;
+
         function cancel(messageId: string): Promise<boolean>;
 
         function registerDevice(deviceToken: string, channels?: string[], expiration?: number | Date): Promise<Object>;

src/messaging/index.js

@@ -118,10 +118,14 @@ export default class Messaging {
 
     data['template-name'] = templateName
 
-    if (templateValues) {
+    if (templateValues && !Array.isArray(templateValues)) {
       data['template-values'] = templateValues
     }
 
+    if (Array.isArray(templateValues) && !attachments) {
+      attachments = templateValues
+    }
+
     if (attachments) {
       data.attachment = attachments
     }

test/tsd.ts

@@ -1000,6 +1000,8 @@ function testMessaging() {
 
     promiseObject = Backendless.Messaging.sendEmailFromTemplate(templateName, envelopeObject, templateValues);
 
+    promiseObject = Backendless.Messaging.sendEmailFromTemplate(templateName, envelopeObject, attachments);
+
     promiseObject = Backendless.Messaging.sendEmailFromTemplate(templateName, envelopeObject);
 
     promiseObject = Backendless.Messaging.cancel(messageId);

test/unit/specs/messaging/emails.js

@@ -275,6 +275,44 @@ describe('<Messaging> Emails', function() {
       expect(result1).to.be.eql({ fakeResult })
     })
 
+    it('sends an email with attachments without templateValues', async () => {
+      const req1 = prepareMockRequest({ fakeResult })
+
+      const result1 = await Backendless.Messaging.sendEmailFromTemplate(templateName, emailEnvelope, null, attachments)
+
+      expect(req1).to.deep.include({
+        method : 'POST',
+        path   : `${APP_PATH}/emailtemplate/send`,
+        headers: { 'Content-Type': 'application/json' },
+        body   : {
+          addresses        : ['foo@bar.com'],
+          'template-name'  : templateName,
+          attachment: attachments
+        }
+      })
+
+      expect(result1).to.be.eql({ fakeResult })
+    })
+
+    it('sends an email with attachments on templateValues argument place', async () => {
+      const req1 = prepareMockRequest({ fakeResult })
+
+      const result1 = await Backendless.Messaging.sendEmailFromTemplate(templateName, emailEnvelope, attachments)
+
+      expect(req1).to.deep.include({
+        method : 'POST',
+        path   : `${APP_PATH}/emailtemplate/send`,
+        headers: { 'Content-Type': 'application/json' },
+        body   : {
+          addresses        : ['foo@bar.com'],
+          'template-name'  : templateName,
+          attachment: attachments
+        }
+      })
+
+      expect(result1).to.be.eql({ fakeResult })
+    })
+
     it('fails when subject is invalid', async () => {
       const errorMsg = 'Email Template Name must be provided and must be a string.'