- Progress Commit (Emailzzz)

Signed-off-by: Dave Richer <dave@imexsystems.ca>

server/email/sendemail.js

@@ -10,6 +10,8 @@ const InstanceManager = require("../utils/instanceMgr").default;
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
 const queries = require("../graphql-client/queries");
+const {isObject} = require("lodash");
+const generateEmailTemplate  = require('./generateTemplate');
 
 const ses = new aws.SES({
   // The key apiVersion is no longer supported in v3, and can be removed.
@@ -88,7 +90,8 @@ exports.sendEmail = async (req, res) => {
     replyTo: req.body.ReplyTo.Email,
     to: req.body.to,
     cc: req.body.cc,
-    subject: req.body.subject
+    subject: req.body.subject,
+    templateStrings: req.body.templateStrings
   });
 
   let downloadedMedia = [];
@@ -104,6 +107,7 @@ exports.sendEmail = async (req, res) => {
             to: req.body.to,
             cc: req.body.cc,
             subject: req.body.subject,
+            templateStrings: req.body.templateStrings,
             error
           });
         }
@@ -134,7 +138,7 @@ exports.sendEmail = async (req, res) => {
             };
           })
         ] || null,
-      html: req.body.html,
+      html: isObject(req.body?.templateStrings) ? generateEmailTemplate(req.body.templateStrings) : req.body.html,
       ses: {
         // optional extra arguments for SendRawEmail
         Tags: [
@@ -153,7 +157,8 @@ exports.sendEmail = async (req, res) => {
           replyTo: req.body.ReplyTo.Email,
           to: req.body.to,
           cc: req.body.cc,
-          subject: req.body.subject
+          subject: req.body.subject, 
+          templateStrings: req.body.templateStrings
           // info,
         });
         logEmail(req, {
@@ -172,6 +177,7 @@ exports.sendEmail = async (req, res) => {
           to: req.body.to,
           cc: req.body.cc,
           subject: req.body.subject,
+          templateStrings: req.body.templateStrings,
           error: err
         });
         logEmail(req, {