scottk/databunker
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/databunker.git synced 2025-10-29 17:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

make getJSONPostData function to be more generic

Browse Source
This commit is contained in:
yuli
2024-10-16 16:18:23 +03:00
parent 632f99f483
commit 156a53f016
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/utils.go
View File

@@ -575,8 +575,6 @@ func getJSONPostData(r *http.Request) ([]byte, error) {
return nil, nil
}
cType = strings.ToLower(cType)
records := make(map[string]interface{})
var records2 []map[string]interface{}
if r.Method == "DELETE" {
// otherwise data is not parsed!
r.Method = "PATCH"
@@ -601,26 +599,18 @@ func getJSONPostData(r *http.Request) ([]byte, error) {
if len(form) == 0 {
return nil, nil
}
records := make(map[string]interface{})
for key, value := range form {
records[key] = value[0]
}
return json.Marshal(records)
} else if strings.HasPrefix(cType, "application/json") || strings.HasPrefix(cType, "application/xml") {
if body[0] == '{' {
err = json.Unmarshal([]byte(body), &records)
} else if body[0] == '[' {
err = json.Unmarshal([]byte(body), &records2)
} else {
return nil, errors.New("wrong content-type, not a json string")
}
var data interface{}
err := json.Unmarshal([]byte(body), &data)
if err != nil {
return nil, err
}
if body[0] == '{' {
return json.Marshal(records)
} else if body[0] == '[' {
return json.Marshal(records2)
return nil, errors.New("error decoding json data")
}
return json.Marshal(data)
}
log.Printf("Ignore wrong content type: %s", cType)
maxStrLen := 200