merge v0.23.0-rc changes

tools/security/jwt_test.go

@@ -1,7 +1,10 @@
 package security_test
 
 import (
+	"fmt"
+	"strconv"
 	"testing"
+	"time"
 
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/pocketbase/pocketbase/tools/security"
@@ -102,26 +105,30 @@ func TestParseJWT(t *testing.T) {
 		},
 	}
 
-	for i, scenario := range scenarios {
-		result, err := security.ParseJWT(scenario.token, scenario.secret)
-		if scenario.expectError && err == nil {
-			t.Errorf("(%d) Expected error got nil", i)
-		}
-		if !scenario.expectError && err != nil {
-			t.Errorf("(%d) Expected nil got error %v", i, err)
-		}
-		if len(result) != len(scenario.expectClaims) {
-			t.Errorf("(%d) Expected %v got %v", i, scenario.expectClaims, result)
-		}
-		for k, v := range scenario.expectClaims {
-			v2, ok := result[k]
-			if !ok {
-				t.Errorf("(%d) Missing expected claim %q", i, k)
+	for i, s := range scenarios {
+		t.Run(fmt.Sprintf("%d_%s", i, s.token), func(t *testing.T) {
+			result, err := security.ParseJWT(s.token, s.secret)
+
+			hasErr := err != nil
+
+			if hasErr != s.expectError {
+				t.Fatalf("Expected hasErr %v, got %v (%v)", s.expectError, hasErr, err)
 			}
-			if v != v2 {
-				t.Errorf("(%d) Expected %v for %q claim, got %v", i, v, k, v2)
+
+			if len(result) != len(s.expectClaims) {
+				t.Fatalf("Expected %v claims got %v", s.expectClaims, result)
 			}
-		}
+
+			for k, v := range s.expectClaims {
+				v2, ok := result[k]
+				if !ok {
+					t.Fatalf("Missing expected claim %q", k)
+				}
+				if v != v2 {
+					t.Fatalf("Expected %v for %q claim, got %v", v, k, v2)
+				}
+			}
+		})
 	}
 }
 
@@ -129,51 +136,51 @@ func TestNewJWT(t *testing.T) {
 	scenarios := []struct {
 		claims      jwt.MapClaims
 		key         string
-		duration    int64
+		duration    time.Duration
 		expectError bool
 	}{
 		// empty, zero duration
 		{jwt.MapClaims{}, "", 0, true},
 		// empty, 10 seconds duration
-		{jwt.MapClaims{}, "", 10, false},
+		{jwt.MapClaims{}, "", 10 * time.Second, false},
 		// non-empty, 10 seconds duration
-		{jwt.MapClaims{"name": "test"}, "test", 10, false},
+		{jwt.MapClaims{"name": "test"}, "test", 10 * time.Second, false},
 	}
 
 	for i, scenario := range scenarios {
-		token, tokenErr := security.NewJWT(scenario.claims, scenario.key, scenario.duration)
-		if tokenErr != nil {
-			t.Errorf("(%d) Expected NewJWT to succeed, got error %v", i, tokenErr)
-			continue
-		}
-
-		claims, parseErr := security.ParseJWT(token, scenario.key)
-
-		hasParseErr := parseErr != nil
-		if hasParseErr != scenario.expectError {
-			t.Errorf("(%d) Expected hasParseErr to be %v, got %v (%v)", i, scenario.expectError, hasParseErr, parseErr)
-			continue
-		}
-
-		if scenario.expectError {
-			continue
-		}
-
-		if _, ok := claims["exp"]; !ok {
-			t.Errorf("(%d) Missing required claim exp, got %v", i, claims)
-		}
-
-		// clear exp claim to match with the scenario ones
-		delete(claims, "exp")
-
-		if len(claims) != len(scenario.claims) {
-			t.Errorf("(%d) Expected %v claims, got %v", i, scenario.claims, claims)
-		}
-
-		for j, k := range claims {
-			if claims[j] != scenario.claims[j] {
-				t.Errorf("(%d) Expected %v for %q claim, got %v", i, claims[j], k, scenario.claims[j])
+		t.Run(strconv.Itoa(i), func(t *testing.T) {
+			token, tokenErr := security.NewJWT(scenario.claims, scenario.key, scenario.duration)
+			if tokenErr != nil {
+				t.Fatalf("Expected NewJWT to succeed, got error %v", tokenErr)
 			}
-		}
+
+			claims, parseErr := security.ParseJWT(token, scenario.key)
+
+			hasParseErr := parseErr != nil
+			if hasParseErr != scenario.expectError {
+				t.Fatalf("Expected hasParseErr to be %v, got %v (%v)", scenario.expectError, hasParseErr, parseErr)
+			}
+
+			if scenario.expectError {
+				return
+			}
+
+			if _, ok := claims["exp"]; !ok {
+				t.Fatalf("Missing required claim exp, got %v", claims)
+			}
+
+			// clear exp claim to match with the scenario ones
+			delete(claims, "exp")
+
+			if len(claims) != len(scenario.claims) {
+				t.Fatalf("Expected %v claims, got %v", scenario.claims, claims)
+			}
+
+			for j, k := range claims {
+				if claims[j] != scenario.claims[j] {
+					t.Fatalf("Expected %v for %q claim, got %v", claims[j], k, scenario.claims[j])
+				}
+			}
+		})
 	}
 }