Update examples

Author: sergiught

examples/http-example/main.go

@@ -9,8 +9,9 @@ import (
 	"gopkg.in/square/go-jose.v2"
 	"gopkg.in/square/go-jose.v2/jwt"
 
-	"github.com/auth0/go-jwt-middleware"
 	"github.com/auth0/go-jwt-middleware/validate/josev2"
+
+	"github.com/auth0/go-jwt-middleware"
 )
 
 var handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -32,19 +33,12 @@ func main() {
 		return []byte("secret"), nil
 	}
 
-	expectedClaimsFunc := func() jwt.Expected {
-		// By setting up expected claims we are saying
-		// a token must have the data we specify.
-		return jwt.Expected{
-			Issuer: "josev2-example",
-		}
-	}
-
 	// Set up the josev2 validator.
 	validator, err := josev2.New(
 		keyFunc,
 		jose.HS256,
-		josev2.WithExpectedClaims(expectedClaimsFunc),
+		"josev2-example",
+		jwt.Audience{},
 	)
 	if err != nil {
 		log.Fatalf("failed to set up the josev2 validator: %v", err)

examples/http-jwks-example/main.go

@@ -8,9 +8,11 @@ import (
 	"time"
 
 	"gopkg.in/square/go-jose.v2"
+	"gopkg.in/square/go-jose.v2/jwt"
 
-	"github.com/auth0/go-jwt-middleware"
 	"github.com/auth0/go-jwt-middleware/validate/josev2"
+
+	"github.com/auth0/go-jwt-middleware"
 )
 
 var handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -38,6 +40,8 @@ func main() {
 	validator, err := josev2.New(
 		provider.KeyFunc,
 		jose.RS256,
+		"josev2-example",
+		jwt.Audience{},
 	)
 	if err != nil {
 		log.Fatalf("failed to set up the josev2 validator: %v", err)

middleware_test.go

@@ -33,11 +33,8 @@ func Test_CheckJWT(t *testing.T) {
 			return []byte("secret"), nil
 		},
 		jose.HS256,
-		josev2.WithExpectedClaims(
-			func() jwt.Expected {
-				return jwt.Expected{Issuer: "testing"}
-			},
-		),
+		"testing",
+		jwt.Audience{},
 	)
 	if err != nil {
 		t.Fatal(err)

validate/josev2/examples/main.go

@@ -49,26 +49,16 @@ func main() {
 		return []byte("secret"), nil
 	}
 
-	expectedClaims := func() jwt.Expected {
-		// By setting up expected claims we are saying
-		// a token must have the data we specify.
-		return jwt.Expected{
-			Issuer: "josev2-example",
-			Time:   time.Now(),
-		}
-	}
-
-	customClaims := func() josev2.CustomClaims {
-		// We want this struct to be filled in with
-		// our custom claims from the token.
-		return &CustomClaimsExample{}
-	}
+	// We want this struct to be filled in with
+	// our custom claims from the token.
+	customClaims := &CustomClaimsExample{}
 
 	// Set up the josev2 validator.
 	validator, err := josev2.New(
 		keyFunc,
 		jose.HS256,
-		josev2.WithExpectedClaims(expectedClaims),
+		"josev2-example",
+		jwt.Audience{},
 		josev2.WithCustomClaims(customClaims),
 		josev2.WithAllowedClockSkew(30*time.Second),
 	)