auth/jwt: MapClaims: passing #568
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
add claimsFactory type make NewParser take a claimsFactory instead of an instance of jwt.Claims use claimsFactory to create a jwt.Claims to pass in to jwt.ParseWithClaims update NewParser calls in tests to take a claimsFactory instead of a jwt.Claims instance
auth/jwt/middleware.go
Outdated
| @@ -66,11 +66,13 @@ func NewSigner(kid string, key []byte, method jwt.SigningMethod, claims jwt.Clai | |||
| } | |||
| } | |||
|
|
|||
| type claimsFactory func() jwt.Claims | |||
There was a problem hiding this comment.
This should be exported, ClaimsFactory.
auth/jwt/middleware_test.go
Outdated
| @@ -74,7 +74,7 @@ func TestJWTParser(t *testing.T) { | |||
| return key, nil | |||
| } | |||
|
|
|||
| parser := NewParser(keys, method, jwt.MapClaims{})(e) | |||
| parser := NewParser(keys, method, func() jwt.Claims { return jwt.MapClaims{} })(e) | |||
There was a problem hiding this comment.
This anonymous func should be provided as a top-level function in the package, e.g.
// MapClaimsFactory is a ClaimsFactory that returns
// an empty jwt.MapClaims.
func MapClaimsFactory() jwt.Claims {
return jwt.MapClaims{}
}
auth/jwt/middleware_test.go
Outdated
| @@ -134,15 +134,15 @@ func TestJWTParser(t *testing.T) { | |||
| } | |||
|
|
|||
| // Test for malformed token error response | |||
| parser = NewParser(keys, method, &jwt.StandardClaims{})(e) | |||
| parser = NewParser(keys, method, func() jwt.Claims { return &jwt.StandardClaims{} })(e) | |||
There was a problem hiding this comment.
Similarly, this anonymous func should be provided as a top-level function in the package, e.g.
// StandardClaimsFactory is a ClaimsFactory that returns
// an empty jwt.StandardClaims.
func StandardClaimsFactory() jwt.Claims {
return &jwt.StandardClaims{}
}… for Map and Standard claims factories
|
thanks @peterbourgon - good points, all fixed now. sorry for the sloppiness - a bit pressed for time. let me know of other changes and i'll happily make them :) |
auth/jwt/middleware.go
Outdated
| @@ -66,11 +66,25 @@ func NewSigner(kid string, key []byte, method jwt.SigningMethod, claims jwt.Clai | |||
| } | |||
| } | |||
|
|
|||
| type ClaimsFactory func() jwt.Claims | |||
There was a problem hiding this comment.
woops yeah! done now :)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
add claimsFactory type
make NewParser take a claimsFactory instead of an instance of jwt.Claims
use claimsFactory to create a jwt.Claims to pass in to jwt.ParseWithClaims
update NewParser calls in tests to take a claimsFactory instead of a jwt.Claims instance