marker/shuffle-cracked
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#218: Fixed webhook and app sdk execution bugs

Browse Source
This commit is contained in:
frikky
2020-12-11 04:22:22 +01:00
parent 035e9d144f
commit dc62016493
6 changed files with 112 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/AppCreator.jsx
+50 -4
View File
@@ -405,7 +405,6 @@ const AppCreator = (props) => {
newitem = newitem[tmpparam]
}
console.log("PARAM: ", newitem)
return newitem
//console.log("Should get ", parameter["$ref"])
@@ -422,7 +421,6 @@ const AppCreator = (props) => {
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
@@ -500,6 +498,55 @@ const AppCreator = (props) => {
"example_response": "",
}
if (methodvalue["requestBody"] !== undefined) {
//console.log("Handle requestbody: ", methodvalue["requestBody"])
if (methodvalue["requestBody"]["content"] !== undefined) {
if (methodvalue["requestBody"]["content"]["application/json"] !== undefined) {
if (methodvalue["requestBody"]["content"]["application/json"]["schema"] !== undefined) {
if (methodvalue["requestBody"]["content"]["application/json"]["schema"]["properties"] !== undefined) {
var tmpobject = {}
for (let [prop, propvalue] of Object.entries(methodvalue["requestBody"]["content"]["application/json"]["schema"]["properties"])) {
tmpobject[prop] = `\$\{${prop}\}`
}
for (var subkey in methodvalue["requestBody"]["content"]["application/json"]["schema"]["required"]) {
const tmpitem = methodvalue["requestBody"]["content"]["application/json"]["schema"]["required"][subkey]
tmpobject[tmpitem] = `\$\{${tmpitem}\}`
}
newaction["body"] = JSON.stringify(tmpobject, null, 2)
}
}
} else if (methodvalue["requestBody"]["content"]["application/xml"] !== undefined) {
console.log("METHOD XML: ", methodvalue)
if (methodvalue["requestBody"]["content"]["application/xml"]["schema"] !== undefined) {
if (methodvalue["requestBody"]["content"]["application/xml"]["schema"]["properties"] !== undefined) {
var tmpobject = {}
for (let [prop, propvalue] of Object.entries(methodvalue["requestBody"]["content"]["application/xml"]["schema"]["properties"])) {
tmpobject[prop] = `\$\{${prop}\}`
}
for (var subkey in methodvalue["requestBody"]["content"]["application/xml"]["schema"]["required"]) {
const tmpitem = methodvalue["requestBody"]["content"]["application/xml"]["schema"]["required"][subkey]
tmpobject[tmpitem] = `\$\{${tmpitem}\}`
}
//console.log("OBJ XML: ", tmpobject)
//newaction["body"] = XML.stringify(tmpobject, null, 2)
}
}
} else {
if (methodvalue["requestBody"]["content"]["example"] !== undefined) {
if (methodvalue["requestBody"]["content"]["example"]["example"] !== undefined) {
newaction["body"] = methodvalue["requestBody"]["content"]["example"]["example"]
//JSON.stringify(tmpobject, null, 2)
}
}
console.log("NOT APPLICATION/JSON: ", methodvalue["requestBody"]["content"])
}
}
}
// HAHAHA wtf is this.
if (methodvalue.responses !== undefined) {
if (methodvalue.responses.default !== undefined) {
@@ -1317,7 +1364,6 @@ const AppCreator = (props) => {
const findBodyParams = (body) => {
const regex = /\${(\w+)}/g
const found = body.match(regex)
console.log("FOUND: ", found)
if (found === null) {
setExtraBodyFields([])
} else {
@@ -1521,7 +1567,7 @@ const AppCreator = (props) => {
const queries = values[1]
if (currentAction.paths !== paths && urlPath.length > 0) {
console.log("IN PATHS SETTER: !", paths)
//console.log("IN PATHS SETTER: !", paths)
setActionField("paths", paths)
}
frontend/src/views/Apps.jsx
+1 -1
View File
@@ -907,7 +907,7 @@ const Apps = (props) => {
<div style={{marginTop: 15}}>
{apps.length > 0 ?
filteredApps.length > 0 ?
<div style={{height: "75vh", overflowY: "scroll"}}>
<div style={{height: "75vh", overflowY: "auto"}}>
{filteredApps.map(app => {
return (
appPaper(app)