Fixing broken build for #689

sendgrid · May 30, 2018 · 2abbbce · 2abbbce
1 parent e477405
commit 2abbbce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/helpers/classes/mail.js b/packages/helpers/classes/mail.js
@@ -57,7 +57,7 @@ class Mail {
     //Convert to camel case to make it workable, making a copy to prevent
     //changes to the original objects
     data = deepClone(data);
-    data = toCamelCase(data, ['substitutions', 'customArgs', 'headers']);
+    data = toCamelCase(data, ['substitutions', 'dynamicTemplateData', 'customArgs', 'headers']);
 
     //Extract properties from data
     const {
@@ -587,7 +587,7 @@ class Mail {
     }
 
     //Return as snake cased object
-    return toSnakeCase(json, ['substitutions', 'customArgs', 'headers']);
+    return toSnakeCase(json, ['substitutions', 'dynamicTemplateData', 'customArgs', 'headers']);
   }
 
   /**************************************************************************

diff --git a/packages/helpers/classes/personalization.js b/packages/helpers/classes/personalization.js
@@ -328,14 +328,15 @@ class Personalization {
     if (Object.keys(headers).length > 0) {
       json.headers = headers;
     }
-    if (Object.keys(substitutions).length > 0) {
+    if (substitutions && Object.keys(substitutions).length > 0) {
       const [left, right] = substitutionWrappers;
       json.substitutions = wrapSubstitutions(substitutions, left, right);
     }
     if (Object.keys(customArgs).length > 0) {
       json.customArgs = customArgs;
     }
-    if (Object.keys(dynamicTemplateData).length > 0) {
+
+    if (dynamicTemplateData && Object.keys(dynamicTemplateData).length > 0) {
       json.dynamicTemplateData = dynamicTemplateData;
     }