From 4c2a0223c94821e60eda156d56ef71b26ddfd903 Mon Sep 17 00:00:00 2001 From: hbc Date: Tue, 26 Sep 2017 20:21:05 +0800 Subject: [PATCH 1/2] auth/jwt: add claim factory to example --- auth/jwt/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/auth/jwt/README.md b/auth/jwt/README.md index d435e0f1e..d2430bd28 100644 --- a/auth/jwt/README.md +++ b/auth/jwt/README.md @@ -13,7 +13,7 @@ will be added to the context via the `jwt.JWTClaimsContextKey`. ```go import ( stdjwt "github.com/dgrijalva/jwt-go" - + "github.com/go-kit/kit/auth/jwt" "github.com/go-kit/kit/endpoint" ) @@ -23,7 +23,7 @@ func main() { { kf := func(token *stdjwt.Token) (interface{}, error) { return []byte("SigningString"), nil } exampleEndpoint = MakeExampleEndpoint(service) - exampleEndpoint = jwt.NewParser(kf, stdjwt.SigningMethodHS256)(exampleEndpoint) + exampleEndpoint = jwt.NewParser(kf, stdjwt.SigningMethodHS256, jwt.StandardClaimsFactory)(exampleEndpoint) } } ``` @@ -35,7 +35,7 @@ the token string and add it to the context via the `jwt.JWTTokenContextKey`. ```go import ( stdjwt "github.com/dgrijalva/jwt-go" - + "github.com/go-kit/kit/auth/jwt" "github.com/go-kit/kit/endpoint" ) @@ -45,9 +45,9 @@ func main() { { exampleEndpoint = grpctransport.NewClient(...).Endpoint() exampleEndpoint = jwt.NewSigner( - "kid-header", - []byte("SigningString"), - stdjwt.SigningMethodHS256, + "kid-header", + []byte("SigningString"), + stdjwt.SigningMethodHS256, jwt.Claims{}, )(exampleEndpoint) } @@ -67,7 +67,7 @@ Example of use in a client: import ( stdjwt "github.com/dgrijalva/jwt-go" - grpctransport "github.com/go-kit/kit/transport/grpc" + grpctransport "github.com/go-kit/kit/transport/grpc" "github.com/go-kit/kit/auth/jwt" "github.com/go-kit/kit/endpoint" ) From 492a87e5932d3bb699d2f3444eed6d07317a1048 Mon Sep 17 00:00:00 2001 From: hbc Date: Tue, 26 Sep 2017 20:21:59 +0800 Subject: [PATCH 2/2] auth/jwt: minor gofmt fixes --- auth/jwt/middleware.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/auth/jwt/middleware.go b/auth/jwt/middleware.go index c07d6e97e..0e29e6d68 100644 --- a/auth/jwt/middleware.go +++ b/auth/jwt/middleware.go @@ -70,21 +70,21 @@ func NewSigner(kid string, key []byte, method jwt.SigningMethod, claims jwt.Clai // Useful in NewParser middleware. type ClaimsFactory func() jwt.Claims -// MapClaimsFactory is a ClaimsFactory that returns +// MapClaimsFactory is a ClaimsFactory that returns // an empty jwt.MapClaims. func MapClaimsFactory() jwt.Claims { - return jwt.MapClaims{} + return jwt.MapClaims{} } -// StandardClaimsFactory is a ClaimsFactory that returns +// StandardClaimsFactory is a ClaimsFactory that returns // an empty jwt.StandardClaims. func StandardClaimsFactory() jwt.Claims { - return &jwt.StandardClaims{} + return &jwt.StandardClaims{} } // NewParser creates a new JWT token parsing middleware, specifying a // jwt.Keyfunc interface, the signing method and the claims type to be used. NewParser -// adds the resulting claims to endpoint context or returns error on invalid token. +// adds the resulting claims to endpoint context or returns error on invalid token. // Particularly useful for servers. func NewParser(keyFunc jwt.Keyfunc, method jwt.SigningMethod, newClaims ClaimsFactory) endpoint.Middleware { return func(next endpoint.Endpoint) endpoint.Endpoint {