Merge branch '16977-applying-fileurl-paths-improvement' into 16977-part-2

Author: GTFalcao

components/pdf4me/actions/convert-to-pdf/convert-to-pdf.mjs

@@ -23,13 +23,14 @@ export default {
     },
   },
   async run({ $ }) {
+    const filename = utils.checkForExtension(this.filename, "pdf");
     const fileContent = await utils.getBase64File(this.filePath);
 
     const response = await this.pdf4me.convertToPdf({
       $,
       data: {
         docContent: fileContent,
-        docName: this.filename,
+        docName: filename,
       },
       responseType: "arraybuffer",
     });

components/zoho_desk/actions/add-ticket-attachment/add-ticket-attachment.mjs

@@ -1,5 +1,6 @@
 import zohoDesk from "../../zoho_desk.app.mjs";
-import constants from "../../common/constants.mjs";
+import { getFileStreamAndMetadata } from "@pipedream/platform";
+import FormData from "form-data";
 
 export default {
   key: "zoho_desk-add-ticket-attachment",
@@ -44,19 +45,30 @@ export default {
       file,
     } = this;
 
+    const data = new FormData();
+    const {
+      stream, metadata,
+    } = await getFileStreamAndMetadata(file);
+    data.append("file", stream, {
+      contentType: metadata.contentType,
+      knownLength: metadata.size,
+      filename: metadata.name,
+    });
+
     const response = await this.zohoDesk.createTicketAttachment({
+      $,
       ticketId,
+      params: {
+        isPublic,
+      },
       headers: {
         orgId,
-        ...constants.MULTIPART_FORM_DATA_HEADERS,
-      },
-      data: {
-        file,
-        isPublic,
+        ...data.getHeaders(),
       },
+      data,
     });
 
-    $.export("$summary", `Successfully created a new ticket attachment with ID ${response.id}`);
+    $.export("$summary", `Successfully created a new ticket attachment with ID ${response?.id}`);
 
     return response;
   },

components/zoho_desk/zoho_desk.app.mjs

@@ -124,31 +124,16 @@ export default {
       $ = this,
       url,
       path,
-      headers: preHeaders,
       params,
-      data: preData,
+      headers,
       versionPath = constants.VERSION_PATH,
       withRetries = true,
       ...args
     } = {}) {
-      const contentType = constants.CONTENT_TYPE_KEY_HEADER;
-
-      const hasMultipartHeader = utils.hasMultipartHeader(preHeaders);
-      const data = hasMultipartHeader && await utils.getFormData(preData) || preData;
-
-      const currentHeaders = this.getHeaders(preHeaders);
-      const headers = hasMultipartHeader
-        ? {
-          ...currentHeaders,
-          [contentType]: data.getHeaders()[contentType.toLowerCase()],
-        }
-        : currentHeaders;
-
       const config = {
-        headers,
         url: this.getUrl(url, path, versionPath),
         params: this.getParams(url, params),
-        data,
+        headers: this.getHeaders(headers),
         ...args,
       };
       try {