fix: update url encoded form handling

nfsc-tommy · Feb 26, 2021 · 8c7abdc · 8c7abdc
1 parent 91af5f1
commit 8c7abdc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/requestconf.ts b/src/requestconf.ts
@@ -5,7 +5,7 @@ import {
   AxiosBasicCredentials,
   AxiosProxyConfig,
 } from 'axios';
-import { getEscapeString, isObject, isURLSearchParams } from './util';
+import { getEscapeString, isObject, isURLSearchParams, isString } from './util';
 
 // builder for request config
 const builder = {
@@ -107,15 +107,17 @@ if (config.data) {
   }
 }
 
-core.info(`axios config: ${core.getInput('content-type')}`);
+core.info(`axios config: ${core.getInput('content-type')}, ${JSON.stringify(config.data)}`);
 if (core.getInput('content-type')) {
   config.headers = {
     ...config.headers,
     'Content-Type': core.getInput('content-type'),
   };
+
   if (core.getInput('content-type') === 'application/x-www-form-urlencoded') {
-    if (!isURLSearchParams(config.data) && isObject(config.data)) {
-      config.data = new URLSearchParams(config.data);
+    if (!isString(config.data)) {
+      const params = new URLSearchParams(config.data);
+      config.data = params.toString();
     }
   }
 }

diff --git a/src/util.ts b/src/util.ts
@@ -135,3 +135,13 @@ export function isURLSearchParams(val: any) {
 export function isObject(val: any) {
   return val !== null && typeof val === 'object';
 }
+
+/**
+ * Determine if a value is a String
+ *
+ * @param {Object} val The value to test
+ * @returns {boolean} True if value is a String, otherwise false
+ */
+export function isString(val: any) {
+  return val !== null && typeof val === 'string';
+}