- call parseForm explicit for http.Response

This commit is contained in:
gazebo
2019-03-22 18:16:33 +08:00
parent 6cd940c926
commit fe9d3b6359
4 changed files with 60 additions and 46 deletions

View File

@@ -84,15 +84,18 @@ func (a *API) CheckCallbackValidation(request *http.Request) (callbackResponse *
}
func (a *API) GetCallbackMsg(request *http.Request) (msg *CallbackMsg, callbackResponse *CallbackResponse) {
request.ParseForm()
if callbackResponse = a.CheckCallbackValidation(request); callbackResponse != nil {
return nil, callbackResponse
err := request.ParseForm()
if err == nil {
if callbackResponse = a.CheckCallbackValidation(request); callbackResponse != nil {
return nil, callbackResponse
}
msg = new(CallbackMsg)
if callbackResponse = a.unmarshalData(request.FormValue("cmd"), []byte(request.FormValue("body")), &msg.Body); callbackResponse != nil {
return nil, callbackResponse
}
msg.Cmd = request.FormValue("cmd")
msg.Timestamp = utils.Str2Int64(utils.Interface2String(request.FormValue("timestamp")))
return msg, nil
}
msg = new(CallbackMsg)
if callbackResponse = a.unmarshalData(request.FormValue("cmd"), []byte(request.FormValue("body")), &msg.Body); callbackResponse != nil {
return nil, callbackResponse
}
msg.Cmd = request.FormValue("cmd")
msg.Timestamp = utils.Str2Int64(utils.Interface2String(request.FormValue("timestamp")))
return msg, nil
return nil, a.Err2CallbackResponse("", err, nil)
}