glide up

vendor/github.com/go-kit/kit/auth/jwt/README.md

@@ -92,7 +92,7 @@ Example of use in a server:
 
 ```go
 import (
-	"context"
+	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/auth/jwt"
 	"github.com/go-kit/kit/log"

vendor/github.com/go-kit/kit/auth/jwt/middleware.go

@@ -1,10 +1,10 @@
 package jwt
 
 import (
-	"context"
 	"errors"
 
 	jwt "github.com/dgrijalva/jwt-go"
+	"golang.org/x/net/context"
 
 	"github.com/go-kit/kit/endpoint"
 )
@@ -15,8 +15,7 @@ const (
 	// JWTTokenContextKey holds the key used to store a JWT Token in the
 	// context.
 	JWTTokenContextKey contextKey = "JWTToken"
-
-	// JWTClaimsContextKey holds the key used to store the JWT Claims in the
+	// JWTClaimsContxtKey holds the key used to store the JWT Claims in the
 	// context.
 	JWTClaimsContextKey contextKey = "JWTClaims"
 )
@@ -25,26 +24,20 @@ var (
 	// ErrTokenContextMissing denotes a token was not passed into the parsing
 	// middleware's context.
 	ErrTokenContextMissing = errors.New("token up for parsing was not passed through the context")
-
 	// ErrTokenInvalid denotes a token was not able to be validated.
 	ErrTokenInvalid = errors.New("JWT Token was invalid")
-
 	// ErrTokenExpired denotes a token's expire header (exp) has since passed.
 	ErrTokenExpired = errors.New("JWT Token is expired")
-
 	// ErrTokenMalformed denotes a token was not formatted as a JWT token.
 	ErrTokenMalformed = errors.New("JWT Token is malformed")
-
 	// ErrTokenNotActive denotes a token's not before header (nbf) is in the
 	// future.
 	ErrTokenNotActive = errors.New("token is not valid yet")
-
-	// ErrUnexpectedSigningMethod denotes a token was signed with an unexpected
+	// ErrUncesptedSigningMethod denotes a token was signed with an unexpected
 	// signing method.
 	ErrUnexpectedSigningMethod = errors.New("unexpected signing method")
 )
 
-// Claims is a map of arbitrary claim data.
 type Claims map[string]interface{}
 
 // NewSigner creates a new JWT token generating middleware, specifying key ID,

vendor/github.com/go-kit/kit/auth/jwt/middleware_test.go

@@ -1,10 +1,11 @@
 package jwt
 
 import (
-	"context"
 	"testing"
 
 	jwt "github.com/dgrijalva/jwt-go"
+
+	"golang.org/x/net/context"
 )
 
 var (

vendor/github.com/go-kit/kit/auth/jwt/transport.go

@@ -1,11 +1,11 @@
 package jwt
 
 import (
-	"context"
 	"fmt"
 	stdhttp "net/http"
 	"strings"
 
+	"golang.org/x/net/context"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/go-kit/kit/transport/grpc"
@@ -44,10 +44,10 @@ func FromHTTPContext() http.RequestFunc {
 
 // ToGRPCContext moves JWT token from grpc metadata to context. Particularly
 // userful for servers.
-func ToGRPCContext() grpc.ServerRequestFunc {
-	return func(ctx context.Context, md metadata.MD) context.Context {
+func ToGRPCContext() grpc.RequestFunc {
+	return func(ctx context.Context, md *metadata.MD) context.Context {
 		// capital "Key" is illegal in HTTP/2.
-		authHeader, ok := md["authorization"]
+		authHeader, ok := (*md)["authorization"]
 		if !ok {
 			return ctx
 		}
@@ -63,7 +63,7 @@ func ToGRPCContext() grpc.ServerRequestFunc {
 
 // FromGRPCContext moves JWT token from context to grpc metadata. Particularly
 // useful for clients.
-func FromGRPCContext() grpc.ClientRequestFunc {
+func FromGRPCContext() grpc.RequestFunc {
 	return func(ctx context.Context, md *metadata.MD) context.Context {
 		token, ok := ctx.Value(JWTTokenContextKey).(string)
 		if ok {

vendor/github.com/go-kit/kit/auth/jwt/transport_test.go

@@ -1,12 +1,13 @@
 package jwt
 
 import (
-	"context"
 	"fmt"
 	"net/http"
 	"testing"
 
 	"google.golang.org/grpc/metadata"
+
+	"golang.org/x/net/context"
 )
 
 func TestToHTTPContext(t *testing.T) {
@@ -69,7 +70,7 @@ func TestToGRPCContext(t *testing.T) {
 	reqFunc := ToGRPCContext()
 
 	// No Authorization header is passed
-	ctx := reqFunc(context.Background(), md)
+	ctx := reqFunc(context.Background(), &md)
 	token := ctx.Value(JWTTokenContextKey)
 	if token != nil {
 		t.Error("Context should not contain a JWT Token")
@@ -77,7 +78,7 @@ func TestToGRPCContext(t *testing.T) {
 
 	// Invalid Authorization header is passed
 	md["authorization"] = []string{fmt.Sprintf("%s", signedKey)}
-	ctx = reqFunc(context.Background(), md)
+	ctx = reqFunc(context.Background(), &md)
 	token = ctx.Value(JWTTokenContextKey)
 	if token != nil {
 		t.Error("Context should not contain a JWT Token")
@@ -85,7 +86,7 @@ func TestToGRPCContext(t *testing.T) {
 
 	// Authorization header is correct
 	md["authorization"] = []string{fmt.Sprintf("Bearer %s", signedKey)}
-	ctx = reqFunc(context.Background(), md)
+	ctx = reqFunc(context.Background(), &md)
 	token, ok := ctx.Value(JWTTokenContextKey).(string)
 	if !ok {
 		t.Fatal("JWT Token not passed to context correctly")