Add UnmarshalJSON

basculehttp/tokenFactory.go

@@ -130,7 +130,7 @@ func (btf BearerTokenFactory) ParseAndValidate(ctx context.Context, _ *http.Requ
 
 	principal, ok := payload[jwtPrincipalKey].(string)
 	if !ok {
-		return nil, emperror.WrapWith(ErrorUnexpectedPrincipal, "failed to get and convert principal", "principal", payload[jwtPrincipalKey], "payload", payload)
+		return nil, emperror.WrapWith(ErrorUnexpectedPrincipal, "failed to get and convert principal", "principal", payload[jwtPrincipalKey], "claims map", claimsMap, "payload", payload)
 	}
 
 	return bascule.NewToken("jwt", principal, payload), nil

jws.go

@@ -1,6 +1,7 @@
 package bascule
 
 import (
+	"encoding/json"
 	"errors"
 
 	jwt "github.com/dgrijalva/jwt-go"
@@ -66,6 +67,11 @@ func (c *ClaimsWithLeeway) Valid() error {
 	return vErr
 }
 
+func (c *ClaimsWithLeeway) UnmarshalJSON(data []byte) error {
+	c.MapClaims = make(jwt.MapClaims) // just to be sure it's clean before each unmarshal
+	return json.Unmarshal(data, &c.MapClaims)
+}
+
 // GetMap returns a map of string to interfaces of the values in the ClaimsWithLeeway
 func (c *ClaimsWithLeeway) GetMap() (map[string]interface{}, error) {
 	// for StandardClaims, which don't work with the []string aud values that we use