#130: Added error validation for app creator

backend/go-app/main.go

@@ -5458,7 +5458,7 @@ func echoOpenapiData(resp http.ResponseWriter, request *http.Request) {
 	if err != nil {
 		log.Printf("Api authentication failed in validate swagger: %s", err)
 		resp.WriteHeader(401)
-		resp.Write([]byte(`{"success": false}`))
+		resp.Write([]byte(`{"success": false, "reason": "Failed authentication"}`))
 		return
 	}
 
@@ -5504,6 +5504,12 @@ func echoOpenapiData(resp http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	if newresp.StatusCode >= 400 {
+		resp.WriteHeader(201)
+		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "%s"}`, urlbody)))
+		return
+	}
+
 	resp.WriteHeader(200)
 	resp.Write(urlbody)
 }
@@ -5734,6 +5740,8 @@ func validateSwagger(resp http.ResponseWriter, request *http.Request) {
 			err = gyaml.Unmarshal(body, &swagger)
 			if err != nil {
 				log.Printf("Yaml error: %s", err)
+			} else {
+				log.Printf("Found valid yaml!")
 			}
 
 			resp.WriteHeader(422)

backend/go-app/walkoff.go

@@ -3817,9 +3817,6 @@ func getWorkflowApps(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
-	log.Printf("User: %d", len(user.PrivateApps))
-	log.Printf("All: %d", len(workflowapps))
-
 	// Double unmarshal because of user apps
 	newbody, err := json.Marshal(newapps)
 	//newbody, err := json.Marshal(workflowapps)

frontend/src/views/Apps.jsx

@@ -349,8 +349,10 @@ const Apps = (props) => {
 
 									return (
 										<Chip
+											key={index}
 											style={{height: 25, marginRight: 5, cursor: "pointer",}}
 											label={tag}
+											variant="outlined"
 											color="primary"
 										/>
 									)
@@ -515,7 +517,6 @@ const Apps = (props) => {
 		]
 
 		//fetch(globalUrl+"/api/v1/get_openapi/"+urlParams.get("id"), 
-		console.log("User: ", props.userdata)
 		var baseInfo = newAppname.length > 0 ?
 			<div>
 				<div style={{display: "flex"}}>
@@ -544,7 +545,9 @@ const Apps = (props) => {
 
 							return (
 								<Chip
+									key={index}
 									style={{height: 25, marginRight: 5, marginTop: 7, cursor: "pointer",}}
+									variant="outlined"
 									label={tag}
 									color="primary"
 								/>
@@ -1030,7 +1033,7 @@ const Apps = (props) => {
 		setValidation(true)
 
 		fetch(globalUrl+"/api/v1/get_openapi_uri", {
-    	  	method: 'POST',
+    	method: 'POST',
 			headers: {
 				'Accept': 'application/json',
 			},
@@ -1038,19 +1041,34 @@ const Apps = (props) => {
 	  		credentials: "include",
 		})
 		.then((response) => {
+			setValidation(false)
+			if (response.status !== 200) {
+				return response.json()	
+			} 
+
 			return response.text()
 		})
-    	.then((responseText) => {
+    .then((responseJson) => {
-			validateOpenApi(responseText)
+			if (typeof(responseJson) !== "string" && !responseJson.success) {
-			setValidation(false)
+				console.log(responseJson.reason)
-    	})
+				if (responseJson.reason !== undefined) {
+					setOpenApiError(responseJson.reason)
+				} else {
+					setOpenApiError("Undefined issue with OpenAPI validation")
+				}
+				return
+			}
+
+			validateOpenApi(responseJson)
+    })
 		.catch(error => {
 			alert.error(error.toString())
+			setOpenApiError(error.toString())
 		});
 	}
 
 	const escapeApiData = (apidata) => {
-		console.log(apidata)
+		//console.log(apidata)
 		try {
 			return JSON.stringify(JSON.parse(apidata))
 		} catch(error) {
@@ -1062,7 +1080,7 @@ const Apps = (props) => {
 			return JSON.stringify(YAML.parse(apidata))
 		} catch(error) {
 			console.log("YAML DECODE ERROR - TRY SOMETHING ELSE?: "+error)
-			setOpenApiError(error)
+			setOpenApiError(error.toString())
 		}
 
 		return ""
@@ -1076,6 +1094,7 @@ const Apps = (props) => {
 			return
 		}
 
+		setValidation(true)
 		fetch(globalUrl+"/api/v1/validate_openapi", {
     	  	method: 'POST',
 			headers: {
@@ -1085,10 +1104,10 @@ const Apps = (props) => {
 	  		credentials: "include",
 		})
 		.then((response) => {
+			setValidation(false)
 			return response.json()
 		})
-    	.then((responseJson) => {
+    .then((responseJson) => {
-			setValidation(false)
 			if (responseJson.success) {
 				setAppValidation(responseJson.id)
 			} else {
@@ -1099,7 +1118,9 @@ const Apps = (props) => {
 			}
     	})
 		.catch(error => {
+			setValidation(false)
 			alert.error(error.toString())
+			setOpenApiError(error.toString())
 		});
 	}
 
@@ -1245,7 +1266,9 @@ const Apps = (props) => {
 	const modalView = openApiModal ? 
 		<Dialog 
 			open={openApiModal}
-			onClose={() => {setOpenApiModal(false)}}
+			onClose={() => {
+				setOpenApiModal(false)
+			}}
 			PaperProps={{
 				style: {
 					backgroundColor: surfaceColor,
@@ -1269,13 +1292,16 @@ const Apps = (props) => {
 								height: "50px",
 								fontSize: "1em",
 							},
-							endAdornment: <Button style={{borderRadius: "0px", marginTop: "0px", height: "50px"}} variant="contained" disabled={openApi.length === 0} color="primary" onClick={() => {
+							endAdornment: <Button style={{borderRadius: "0px", marginTop: "0px", height: "50px"}} variant="contained" disabled={openApi.length === 0 || appValidation.length > 0} color="primary" 
+							onClick={() => {
 								setOpenApiError("")
 								validateRemote()
 							}}>Validate</Button>
 						}}
-						onChange={e => setOpenApi(e.target.value)}
+						onChange={e => {
-						helperText={<div style={{color:"white", marginBottom: "2px",}}>Must point to a version 2 or 3 specification.</div>}
+							setOpenApi(e.target.value)
+						}}
+						helperText={<span style={{color:"white", marginBottom: "2px",}}>Must point to a version 2 or 3 OpenAPI specification.</span>}
 						placeholder="OpenAPI URI"
 						fullWidth
 					  />
@@ -1285,7 +1311,7 @@ const Apps = (props) => {
 					  <div />
 					  https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v2.0/json/uber.json
 						*/}
-					  <h4>Or paste the yaml/JSON directly below</h4>
+					  Or paste the YAML or JSON specification 
 					<TextField
 						style={{backgroundColor: inputColor}}
 						variant="outlined"
@@ -1297,13 +1323,13 @@ const Apps = (props) => {
 								color: "white",
 								fontSize: "1em",
 							},
-							endAdornment: <Button style={{marginLeft: 10, borderRadius: "0px", marginTop: "0px"}} variant="contained" disabled={openApiData.length === 0} color="primary" onClick={() => {
+							endAdornment: <Button style={{marginLeft: 10, borderRadius: "0px", marginTop: "0px"}} variant="contained" disabled={openApiData.length === 0 || appValidation.length > 0} color="primary" onClick={() => {
 								setOpenApiError("")
 								validateOpenApi(openApiData)
-							}}>Validate data</Button>
+							}}>Validate OpenAPI</Button>
 						}}
 						onChange={e => setOpenApiData(e.target.value)}
-						helperText={<div style={{color:"white", marginBottom: "2px",}}>Must point to a version 2 or 3 specification.</div>}
+						helperText={<span style={{color:"white", marginBottom: "2px",}}>Must point to a version 2 or 3 specification.</span>}
 						placeholder="OpenAPI text"
 						fullWidth
 					  />
@@ -1311,13 +1337,19 @@ const Apps = (props) => {
 				</DialogContent>
 				<DialogActions>
 					{circularLoader}
-						<Button style={{borderRadius: "0px"}} onClick={() => setOpenApiModal(false)} color="primary">
+					<Button style={{borderRadius: "0px"}} onClick={() => {
-							Cancel
+						setOpenApiModal(false)
-						</Button>
+						setAppValidation("")
-	      	<Button style={{borderRadius: "0px"}} disabled={appValidation.length === 0} onClick={() => {
+						setOpenApiError("")
+						setOpenApi("")
+						setOpenApiData("")
+					}} color="primary">
+						Cancel
+					</Button>
+	      	<Button variant="contained" style={{borderRadius: "0px"}} disabled={appValidation.length === 0} onClick={() => {
 						redirectOpenApi()
 					}} color="primary">
-	        	Submit	
+	        	Continue	
 	        </Button>
 				</DialogActions>
 			</FormControl>

frontend/src/views/Workflows.jsx

@@ -530,8 +530,10 @@ const Workflows = (props) => {
 
 										return (
 											<Chip
+												key={index}
 												style={{height: 25, marginRight: 5, marginTop: 2, cursor: "pointer",}}
 												label={tag}
+												variant="outlined"
 												color="primary"
 											/>
 										)
@@ -542,17 +544,17 @@ const Workflows = (props) => {
 					</Grid>
 				</Grid>
 				<Grid container style={{maxWidth: 35, marginRight: 10,}}>
-					<Tooltip title={data.actions.length} placement="right">
+					<Tooltip title={`Actions: ${data.actions.length}`} placement="right">
 						<AppsIcon style={{width: imgSize, height: imgSize}} />
 					</Tooltip>
 
 					{webhooks > 0 ? 
-						<Tooltip title={webhooks} placement="right">
+						<Tooltip title={`Webhooks: ${webhooks}`} placement="right">
 							<img alt={data.title} style={{width: imgSize, height: imgSize, marginTop: 5}} src={webhookImg} /> 
 						</Tooltip>
 					: null}
 					{schedules > 0 ? 
-						<Tooltip title={webhooks} placement="right">
+						<Tooltip title={`Schedules: ${schedules}`} placement="right">
 							<img alt={data.title} style={{width: imgSize, height: imgSize, marginTop: 5}} src={scheduleImg} /> 
 						</Tooltip>
 					: null}