Use URLSearchParams for application/x-www-form-urlencoded

Fix undefined data for files

.github/workflows/test.yml

@@ -62,6 +62,13 @@ jobs:
           data: '{ "key": "value" }'
           files: '{ "file": "${{ github.workspace }}/testfile.txt" }'
 
+      - name: Request Postman Echo POST Multipart without data
+        uses: ./
+        with:
+          url: 'https://postman-echo.com/post'
+          method: 'POST'
+          files: '{ "file": "${{ github.workspace }}/testfile.txt" }'
+
       - name: Request Postman Echo POST single file
         uses: ./
         with:

README.md

@@ -41,12 +41,14 @@ jobs:
 |escapeData| Escape newlines in data string content. Use 'true' (string) as value to enable it ||
 |preventFailureOnNoResponse| Prevent this Action to fail if the request respond without an response. Use 'true' (string) as value to enable it ||
 |ignoreStatusCodes| Prevent this Action to fail if the request respond with one of the configured Status Codes. Example: '404,401' ||
+|httpsCA| Certificate authority as string in PEM format ||
 
 ### Response
 
 | Variable |  Description  |
 |---|---|
 `response` | Response as JSON String
+`headers` | Headers
 
 To display HTTP response data in the GitHub Actions log give the request an `id` and access its `outputs`. You can also access specific field from the response data using [fromJson()](https://docs.github.com/en/actions/learn-github-actions/expressions#fromjson) expression.
 
@@ -60,6 +62,7 @@ steps:
   - name: Show Response
     run: |
       echo ${{ steps.myRequest.outputs.response }}
+      echo ${{ steps.myRequest.outputs.headers }}
       echo ${{ fromJson(steps.myRequest.outputs.response).field_you_want_to_access }}
 ```
 

action.yml

@@ -53,6 +53,8 @@ inputs:
 outputs:
     response:
         description: 'HTTP Response Content'
+    headers:
+        description: 'HTTP Response Headers'
 runs:
     using: 'node16'
     main: 'dist/index.js'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "http-request-action",
-  "version": "1.9.0",
+  "version": "1.11.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "http-request-action",
-      "version": "1.9.0",
+      "version": "1.11.2",
       "license": "MIT",
       "dependencies": {
         "@zeit/ncc": "^0.22",
@@ -14,16 +14,17 @@
         "form-data": "^4.0.0"
       },
       "devDependencies": {
-        "@actions/core": "^1.2.6"
+        "@actions/core": "^1.9.1"
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.0.tgz",
-      "integrity": "sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
       "dev": true,
       "dependencies": {
-        "@actions/http-client": "^2.0.1"
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
       }
     },
     "node_modules/@actions/http-client": {
@@ -77,9 +78,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "funding": [
         {
           "type": "individual",
@@ -135,16 +136,26 @@
       "engines": {
         "node": ">=0.6.11 <=0.7.0 || >=0.7.3"
       }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
     }
   },
   "dependencies": {
     "@actions/core": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.0.tgz",
-      "integrity": "sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.0.tgz",
+      "integrity": "sha512-2aZDDa3zrrZbP5ZYg159sNoLRb61nQ7awl5pSvIq5Qpj81vwDzdMRKzkWJGJuwVvWpvZKx7vspJALyvaaIQyug==",
       "dev": true,
       "requires": {
-        "@actions/http-client": "^2.0.1"
+        "@actions/http-client": "^2.0.1",
+        "uuid": "^8.3.2"
       }
     },
     "@actions/http-client": {
@@ -188,9 +199,9 @@
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
     },
     "follow-redirects": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz",
-      "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
     "form-data": {
       "version": "4.0.0",
@@ -220,6 +231,12 @@
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
       "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==",
       "dev": true
+    },
+    "uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true
     }
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "http-request-action",
-  "version": "1.9.0",
+  "version": "1.11.2",
   "description": "",
   "main": "src/index.js",
   "private": false,
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/fjogeleit/http-request-action#readme",
   "devDependencies": {
-    "@actions/core": "^1.2.6"
+    "@actions/core": "^1.9.1"
   },
   "dependencies": {
     "@zeit/ncc": "^0.22",

src/httpClient.js

@@ -1,10 +1,15 @@
 const axios = require('axios');
 const FormData = require('form-data')
 const fs = require('fs')
+const url = require('url');
 
 const METHOD_GET = 'GET'
 const METHOD_POST = 'POST'
 
+const HEADER_CONTENT_TYPE = 'Content-Type'
+
+const CONTENT_TYPE_URLENCODED = 'application/x-www-form-urlencoded'
+
 /**
  * @param {Object} param0
  * @param {string} param0.method HTTP Method
@@ -52,6 +57,13 @@ const request = async({ method, instanceConfig, data, files, file, actions, igno
       updateConfigForFile(instanceConfig, file, actions)
     }
 
+    if (instanceConfig.headers[HEADER_CONTENT_TYPE] === CONTENT_TYPE_URLENCODED) {
+      let dataJson = convertToJSON(data)
+      if (typeof dataJson === 'object') {
+        data = (new url.URLSearchParams(dataJson)).toString();
+      }
+    }
+
     const requestData = {
       method,
       data,
@@ -68,6 +80,8 @@ const request = async({ method, instanceConfig, data, files, file, actions, igno
     const response = await instance.request(requestData)
 
     actions.setOutput('response', JSON.stringify(response.data))
+    
+    actions.setOutput('headers', response.headers)
   } catch (error) {
     if ((typeof error === 'object') && (error.isAxiosError === true)) {
       const { name, message, code, response } = error
@@ -95,7 +109,7 @@ const request = async({ method, instanceConfig, data, files, file, actions, igno
  */
 const convertToJSON = (value) => {
   try {
-    return JSON.parse(value)
+    return JSON.parse(value) || {}
   } catch(e) {
     return {}
   }