Merge pull request #27 from mtrezza/release-1.0.6

Release 1.0.6

Author: mtrezza

CHANGELOG.md

@@ -1,7 +1,40 @@
 # Changelog
 
-# main
-[Full Changelog](https://github.com/mtrezza/parse-server-api-mail-adapter/compare/1.0.5...master)
+Jump directly to a version:
+
+| 1.x                                |
+|------------------------------------|
+| [**1.0.6 (latest release)**](#106) |
+| [1.0.5](#105)                      |
+| [1.0.4](#104)                      |
+| [1.0.3](#103)                      |
+| [1.0.2](#102)                      |
+| [1.0.1](#101)                      |
+| [1.0.0](#100)                      |
+
+# Unreleased (Main Branch)
+[Full Changelog](https://github.com/mtrezza/parse-server-api-mail-adapter/compare/1.0.6...master)
+
+### ⚠️ Breaking Changes
+*(none)*
+
+### 🚀 Notable Changes
+*(none)*
+
+### 🧬 Other Changes
+*(none)*
+
+# 1.0.6
+[Full Changelog](https://github.com/mtrezza/parse-server-api-mail-adapter/compare/1.0.5...1.0.6)
+
+### ⚠️ Breaking Changes
+*(none)*
+
+### 🚀 Notable Changes
+*(none)*
+
+### 🧬 Other Changes
+- Fixes failing to send email in Cloud Code without template (Manuel Trezza) [#26](https://github.com/mtrezza/parse-server-api-mail-adapter/pull/26)
 
 # 1.0.5
 [Full Changelog](https://github.com/mtrezza/parse-server-api-mail-adapter/compare/1.0.4...1.0.5)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server-api-mail-adapter",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "API Mail Adapter for Parse Server",
   "main": "./lib/index.js",
   "repository": {
@@ -10,7 +10,10 @@
   "keywords": [
     "parse",
     "parse-server",
-    "email-adapter"
+    "mail-adapter",
+    "email-adapter",
+    "mail",
+    "email"
   ],
   "author": "Manuel Trezza",
   "license": "MIT",

spec/ApiMailAdapter.spec.js

@@ -251,6 +251,26 @@ describe('ApiMailAdapter', () => {
       expect(_sendMail.calls.all()[0].args[0]).toEqual(expectedArguments);
     });
 
+    it('allows sendMail() without using a template', async () => {
+      const adapter = new ApiMailAdapter(config);
+      const apiCallbackSpy = spyOn(adapter, 'apiCallback').and.callFake(apiResponseSuccess);
+      const options = {
+        sender: config.sender,
+        recipient: 'to@example.com',
+        subject: 'ExampleSubject',
+        text: 'ExampleText',
+        html: 'ExampleHtml',
+      };
+
+      await expectAsync(adapter.sendMail(options)).toBeResolved();
+      const apiPayload = apiCallbackSpy.calls.all()[0].args[0].payload;
+      expect(apiPayload.from).toEqual(options.sender);
+      expect(apiPayload.to).toEqual(options.recipient);
+      expect(apiPayload.subject).toEqual(options.subject);
+      expect(apiPayload.text).toEqual(options.text);
+      expect(apiPayload.html).toEqual(options.html);
+    });
+
     it('passes user to callback when user is passed to sendMail()', async () => {
       const adapter = new ApiMailAdapter(config);
       const localeCallbackSpy = spyOn(config.templates.customEmailWithLocaleCallback, 'localeCallback').and.callThrough();
@@ -385,7 +405,6 @@ describe('ApiMailAdapter', () => {
       const adapter = new ApiMailAdapter(config);
       const configs = [
         { templateName: 'invalid' },
-        { templateName: 'invalid', direct: true }
       ];
       for (const config of configs) {
         await expectAsync(adapter._sendMail(config)).toBeRejectedWith(Errors.Error.noTemplateWithName('invalid'));

src/ApiMailAdapter.js

@@ -125,15 +125,15 @@ class ApiMailAdapter extends MailAdapter {
     const templateName = email.templateName;
 
     // If template name is not set
-    if (!templateName) {
+    if (!templateName && !email.direct) {
       throw Errors.Error.templateConfigurationNoName;
     }
 
     // Get template
     const template = this.templates[templateName];
 
     // If template does not exist
-    if (!template) {
+    if (!template && !email.direct) {
       throw Errors.Error.noTemplateWithName(templateName);
     }
 
@@ -142,7 +142,12 @@ class ApiMailAdapter extends MailAdapter {
     // 1. Placeholders set in the template (default)
     // 2. Placeholders set in the email
     // 3. Placeholders returned by the placeholder callback
-    const placeholders = template.placeholders || {};
+    let placeholders = {};
+
+    // Add template placeholders
+    if (template) {
+      placeholders = Object.assign(placeholders, template.placeholders || {});
+    }
 
     // If the email is sent directly via Cloud Code
     if (email.direct) {
@@ -218,7 +223,7 @@ class ApiMailAdapter extends MailAdapter {
    */
   async _createApiData(options) {
     let { message } = options;
-    const { template, user, placeholders = {} } = options;
+    const { template = {}, user, placeholders = {} } = options;
     const { placeholderCallback, localeCallback } = template;
     let locale;