minor

Author: kataras

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        go_version: [1.24.x]
+        go_version: [1.25.x]
     steps:
 
     - name: Set up Go 1.x

_benchmarks/go.mod

@@ -1,6 +1,6 @@
 module benchmarks
 
-go 1.24
+go 1.25
 
 replace github.com/kataras/jwt => ../
 

claims_test.go

@@ -171,33 +171,33 @@ func TestMerge(t *testing.T) {
 
 	tests := []struct {
 		name     string
-		claims   interface{}
-		other    interface{}
-		expected map[string]interface{}
+		claims   any
+		other    any
+		expected map[string]any
 	}{
 		{
 			name:     "merge with empty object",
-			claims:   map[string]interface{}{"foo": "bar"},
-			other:    map[string]interface{}{},
-			expected: map[string]interface{}{"foo": "bar"},
+			claims:   map[string]any{"foo": "bar"},
+			other:    map[string]any{},
+			expected: map[string]any{"foo": "bar"},
 		},
 		{
 			name:     "merge two maps",
-			claims:   map[string]interface{}{"foo": "bar"},
-			other:    map[string]interface{}{"baz": "qux"},
-			expected: map[string]interface{}{"foo": "bar", "baz": "qux"},
+			claims:   map[string]any{"foo": "bar"},
+			other:    map[string]any{"baz": "qux"},
+			expected: map[string]any{"foo": "bar", "baz": "qux"},
 		},
 		{
 			name: "merge with Claims struct",
-			claims: map[string]interface{}{
+			claims: map[string]any{
 				"custom": "value",
 			},
 			other: Claims{
 				Issuer:   "test-issuer",
 				IssuedAt: now,
 				Expiry:   expiry,
 			},
-			expected: map[string]interface{}{
+			expected: map[string]any{
 				"custom": "value",
 				"iss":    "test-issuer",
 				"iat":    float64(now), // JSON numbers are decoded as float64
@@ -206,9 +206,9 @@ func TestMerge(t *testing.T) {
 		},
 		{
 			name:     "merge with nil",
-			claims:   map[string]interface{}{"foo": "bar"},
+			claims:   map[string]any{"foo": "bar"},
 			other:    nil,
-			expected: map[string]interface{}{"foo": "bar"},
+			expected: map[string]any{"foo": "bar"},
 		},
 	}
 
@@ -219,7 +219,7 @@ func TestMerge(t *testing.T) {
 				t.Fatalf("Failed to merge: %v", err)
 			}
 
-			var got map[string]interface{}
+			var got map[string]any
 			if err := json.Unmarshal(result, &got); err != nil {
 				t.Fatalf("Failed to unmarshal result: %v", err)
 			}
@@ -237,33 +237,33 @@ func TestMergeAndSign(t *testing.T) {
 
 	tests := []struct {
 		name     string
-		claims   interface{}
-		other    interface{}
-		expected map[string]interface{}
+		claims   any
+		other    any
+		expected map[string]any
 	}{
 		{
 			name:     "merge and sign with empty object",
-			claims:   map[string]interface{}{"foo": "bar"},
-			other:    map[string]interface{}{},
-			expected: map[string]interface{}{"foo": "bar"},
+			claims:   map[string]any{"foo": "bar"},
+			other:    map[string]any{},
+			expected: map[string]any{"foo": "bar"},
 		},
 		{
 			name:     "merge and sign two maps",
-			claims:   map[string]interface{}{"foo": "bar"},
-			other:    map[string]interface{}{"baz": "qux"},
-			expected: map[string]interface{}{"foo": "bar", "baz": "qux"},
+			claims:   map[string]any{"foo": "bar"},
+			other:    map[string]any{"baz": "qux"},
+			expected: map[string]any{"foo": "bar", "baz": "qux"},
 		},
 		{
 			name: "merge and sign with Claims struct",
-			claims: map[string]interface{}{
+			claims: map[string]any{
 				"custom": "value",
 			},
 			other: Claims{
 				Issuer:   "test-issuer",
 				IssuedAt: now,
 				Expiry:   expiry,
 			},
-			expected: map[string]interface{}{
+			expected: map[string]any{
 				"custom": "value",
 				"iss":    "test-issuer",
 				"iat":    fmt.Sprintf("%d", now),
@@ -287,7 +287,7 @@ func TestMergeAndSign(t *testing.T) {
 
 			t.Logf("Generated token: %s", string(token))
 
-			var verifiedClaims map[string]interface{}
+			var verifiedClaims map[string]any
 			verifiedToken, err := Verify(HS256, key, token)
 			if err != nil {
 				t.Fatalf("Failed to verify token: %v", err)

go.mod

@@ -1,3 +1,3 @@
 module github.com/kataras/jwt
 
-go 1.24.4
+go 1.25

jwt.go

@@ -265,7 +265,7 @@ var Marshal = func(v any) ([]byte, error) {
 //   - Uses json.Decoder with UseNumber() to handle integers correctly
 //   - Prevents automatic conversion of all numbers to float64
 //   - Preserves numeric precision for large integers
-//   - Decodes JSON numbers as json.Number type when destination is interface{}
+//   - Decodes JSON numbers as json.Number type when destination is any
 //
 // **Why UseNumber() Matters**:
 //   - Standard json.Unmarshal converts all numbers to float64

verify.go

@@ -482,7 +482,7 @@ func verifyToken(alg Alg, key PublicKey, decrypt InjectFunc, token []byte, heade
 		standardClaims = secondChange.toClaims()
 	}
 
-	if err != nil { // do not proceed if we have a JSON error.
+	if err == nil { // do not proceed if we have a JSON error.
 		err = validateClaims(Clock(), standardClaims)
 	}