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

#532: Fixed unicode translation issue in apps

Browse Source
This commit is contained in:
frikky
2021-10-15 02:20:08 +02:00
parent 694ac4faa6
commit cfc354b8ad
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/go-app/main.go
+3 -3
View File
@@ -3075,7 +3075,7 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User) {
basePath, err := shuffle.BuildStructure(swagger, newmd5)
if err != nil {
log.Printf("Failed to build base structure: %s", err)
log.Printf("[WARNING] Failed to build base structure: %s", err)
resp.WriteHeader(500)
resp.Write([]byte(`{"success": false, "reason": "Failed building baseline structure"}`))
return
@@ -3094,7 +3094,7 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User) {
// Can't overwrite existing normal app
workflowApps, err := shuffle.GetPrioritizedApps(ctx, user)
if err != nil {
log.Printf("Failed getting all workflow apps from database to verify: %s", err)
log.Printf("[WARNING] Failed getting all workflow apps from database to verify: %s", err)
resp.WriteHeader(401)
resp.Write([]byte(`{"success": false, "reason": "Failed to verify existence"}`))
return
@@ -3114,7 +3114,7 @@ func buildSwaggerApp(resp http.ResponseWriter, body []byte, user shuffle.User) {
err = shuffle.DumpApi(basePath, api)
if err != nil {
log.Printf("Failed dumping yaml: %s", err)
log.Printf("[WARNING] Failed dumping yaml: %s", err)
resp.WriteHeader(500)
resp.Write([]byte(`{"success": false, "reason": "Failed dumping yaml"}`))
return
backend/go-app/run.sh → backend/go-app/run
View File
frontend/src/views/AppCreator.jsx
+7 -1
View File
@@ -426,10 +426,16 @@ const AppCreator = (props) => {
return newitem
}
const base64_decode = (str) => {
return decodeURIComponent(atob(str).split('').map(function(c) {
return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
}).join(''))
}
// 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) => {
const parsedapp = data.openapi === undefined ? data : JSON.parse(atob(data.openapi))
const parsedapp = data.openapi === undefined ? data : JSON.parse(base64_decode(data.openapi))
data = parsedapp.body === undefined ? parsedapp : parsedapp.body
var jsonvalid = false