daren.hsu/webhook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed logic for IncomingPayloadContentType

Browse Source
This commit is contained in:
Donald Clark Jackson 2017-11-27 13:10:12 -08:00
parent b7a992704f
commit 64785438b4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webhook.go
View File

@ -229,9 +229,14 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
// parse body // parse body
var payload map[string]interface{} var payload map[string]interface{}
contentType := r.Header.Get("Content-Type") // set contentType to IncomingPayloadContentType or header value
if len(matchedHook.IncomingPayloadContentType) != 0 {
contentType := matchedHook.IncomingPayloadContentType
} else {
contentType := r.Header.Get("Content-Type")
}
if strings.Contains(matchedHook.IncomingPayloadContentType, "json") || strings.Contains(contentType, "json") { if strings.Contains(contentType, "json") {
decoder := json.NewDecoder(strings.NewReader(string(body))) decoder := json.NewDecoder(strings.NewReader(string(body)))
decoder.UseNumber() decoder.UseNumber()
@ -240,7 +245,7 @@ func hookHandler(w http.ResponseWriter, r *http.Request) {
if err != nil { if err != nil {
log.Printf("[%s] error parsing JSON payload %+v\n", rid, err) log.Printf("[%s] error parsing JSON payload %+v\n", rid, err)
} }
} else if strings.Contains(matchedHook.IncomingPayloadContentType, "form") || strings.Contains(contentType, "form") { } else if strings.Contains(contentType, "form") {
fd, err := url.ParseQuery(string(body)) fd, err := url.ParseQuery(string(body))
if err != nil { if err != nil {
log.Printf("[%s] error parsing form payload %+v\n", rid, err) log.Printf("[%s] error parsing form payload %+v\n", rid, err)