Merge branch 'master' into issue-13850

Author: luancazarine

components/gmail/actions/add-label-to-email/add-label-to-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-add-label-to-email",
   name: "Add Label to Email",
   description: "Add label(s) to an email message. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/modify)",
-  version: "0.0.4",
+  version: "0.0.5",
   type: "action",
   props: {
     gmail,

components/gmail/actions/create-draft/create-draft.mjs

@@ -1,10 +1,12 @@
 import gmail from "../../gmail.app.mjs";
+import { ConfigurationError } from "@pipedream/platform";
+import utils from "../../common/utils.mjs";
 
 export default {
   key: "gmail-create-draft",
   name: "Create Draft",
   description: "Create a draft from your Google Workspace email account. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.drafts/create)",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   props: {
     gmail,
@@ -44,10 +46,16 @@ export default {
         "bodyType",
       ],
     },
-    attachments: {
+    attachmentFilenames: {
       propDefinition: [
         gmail,
-        "attachments",
+        "attachmentFilenames",
+      ],
+    },
+    attachmentUrlsOrPaths: {
+      propDefinition: [
+        gmail,
+        "attachmentUrlsOrPaths",
       ],
     },
     inReplyTo: {
@@ -67,6 +75,11 @@ export default {
     },
   },
   async run({ $ }) {
+    this.attachmentFilenames = utils.parseArray(this.attachmentFilenames);
+    this.attachmentUrlsOrPaths = utils.parseArray(this.attachmentUrlsOrPaths);
+    if (this.attachmentFilenames?.length !== this.attachmentUrlsOrPaths?.length) {
+      throw new ConfigurationError("Must specify the same number of `Attachment Filenames` and `Attachment URLs or Paths`");
+    }
     const opts = await this.gmail.getOptionsToSendEmail($, this);
     const response = await this.gmail.createDraft(opts);
     $.export("$summary", "Successfully created a draft message");

components/gmail/actions/download-attachment/download-attachment.mjs

@@ -7,7 +7,7 @@ export default {
   key: "gmail-download-attachment",
   name: "Download Attachment",
   description: "Download an attachment by attachmentId to the /tmp directory. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.messages.attachments/get)",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   props: {
     gmail,

components/gmail/actions/find-email/find-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-find-email",
   name: "Find Email",
   description: "Find an email using Google's Search Engine. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/list)",
-  version: "0.0.5",
+  version: "0.0.6",
   type: "action",
   props: {
     gmail,

components/gmail/actions/remove-label-from-email/remove-label-from-email.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-remove-label-from-email",
   name: "Remove Label from Email",
   description: "Remove label(s) from an email message. [See the docs](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/modify)",
-  version: "0.0.1",
+  version: "0.0.2",
   type: "action",
   props: {
     gmail,

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

@@ -1,10 +1,12 @@
 import gmail from "../../gmail.app.mjs";
+import { ConfigurationError } from "@pipedream/platform";
+import utils from "../../common/utils.mjs";
 
 export default {
   key: "gmail-send-email",
   name: "Send Email",
   description: "Send an email from your Google Workspace email account. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.messages/send)",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "action",
   props: {
     gmail,
@@ -32,6 +34,12 @@ export default {
         "fromName",
       ],
     },
+    fromEmail: {
+      propDefinition: [
+        gmail,
+        "fromEmail",
+      ],
+    },
     replyTo: {
       propDefinition: [
         gmail,
@@ -56,10 +64,16 @@ export default {
         "bodyType",
       ],
     },
-    attachments: {
+    attachmentFilenames: {
+      propDefinition: [
+        gmail,
+        "attachmentFilenames",
+      ],
+    },
+    attachmentUrlsOrPaths: {
       propDefinition: [
         gmail,
-        "attachments",
+        "attachmentUrlsOrPaths",
       ],
     },
     inReplyTo: {
@@ -76,6 +90,11 @@ export default {
     },
   },
   async run({ $ }) {
+    this.attachmentFilenames = utils.parseArray(this.attachmentFilenames);
+    this.attachmentUrlsOrPaths = utils.parseArray(this.attachmentUrlsOrPaths);
+    if (this.attachmentFilenames?.length !== this.attachmentUrlsOrPaths?.length) {
+      throw new ConfigurationError("Must specify the same number of `Attachment Filenames` and `Attachment URLs or Paths`");
+    }
     const opts = await this.gmail.getOptionsToSendEmail($, this);
     const response = await this.gmail.sendEmail(opts);
     $.export("$summary", `Successfully sent email to ${this.to}`);

components/gmail/actions/update-org-signature/update-org-signature.mjs

@@ -8,7 +8,7 @@ export default {
   name: "Update Signature for Email in Organization",
   description: `Update the signature for a specific email address in an organization.
     A Google Cloud service account with delegated domain-wide authority is required for this action. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.settings.sendAs/update)`,
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   props: {
     gmail,

components/gmail/actions/update-primary-signature/update-primary-signature.mjs

@@ -4,7 +4,7 @@ export default {
   key: "gmail-update-primary-signature",
   name: "Update Signature for Primary Email Address",
   description: "Update the signature for the primary email address. [See the documentation](https://developers.google.com/gmail/api/reference/rest/v1/users.settings.sendAs/update)",
-  version: "0.0.2",
+  version: "0.0.3",
   type: "action",
   props: {
     gmail,

components/gmail/common/utils.mjs

@@ -0,0 +1,12 @@
+function parseArray(arr) {
+  if (!arr) {
+    return undefined;
+  }
+  return typeof arr === "string"
+    ? JSON.parse(arr)
+    : arr;
+}
+
+export default {
+  parseArray,
+};

components/gmail/gmail.app.mjs

@@ -195,6 +195,18 @@ export default {
       description: "Specify the name that will be displayed in the \"From\" section of the email.",
       optional: true,
     },
+    fromEmail: {
+      type: "string",
+      label: "From Email",
+      description: "Specify the email address that will be displayed in the \"From\" section of the email.",
+      optional: true,
+      async options() {
+        const { sendAs } = await this.listSignatures();
+        return sendAs
+          .filter(({ sendAsEmail }) => sendAsEmail)
+          .map(({ sendAsEmail }) => sendAsEmail);
+      },
+    },
     replyTo: {
       type: "string",
       label: "Reply To",
@@ -219,10 +231,16 @@ export default {
       default: "plaintext",
       options: Object.values(constants.BODY_TYPES),
     },
-    attachments: {
-      type: "object",
-      label: "Attachments",
-      description: "Add any attachments you'd like to include as objects.\n- The `key` should be the filename and must contain the file extension (e.g. `.jpeg`, `.txt`).\n- The `value` should be a URL of the download link for the file, or the local path (e.g. `/tmp/my-file.txt`).",
+    attachmentFilenames: {
+      type: "string[]",
+      label: "Attachment Filenames",
+      description: "Array of the names of the files to attach. Must contain the file extension (e.g. `.jpeg`, `.txt`). Use in conjuction with `Attachment URLs or Paths`.",
+      optional: true,
+    },
+    attachmentUrlsOrPaths: {
+      type: "string[]",
+      label: "Attachment URLs or Paths",
+      description: "Array of the URLs of the download links for the files, or the local paths (e.g. `/tmp/my-file.txt`). Use in conjuction with `Attachment Filenames`.",
       optional: true,
     },
     inReplyTo: {
@@ -260,11 +278,12 @@ export default {
         name: fromName,
         email,
       } = await this.userInfo();
+      const fromEmail = props.fromEmail || email;
 
       const opts = {
         from: props.fromName
-          ? `${props.fromName} <${email}>`
-          : `${fromName} <${email}>`,
+          ? `${props.fromName} <${fromEmail}>`
+          : `${fromName} <${fromEmail}>`,
         to: props.to,
         cc: props.cc,
         bcc: props.bcc,
@@ -289,18 +308,14 @@ export default {
         }
       }
 
-      if (props.attachments) {
-        if (typeof props.attachments === "string") {
-          props.attachments = JSON.parse(props.attachments);
+      if (props.attachmentFilenames?.length && props.attachmentUrlsOrPaths?.length) {
+        opts.attachments = [];
+        for (let i = 0; i < props.attachmentFilenames.length; i++) {
+          opts.attachments.push({
+            filename: props.attachmentFilenames[i],
+            path: props.attachmentUrlsOrPaths[i],
+          });
         }
-        opts.attachments = Object.entries(props.attachments)
-          .map(([
-            filename,
-            path,
-          ]) => ({
-            filename,
-            path,
-          }));
       }
 
       if (props.bodyType === constants.BODY_TYPES.HTML) {