blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-19 07:38:57 +08:00
Code Issues Projects Releases Wiki Activity

feat: use ShouldBindWith after ShouldBindBodyWith

Browse Source
This commit is contained in:
mohuishou 2019-11-07 00:08:56 +08:00
parent db9174ae0c
commit c49dbd7305
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
context.go
View File

@ -5,6 +5,7 @@
package gin
import (
"bytes"
"errors"
"fmt"
"io"
@ -33,7 +34,6 @@ const (
MIMEPOSTForm = binding.MIMEPOSTForm
MIMEMultipartPOSTForm = binding.MIMEMultipartPOSTForm
MIMEYAML = binding.MIMEYAML
BodyBytesKey = "_gin-gonic/gin/bodybyteskey"
)
const abortIndex int8 = math.MaxInt8 / 2
@ -666,19 +666,15 @@ func (c *Context) ShouldBindWith(obj interface{}, b binding.Binding) error {
// NOTE: This method reads the body before binding. So you should use
// ShouldBindWith for better performance if you need to call only once.
func (c *Context) ShouldBindBodyWith(obj interface{}, bb binding.BindingBody) (err error) {
var body []byte
if cb, ok := c.Get(BodyBytesKey); ok {
if cbb, ok := cb.([]byte); ok {
body = cbb
}
}
if body == nil {
body, err = ioutil.ReadAll(c.Request.Body)
if err != nil {
return err
}
c.Set(BodyBytesKey, body)
var buf bytes.Buffer
tee := io.TeeReader(c.Request.Body, &buf)
body, err := ioutil.ReadAll(tee)
if err != nil {
return err
}
defer c.Request.Body.Close()
c.Request.Body = ioutil.NopCloser(&buf)
return bb.BindBody(body, obj)
}

45
context_test.go
View File

@ -1651,31 +1651,38 @@ func TestContextShouldBindBodyWith(t *testing.T) {
Bar string `json:"bar" xml:"bar" binding:"required"`
}
for _, tt := range []struct {
name string
bindingA, bindingB binding.BindingBody
bodyA, bodyB string
name string
bindingA, bindingB binding.BindingBody
bodyA, bodyB string
contentTypeA, contentTypeB string
}{
{
name: "JSON & JSON",
bindingA: binding.JSON,
bindingB: binding.JSON,
bodyA: `{"foo":"FOO"}`,
bodyB: `{"bar":"BAR"}`,
name: "JSON & JSON",
bindingA: binding.JSON,
bindingB: binding.JSON,
bodyA: `{"foo":"FOO"}`,
bodyB: `{"bar":"BAR"}`,
contentTypeA: binding.MIMEJSON,
contentTypeB: binding.MIMEJSON,
},
{
name: "JSON & XML",
bindingA: binding.JSON,
bindingB: binding.XML,
bodyA: `{"foo":"FOO"}`,
name: "JSON & XML",
bindingA: binding.JSON,
bindingB: binding.XML,
contentTypeA: binding.MIMEJSON,
contentTypeB: binding.MIMEXML,
bodyA: `{"foo":"FOO"}`,
bodyB: `<?xml version="1.0" encoding="UTF-8"?>
<root>
<bar>BAR</bar>
</root>`,
},
{
name: "XML & XML",
bindingA: binding.XML,
bindingB: binding.XML,
name: "XML & XML",
bindingA: binding.XML,
bindingB: binding.XML,
contentTypeA: binding.MIMEXML,
contentTypeB: binding.MIMEXML,
bodyA: `<?xml version="1.0" encoding="UTF-8"?>
<root>
<foo>FOO</foo>
@ -1694,6 +1701,7 @@ func TestContextShouldBindBodyWith(t *testing.T) {
c.Request, _ = http.NewRequest(
"POST", "http://example.com", bytes.NewBufferString(tt.bodyA),
)
c.Request.Header.Add("Content-Type", tt.contentTypeA)
// When it binds to typeA and typeB, it finds the body is
// not typeB but typeA.
objA := typeA{}
@ -1702,6 +1710,9 @@ func TestContextShouldBindBodyWith(t *testing.T) {
objB := typeB{}
assert.Error(t, c.ShouldBindBodyWith(&objB, tt.bindingB))
assert.NotEqual(t, typeB{"BAR"}, objB)
objB2 := typeB{}
assert.Error(t, c.ShouldBind(&objB2))
assert.NotEqual(t, typeB{"BAR"}, objB2)
}
// bodyB to typeA and typeB
{
@ -1712,12 +1723,16 @@ func TestContextShouldBindBodyWith(t *testing.T) {
c.Request, _ = http.NewRequest(
"POST", "http://example.com", bytes.NewBufferString(tt.bodyB),
)
c.Request.Header.Add("Content-Type", tt.contentTypeB)
objA := typeA{}
assert.Error(t, c.ShouldBindBodyWith(&objA, tt.bindingA))
assert.NotEqual(t, typeA{"FOO"}, objA)
objB := typeB{}
assert.NoError(t, c.ShouldBindBodyWith(&objB, tt.bindingB))
assert.Equal(t, typeB{"BAR"}, objB)
objB2 := typeB{}
assert.NoError(t, c.ShouldBind(&objB2))
assert.Equal(t, typeB{"BAR"}, objB2)
}
}
}