#133: Fixed YAML parsing bug in OpenAPI parser

backend/go-app/main.go

@@ -5846,7 +5846,7 @@ func echoOpenapiData(resp http.ResponseWriter, request *http.Request) {
 
 	req, err := http.NewRequest("GET", newbody, nil)
 	if err != nil {
-		log.Printf("Requestbuilder err: %s", err)
+		log.Printf("[ERROR] Requestbuilder err: %s", err)
 		resp.WriteHeader(500)
 		resp.Write([]byte(`{"success": false, "reason": "Failed building request"}`))
 		return
@@ -5855,14 +5855,16 @@ func echoOpenapiData(resp http.ResponseWriter, request *http.Request) {
 	httpClient := &http.Client{}
 	newresp, err := httpClient.Do(req)
 	if err != nil {
+		log.Printf("[ERROR] Grabbing error: %s", err)
 		resp.WriteHeader(500)
-		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed making request for data"`)))
+		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed making remote request to get the data"}`)))
 		return
 	}
 	defer newresp.Body.Close()
 
 	urlbody, err := ioutil.ReadAll(newresp.Body)
 	if err != nil {
+		log.Printf("[ERROR] URLbody error: %s", err)
 		resp.WriteHeader(500)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Can't get data from selected uri"`)))
 		return
@@ -6035,6 +6037,8 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 	// support map[string]interface and similar (openapi3.Swagger)
 	var version versionCheck
 
+	log.Printf("API length SET: %d", len(string(body)))
+
 	isJson := false
 	err = json.Unmarshal(body, &version)
 	if err != nil {
@@ -6042,11 +6046,11 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 		err = yaml.Unmarshal(body, &version)
 		if err != nil {
 			log.Printf("Yaml error (3): %s", err)
-			//resp.WriteHeader(422)
+			resp.WriteHeader(422)
-			//resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed reading openapi to json and yaml: %s"}`, err)))
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed reading openapi to json and yaml. Is version defined?: %s"}`, err)))
-			//return
+			return
 		} else {
-			log.Printf("Successfully parsed YAML!")
+			log.Printf("Successfully parsed YAML (3)!")
 		}
 	} else {
 		isJson = true
@@ -6056,6 +6060,8 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 	if len(version.SwaggerVersion) > 0 && len(version.Swagger) == 0 {
 		version.Swagger = version.SwaggerVersion
 	}
+	log.Printf("Version: %#v", version)
+	log.Printf("OpenAPI: %s", version.OpenAPI)
 
 	if strings.HasPrefix(version.Swagger, "3.") || strings.HasPrefix(version.OpenAPI, "3.") {
 		log.Println("Handling v3 API")
@@ -6077,9 +6083,16 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 			log.Printf("FIXME: NEED TO TRANSFORM FROM YAML TO JSON for %s", idstring)
 		}
 
+		swaggerdata, err := json.Marshal(swagger)
+		if err != nil {
+			log.Printf("Failed unmarshaling v3 data: %s", err)
+			resp.WriteHeader(422)
+			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed marshalling swaggerv3 data: %s"}`, err)))
+			return
+		}
 		parsed := ParsedOpenApi{
 			ID:   idstring,
-			Body: string(body),
+			Body: string(swaggerdata),
 		}
 
 		ctx := context.Background()
@@ -6090,6 +6103,8 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed reading openapi2: %s"}`, err)))
 			return
 		}
+
+		log.Printf("Successfully set OpenAPI with ID %s", idstring)
 		resp.WriteHeader(200)
 		resp.Write([]byte(fmt.Sprintf(`{"success": true, "id": "%s"}`, idstring)))
 		return
@@ -6124,7 +6139,7 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 
 		swaggerdata, err := json.Marshal(swaggerv3)
 		if err != nil {
-			log.Printf("Failed unmarshaling v3 data: %s", err)
+			log.Printf("Failed unmarshaling v3 from v2 data: %s", err)
 			resp.WriteHeader(422)
 			resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Failed marshalling swaggerv3 data: %s"}`, err)))
 			return

frontend/src/views/AngularWorkflow.jsx

@@ -972,6 +972,7 @@ const AngularWorkflow = (props) => {
 		setLastSaved(false)
 
 		/*
+		 // Used to not be able to edit trigger-based branches. 
 			const triggercheck = workflow.triggers.find(trigger => trigger.id === event.target.data()["source"])
 			if (triggercheck === undefined) {
 		*/

frontend/src/views/AppCreator.jsx

@@ -26,6 +26,7 @@ import CircularProgress from '@material-ui/core/CircularProgress';
 import Chip from '@material-ui/core/Chip';
 import ChipInput from 'material-ui-chip-input'
 
+import YAML from 'yaml'
 import ErrorOutline from '@material-ui/icons/ErrorOutline';
 import { useAlert } from "react-alert";
 import words from "shellwords"
@@ -325,15 +326,37 @@ const AppCreator = (props) => {
 				throw new Error("NOT 200 :O")
 			}
 
+			//console.log("DATA: ", response.text())
 			return response.json()
 		})
 		.then((responseJson) => {
+			console.log("THE BODY IS HERE")
   		setIsAppLoaded(true)
 			if (!responseJson.success) {
 				alert.error("Failed to verify")
-			} else {
+			} else{
-				const data = JSON.parse(responseJson.body)
+				console.log("HMM 2")
-				parseIncomingOpenapiData(data)
+				var jsonvalid = false 
+				var tmpvalue = ""
+				try {
+					tmpvalue = JSON.parse(responseJson.body)
+					jsonvalid = true
+				} catch (e) {
+					console.log("Error JSON: ", e)
+				}
+
+				if (!jsonvalid) {
+					try {
+						tmpvalue = YAML.parse(responseJson.body, )
+						jsonvalid = true
+					} catch(e) {
+						console.log("Error YAML: ", e)
+					}
+				}
+
+				if (jsonvalid) {
+					parseIncomingOpenapiData(tmpvalue)
+				}
 			}
 		})
 		.catch(error => {
@@ -359,13 +382,15 @@ const AppCreator = (props) => {
 	// Sets the data up as it should be at later points
 	// This is the data FROM the database, not what's being saved
 	const parseIncomingOpenapiData = (data) => {
+		//console.log("DATA: ", data.info)
 		setBasedata(data)
 
+		if (data.info !== null && data.info !== undefined)  {
+			console.log("DATA: ", data)
 			setName(data.info.title)
 			setDescription(data.info.description)
 			document.title = "Apps - "+data.info.title
 
-		if (data.info !== null && data.info !== undefined)  {
 			if (data.info["x-logo"] !== undefined) {
 				setFileBase64(data.info["x-logo"])
 			}

frontend/src/views/Apps.jsx

@@ -1167,6 +1167,7 @@ const Apps = (props) => {
 				return
 			}
 
+			console.log("Validating response!")
 			validateOpenApi(responseJson)
     })
 		.catch(error => {
@@ -1185,10 +1186,12 @@ const Apps = (props) => {
 
 
 		try {
-			return JSON.stringify(YAML.parse(apidata))
+			const parsed = YAML.parse(YAML.stringify(apidata))
+			//const parsed = YAML.parse(apidata))
+			return YAML.stringify(parsed)
 		} catch(error) {
 			console.log("YAML DECODE ERROR - TRY SOMETHING ELSE?: "+error)
-			setOpenApiError(error.toString())
+			setOpenApiError("Local error: "+ error.toString())
 		}
 
 		return ""
@@ -1197,18 +1200,22 @@ const Apps = (props) => {
 	// Sends the data to backend, which should return a version 3 of the same API
 	// If 200 - continue, otherwise, there's some issue somewhere
 	const validateOpenApi = (openApidata) => {
-		const newApidata = escapeApiData(openApidata)
+		var newApidata = escapeApiData(openApidata)
 		if (newApidata === "") {
+			// Used to return here
+			newApidata = openApidata
 			return
 		}
 
+		//console.log(newApidata)
+
 		setValidation(true)
 		fetch(globalUrl+"/api/v1/validate_openapi", {
     	method: 'POST',
 			headers: {
 				'Accept': 'application/json',
 			},
-			body: newApidata,
+			body: openApidata,
 	  	credentials: "include",
 		})
 		.then((response) => {