improve description and validate from & replyTo props

Author: michelle0927

components/elastic_email/actions/create-campaign/create-campaign.mjs

@@ -1,5 +1,6 @@
 import app from "../../elastic_email.app.mjs";
 import { ConfigurationError } from "@pipedream/platform";
+import { isValidEmailFormat } from "../../common/utils.mjs";
 
 export default {
   key: "elastic_email-create-campaign",
@@ -22,7 +23,7 @@ export default {
     from: {
       type: "string",
       label: "From",
-      description: "Your e-mail with an optional name (e.g.: John Doe email@domain.com)",
+      description: "Your e-mail with an optional name (e.g.: `email@domain.com` or `John Doe <email@domain.com>`)",
     },
     recipientListNames: {
       propDefinition: [
@@ -44,7 +45,7 @@ export default {
     replyTo: {
       type: "string",
       label: "Reply To",
-      description: "To what address should the recipients reply to (e.g. John Doe email@domain.com)",
+      description: "To what address should the recipients reply to (e.g. `email@domain.com` or `John Doe <email@domain.com>`)",
     },
     status: {
       propDefinition: [
@@ -84,6 +85,13 @@ export default {
     },
   },
   async run({ $ }) {
+    if (this.from && !isValidEmailFormat(this.from)) {
+      throw new ConfigurationError("Invalid email format for 'From'");
+    }
+    if (this.replyTo && !isValidEmailFormat(this.replyTo)) {
+      throw new ConfigurationError("Invalid email format for 'Reply To'");
+    }
+
     if (!this.recipientListNames && !this.recipientSegmentNames) {
       throw new ConfigurationError("You must provide at least one list or segment to read recipients from");
     }

components/elastic_email/actions/send-email/send-email.mjs

@@ -2,7 +2,10 @@ import {
   BODY_CONTENT_TYPE_OPTIONS,
   ENCODING_OPTIONS,
 } from "../../common/constants.mjs";
-import { parseObject } from "../../common/utils.mjs";
+import {
+  parseObject, isValidEmailFormat,
+} from "../../common/utils.mjs";
+import { ConfigurationError } from "@pipedream/platform";
 import app from "../../elastic_email.app.mjs";
 
 export default {
@@ -26,7 +29,7 @@ export default {
     from: {
       type: "string",
       label: "From",
-      description: "Your e-mail with an optional name (e.g.: email@domain.com)",
+      description: "Your e-mail with an optional name (e.g.: `email@domain.com` or `John Doe <email@domain.com>`)",
     },
     bodyContentType: {
       type: "string",
@@ -50,7 +53,7 @@ export default {
     replyTo: {
       type: "string",
       label: "Reply To",
-      description: "To what address should the recipients reply to (e.g. email@domain.com)",
+      description: "To what address should the recipients reply to (e.g. `email@domain.com` or `John Doe <email@domain.com>`)",
       optional: true,
     },
     subject: {
@@ -105,6 +108,13 @@ export default {
     },
   },
   async run({ $ }) {
+    if (this.from && !isValidEmailFormat(this.from)) {
+      throw new ConfigurationError("Invalid email format for 'From'");
+    }
+    if (this.replyTo && !isValidEmailFormat(this.replyTo)) {
+      throw new ConfigurationError("Invalid email format for 'Reply To'");
+    }
+
     const response = await this.app.sendBulkEmails({
       $,
       data: {

components/elastic_email/actions/update-campaign/update-campaign.mjs

@@ -1,4 +1,6 @@
 import app from "../../elastic_email.app.mjs";
+import { isValidEmailFormat } from "../../common/utils.mjs";
+import { ConfigurationError } from "@pipedream/platform";
 
 export default {
   key: "elastic_email-update-campaign",
@@ -28,7 +30,7 @@ export default {
     from: {
       type: "string",
       label: "From",
-      description: "Your e-mail with an optional name (e.g.: John Doe email@domain.com)",
+      description: "Your e-mail with an optional name (e.g.: `email@domain.com` or `John Doe <email@domain.com>`)",
       optional: true,
     },
     recipientListNames: {
@@ -51,7 +53,7 @@ export default {
     replyTo: {
       type: "string",
       label: "Reply To",
-      description: "To what address should the recipients reply to (e.g. John Doe email@domain.com)",
+      description: "To what address should the recipients reply to (e.g. `email@domain.com` or `John Doe <email@domain.com>`)",
       optional: true,
     },
     subject: {
@@ -93,6 +95,13 @@ export default {
     },
   },
   async run({ $ }) {
+    if (this.from && !isValidEmailFormat(this.from)) {
+      throw new ConfigurationError("Invalid email format for 'From'");
+    }
+    if (this.replyTo && !isValidEmailFormat(this.replyTo)) {
+      throw new ConfigurationError("Invalid email format for 'Reply To'");
+    }
+
     const campaign = await this.app.getCampaign({
       $,
       campaign: this.campaign,

components/elastic_email/common/utils.mjs

@@ -1,4 +1,4 @@
-export const parseObject = (obj) => {
+const parseObject = (obj) => {
   if (!obj) return undefined;
 
   if (Array.isArray(obj)) {
@@ -22,3 +22,13 @@ export const parseObject = (obj) => {
   }
   return obj;
 };
+
+const isValidEmailFormat = (str) => {
+  const emailPattern = /^(?:[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}|[^<>]+<\s*[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}\s*>)$/;
+  return emailPattern.test(str.trim());
+};
+
+export {
+  parseObject,
+  isValidEmailFormat,
+};