From cb99d9d51ff4091ee60c8c41849770c613a7f7e7 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Tue, 5 Apr 2022 14:30:14 +0200
Subject: [PATCH] Fixed issue with content parsing of json in requestbody for
 app creator and bad multi query parsing into app

---
 frontend/src/views/AppCreator.jsx | 32 ++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 98cf8232..e7d46d7e 100644
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -704,8 +704,21 @@ const AppCreator = (defaultprops) => {
 
           // Typescript? I think not ;)
           if (methodvalue["requestBody"] !== undefined) {
-            //console.log("Handle requestbody: ", methodvalue["requestBody"], method, path)
-            if (methodvalue["requestBody"]["content"] !== undefined) {
+            if (methodvalue["requestBody"]["$ref"] !== undefined && methodvalue["requestBody"]["$ref"] !== null) {
+							// Handle ref
+							//
+							console.log("Ref: ", methodvalue["requestBody"]["$ref"])
+              const parameter = handleGetRef({ $ref:  methodvalue["requestBody"]["$ref"]}, data);
+							console.log("PARAM: ", parameter)
+							if (parameter.content !== undefined && parameter.content !== null) {
+								methodvalue["requestBody"]["content"] = parameter.content
+								console.log("Set content!")
+							}
+						}
+						
+						if (methodvalue["requestBody"]["content"] !== undefined) {
+							// Handle content - XML or JSON
+							//
               if (
                 methodvalue["requestBody"]["content"]["application/json"] !==
                 undefined
@@ -1688,6 +1701,7 @@ const AppCreator = (defaultprops) => {
         item.name = found.join("");
       }
 
+			// Workaround for proper responses. No default as JSON for now
       data.paths[item.url][item.method.toLowerCase()] = {
         responses: {
           default: {
@@ -1713,11 +1727,7 @@ const AppCreator = (defaultprops) => {
 
       //console.log("ACTION: ", item)
 
-      if (
-        item.example_response !== undefined &&
-        item.example_response !== null &&
-        item.example_response.length > 0
-      ) {
+      if (item.example_response !== undefined && item.example_response !== null && item.example_response.length > 0) {
 
 				if (item["example_response"] === "shuffle_file_download") {
 					data.paths[item.url][item.method.toLowerCase()].responses["default"]["content"]["text/plain"].schema.type = "string"
@@ -1771,9 +1781,17 @@ const AppCreator = (defaultprops) => {
 
       if (item.queries.length > 0) {
         var skipped = false;
+				var querynames = []
         for (var querykey in item.queries) {
           const queryitem = item.queries[querykey];
 
+					// A fix for duplicate items
+					if (querynames.includes(queryitem.name.toLowerCase())) {
+						continue
+					}
+
+					querynames.push(queryitem.name.toLowerCase())
+
           if (queryitem.name.toLowerCase() == "url") {
             console.log(item.name + " uses a bad query: url");
             continue;