add custom curl target, fix urls not having encoded params

ashwinv11 · ashwinv11 · commit 146f2060d4db · 2019-02-05T20:30:22.000-08:00
diff --git a/src/index.js b/src/index.js
@@ -167,21 +167,22 @@ HTTPSnippet.prototype.prepare = function (request) {
   // reset uriObj values for a clean url
   request.uriObj.query = null
   request.uriObj.search = null
-  request.uriObj.path = request.uriObj.pathname
+  request.uriObj.path = decodeURIComponent(request.uriObj.pathname)
 
   // keep the base url clean of queryString
-  request.url = url.format(request.uriObj)
+  request.url = decodeURIComponent(url.format(request.uriObj))
 
   // update the uri object
+  request.uriObj.href = decodeURIComponent(url.format(request.uriObj))
   request.uriObj.query = request.queryObj
   request.uriObj.search = qs.stringify(request.queryObj)
 
   if (request.uriObj.search) {
-    request.uriObj.path = request.uriObj.pathname + '?' + request.uriObj.search
+    request.uriObj.path = decodeURIComponent(request.uriObj.pathname) + '?' + request.uriObj.search
   }
 
   // construct a full url
-  request.fullUrl = url.format(request.uriObj)
+  request.fullUrl = decodeURIComponent(url.format(request.uriObj))
 
   return request
 }
diff --git a/src/targets/shell/index.js b/src/targets/shell/index.js
@@ -10,5 +10,6 @@ module.exports = {
 
   curl: require('./curl'),
   httpie: require('./httpie'),
-  wget: require('./wget')
+  wget: require('./wget'),
+  yapstonecurl: require('./yapstonecurl')
 }
diff --git a/src/targets/shell/yapstonecurl.js b/src/targets/shell/yapstonecurl.js
@@ -0,0 +1,91 @@
+/**
+ * @description
+ * HTTP code snippet generator for the Shell using cURL.
+ *
+ * @author
+ * @AhmadNassri
+ *
+ * for any questions or issues regarding the generated code snippet, please open an issue mentioning the author.
+ */
+
+'use strict'
+
+var util = require('util')
+var helpers = require('../../helpers/shell')
+var CodeBuilder = require('../../helpers/code-builder')
+
+module.exports = function (source, options) {
+  var opts = util._extend({
+    indent: '  ',
+    short: false,
+    binary: false
+  }, options)
+
+  var code = new CodeBuilder(opts.indent, opts.indent !== false ? ' \\\n' + opts.indent : ' ')
+
+  code.push('curl %s %s', opts.short ? '-X' : '--request', source.method)
+      .push(util.format('%s%s', opts.short ? '' : '--url ', helpers.quote(source.fullUrl)))
+
+  if (source.httpVersion === 'HTTP/1.0') {
+    code.push(opts.short ? '-0' : '--http1.0')
+  }
+
+  // construct headers
+  Object.keys(source.headersObj).sort().forEach(function (key) {
+    var header = util.format('%s: %s', key, source.headersObj[key])
+    code.push('%s %s', opts.short ? '-H' : '--header', helpers.quote(header))
+  })
+
+  if (source.allHeaders.cookie) {
+    code.push('%s %s', opts.short ? '-b' : '--cookie', helpers.quote(source.allHeaders.cookie))
+  }
+
+  // construct post params
+  switch (source.postData.mimeType) {
+    case 'multipart/form-data':
+      source.postData.params.map(function (param) {
+        var post = util.format('%s=%s', param.name, param.value)
+
+        if (param.fileName && !param.value) {
+          post = util.format('%s=@%s', param.name, param.fileName)
+        }
+
+        code.push('%s %s', opts.short ? '-F' : '--form', helpers.quote(post))
+      })
+      break
+
+    case 'application/x-www-form-urlencoded':
+      if (source.postData.params) {
+        source.postData.params.map(function (param) {
+          code.push(
+            '%s %s', opts.binary ? '--data-binary' : (opts.short ? '-d' : '--data'),
+            helpers.quote(util.format('%s=%s', param.name, param.value))
+          )
+        })
+      } else {
+        code.push(
+          '%s %s', opts.binary ? '--data-binary' : (opts.short ? '-d' : '--data'),
+          helpers.escape(helpers.quote(source.postData.text))
+        )
+      }
+      break
+
+    default:
+      // raw request body
+      if (source.postData.text && source.allHeaders['content-type'] === 'application/json') {
+        code.push(
+          '%s %s', opts.binary ? '--data-binary' : (opts.short ? '-d' : '--data'),
+          helpers.quote(JSON.stringify(JSON.parse(source.postData.text), null, 2))
+        )
+      }
+  }
+
+  return code.join()
+}
+
+module.exports.info = {
+  key: 'yapstonecurl',
+  title: 'Yapstone cURL',
+  link: 'http://curl.haxx.se/',
+  description: 'cURL is a command line tool and library for transferring data with URL syntax'
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@ module.exports = {`
`10`	`10`
`11`	`11`	`curl: require('./curl'),`
`12`	`12`	`httpie: require('./httpie'),`
`13`		`- wget: require('./wget')`
	`13`	`+ wget: require('./wget'),`
	`14`	`+ yapstonecurl: require('./yapstonecurl')`
`14`	`15`	`}`