Skip to content

Commit

Permalink
fix(json): return json type on header. (appleboy#87)
Browse files Browse the repository at this point in the history
* fix(json): return json type on header.

* remove unused package.

Signed-off-by: Bo-Yi Wu <[email protected]>
  • Loading branch information
appleboy authored Aug 6, 2017
1 parent cb03ef8 commit 16494d6
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 11 deletions.
3 changes: 2 additions & 1 deletion auth_jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"gopkg.in/dgrijalva/jwt-go.v3"
)

Expand Down Expand Up @@ -184,7 +185,7 @@ func (mw *GinJWTMiddleware) LoginHandler(c *gin.Context) {

var loginVals Login

if c.BindJSON(&loginVals) != nil {
if c.ShouldBindWith(&loginVals, binding.JSON) != nil {
mw.unauthorized(c, http.StatusBadRequest, "Missing Username or Password")
return
}
Expand Down
1 change: 1 addition & 0 deletions auth_jwt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ func TestLoginHandler(t *testing.T) {

assert.Equal(t, "Missing Username or Password", message)
assert.Equal(t, http.StatusBadRequest, r.Code)
assert.Equal(t, "application/json; charset=utf-8", r.HeaderMap.Get("Content-Type"))
})

r.POST("/login").
Expand Down
44 changes: 34 additions & 10 deletions vendor/vendor.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,47 @@
"revisionTime": "2016-10-29T20:57:26Z"
},
{
"checksumSHA1": "RsNwOto8G8aXIiRrlFn4dtU9q/g=",
"checksumSHA1": "QeKwBtN2df+j+4stw3bQJ6yO4EY=",
"path": "github.com/gin-contrib/sse",
"revision": "22d885f9ecc78bf4ee5d72b937e4bbcdc58e8cae",
"revisionTime": "2017-01-09T09:34:21Z"
},
{
"checksumSHA1": "N1DfJNpkEvdl4srCeA2M9GDhWsA=",
"path": "github.com/gin-gonic/gin",
"revision": "e2212d40c62a98b388a5eb48ecbdcf88534688ba",
"revisionTime": "2016-12-04T22:13:08Z"
"revision": "81007d2ce0176f7a9ce52dd12e56edd7ef40e72c",
"revisionTime": "2017-08-04T05:45:59Z"
},
{
"checksumSHA1": "UsILDoIB2S7ra+w2fMdb85mX3HM=",
"checksumSHA1": "qqjlx9qLgTw1+t6uDDTBlCmT6DQ=",
"path": "github.com/gin-gonic/gin/binding",
"revision": "e2212d40c62a98b388a5eb48ecbdcf88534688ba",
"revisionTime": "2016-12-04T22:13:08Z"
"revision": "81007d2ce0176f7a9ce52dd12e56edd7ef40e72c",
"revisionTime": "2017-08-04T05:45:59Z"
},
{
"checksumSHA1": "YOwO5bkv3ei+GTVZqeEVB30kXDM=",
"path": "github.com/gin-gonic/gin/json",
"revision": "81007d2ce0176f7a9ce52dd12e56edd7ef40e72c",
"revisionTime": "2017-08-04T05:45:59Z"
},
{
"checksumSHA1": "PHv9FNb7YavJWtAHcY6ZgXmkmHs=",
"checksumSHA1": "MwAJrZRDZoQ7CK2Q+T1sBbx6tC0=",
"path": "github.com/gin-gonic/gin/render",
"revision": "e2212d40c62a98b388a5eb48ecbdcf88534688ba",
"revisionTime": "2016-12-04T22:13:08Z"
"revision": "81007d2ce0176f7a9ce52dd12e56edd7ef40e72c",
"revisionTime": "2017-08-04T05:45:59Z"
},
{
"checksumSHA1": "kBeNcaKk56FguvPSUCEaH6AxpRc=",
"path": "github.com/golang/protobuf/proto",
"revision": "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317",
"revisionTime": "2017-03-07T00:15:33Z"
},
{
"checksumSHA1": "SpQ2Lu1wvJWA4Yg/7ZqP+VqCmcg=",
"path": "github.com/json-iterator/go",
"revision": "1cfa233923ea407d7f0c70d7a7d835030678e788",
"revisionTime": "2017-08-04T23:22:53Z"
},
{
"checksumSHA1": "b0T0Hzd+zYk+OCDTFMps+jwa/nY=",
"path": "github.com/manucorporat/sse",
Expand Down Expand Up @@ -68,14 +86,20 @@
"revision": "4d4bfba8f1d1027c4fdbe371823030df51419987",
"revisionTime": "2017-01-30T11:31:45Z"
},
{
"checksumSHA1": "9Zw986fuQM/hCoVd8vmHoSM+8sU=",
"path": "github.com/ugorji/go/codec",
"revision": "5efa3251c7f7d05e5d9704a69a984ec9f1386a40",
"revisionTime": "2017-06-20T10:48:52Z"
},
{
"checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=",
"path": "golang.org/x/net/context",
"revision": "a6577fac2d73be281a500b310739095313165611",
"revisionTime": "2017-03-08T20:54:49Z"
},
{
"checksumSHA1": "/oZpHfYc+ZgOwYAhlvcMhmETYpw=",
"checksumSHA1": "TVEkpH3gq84iQ39I4R+mlDwjuVI=",
"path": "golang.org/x/sys/unix",
"revision": "99f16d856c9836c42d24e7ab64ea72916925fa97",
"revisionTime": "2017-03-08T15:04:45Z"
Expand Down

0 comments on commit 16494d6

Please sign in to comment.