Fix kotlin okhttp codegen for raw bodies

Author: Dhwaneet Bhatt

codegens/kotlin-okhttp/lib/okhttp.js

@@ -18,8 +18,7 @@ const METHODS_WITHOUT_BODY = ['GET', 'HEAD', 'COPY', 'UNLOCK', 'UNLINK', 'PURGE'
 function makeSnippet (request, indentString, options) {
   let isBodyRequired = !(_.includes(METHODS_WITHOUT_BODY, request.method)),
     snippet = 'val client = OkHttpClient',
-    hasNoOptions = !(options.requestTimeout || options.followRedirects),
-    requestBody;
+    hasNoOptions = !(options.requestTimeout || options.followRedirects);
 
   if (hasNoOptions) {
     snippet += '()\n';
@@ -30,7 +29,7 @@ function makeSnippet (request, indentString, options) {
       snippet += indentString + `.connectTimeout(${options.requestTimeout}, TimeUnit.SECONDS)\n`;
     }
 
-    if (!options.followRedirect) {
+    if (_.get(request, 'protocolProfileBehavior.followRedirects', options.followRedirect) === false) {
       snippet += indentString + '.followRedirects(false)\n';
     }
 
@@ -73,10 +72,12 @@ function makeSnippet (request, indentString, options) {
         formdata: formdataArray
       });
     }
-    requestBody = (request.body ? request.body.toJSON() : {});
+
+    const contentType = parseRequest.parseContentType(request),
+      requestBody = (request.body ? request.body.toJSON() : {});
     //  snippet for creating mediatype object in java based on content-type of request
-    snippet += `val mediaType = "${parseRequest.parseContentType(request)}".toMediaType()\n`;
-    snippet += parseRequest.parseBody(requestBody, indentString, options.trimRequestBody);
+    snippet += `val mediaType = "${contentType}".toMediaType()\n`;
+    snippet += parseRequest.parseBody(requestBody, indentString, options.trimRequestBody, contentType);
   }
 
   snippet += 'val request = Request.Builder()\n';

codegens/kotlin-okhttp/lib/parseRequest.js

@@ -58,21 +58,38 @@ function parseFormData (requestBody, indentString, trimFields) {
   }, '') + indentString + '.build()';
 }
 
+/**
+ * Parses request object and returns kotlin okhttp code snippet for raw body
+ *
+ * @param {Object} requestBody - JSON object representing body of request
+ * @param {Boolean} trimFields - indicates whether to trim fields of body
+ * @param {String} contentType - content type of request body
+ */
+function parseRawBody (requestBody, trimFields, contentType) {
+  if (contentType && contentType.startsWith('application/json')) {
+    return `val body = ${JSON.stringify(requestBody[requestBody.mode])}.toRequestBody(mediaType)\n`;
+  }
+
+  return `val body = "${sanitize(requestBody[requestBody.mode], trimFields)}".toRequestBody(mediaType)\n`;
+}
+
 /**
  * parses request object and returns java okhttp code snippet for adding request body
  *
  * @param {Object} requestBody - JSON object representing body of request
  * @param {String} indentString - string for indentation
  * @param {Boolean} trimFields - indicates whether to trim fields of body
+ * @param {String} contentType - content type of request body
+ *
  * @returns {String} - code snippet of java okhttp parsed from request object
  */
-function parseBody (requestBody, indentString, trimFields) {
+function parseBody (requestBody, indentString, trimFields, contentType) {
   if (!_.isEmpty(requestBody)) {
     switch (requestBody.mode) {
       case 'urlencoded':
         return `val body = "${parseUrlencode(requestBody, trimFields)}".toRequestBody(mediaType)\n`;
       case 'raw':
-        return `val body = ${JSON.stringify(requestBody[requestBody.mode])}.toRequestBody(mediaType)\n`;
+        return parseRawBody(requestBody, trimFields, contentType);
       case 'graphql':
         // eslint-disable-next-line no-case-declarations
         let query = requestBody[requestBody.mode].query,

codegens/kotlin-okhttp/lib/util.js

@@ -11,7 +11,13 @@ module.exports = {
     if (typeof inputString !== 'string') {
       return '';
     }
-    inputString = inputString.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    inputString = inputString
+      .replace(/\\/g, '\\\\')
+      .replace(/"/g, '\\"')
+      .replace(/\$/g, '\\$')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/\t/g, '\\t');
     return trim ? inputString.trim() : inputString;
 
   },

codegens/kotlin-okhttp/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@postman/codegen-kotlin-okhttp",
   "version": "0.0.1",
-  "description": "Converts postman request into kotlin ktor code snippet",
+  "description": "Converts postman request into kotlin okhttp code snippet",
   "com_postman_plugin": {
     "type": "code_generator",
-    "lang": "kotlin",
-    "variant": "Ktor",
-    "syntax_mode": "java"
+    "lang": "Kotlin",
+    "variant": "Okhttp",
+    "syntax_mode": "kotlin"
   },
   "main": "index.js",
   "directories": {

test/codegen/newman/fixtures/basicCollection.json

@@ -330,7 +330,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "var val = 6;\nconsole.log(val);console.log('text\r\n');\n"
+					"raw": "var val = 6;\nconsole.log(val);console.log('$text\r\n');\n"
 				},
 				"url": {
 					"raw": "https://postman-echo.com/post",
@@ -685,4 +685,4 @@
 			}
 		}
 	]
-}
+}