Merge pull request #18 from my3rs/fix#16

fix: #16

Author: kataras

claims.go

@@ -296,12 +296,17 @@ func Merge(claims any, other any) []byte {
 		return nil
 	}
 
+	// Return the serialized claims if `other` is nil.
+	if other == nil {
+		return claimsB
+	}
+
 	otherB, err := Marshal(other)
 	if err != nil {
 		return nil
 	}
 
-	if len(otherB) == 0 {
+	if len(otherB) == 0 || string(otherB) == "{}" {
 		return claimsB
 	}
 

claims_test.go

@@ -1,6 +1,8 @@
 package jwt
 
 import (
+	"encoding/json"
+	"fmt"
 	"reflect"
 	"testing"
 	"time"
@@ -162,3 +164,158 @@ func TestClaimsSubAsInt(t *testing.T) {
 		t.Fatalf("expected: %#+v but got: %#+v\n", expectedClaims, verifiedToken.StandardClaims)
 	}
 }
+
+func TestMerge(t *testing.T) {
+	now := time.Now().Unix()
+	expiry := time.Now().Add(15 * time.Minute).Unix()
+
+	tests := []struct {
+		name     string
+		claims   interface{}
+		other    interface{}
+		expected map[string]interface{}
+	}{
+		{
+			name:     "merge with empty object",
+			claims:   map[string]interface{}{"foo": "bar"},
+			other:    map[string]interface{}{},
+			expected: map[string]interface{}{"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"},
+		},
+		{
+			name: "merge with Claims struct",
+			claims: map[string]interface{}{
+				"custom": "value",
+			},
+			other: Claims{
+				Issuer:   "test-issuer",
+				IssuedAt: now,
+				Expiry:   expiry,
+			},
+			expected: map[string]interface{}{
+				"custom": "value",
+				"iss":   "test-issuer",
+				"iat":   float64(now),    // JSON numbers are decoded as float64
+				"exp":   float64(expiry),
+			},
+		},
+		{
+			name:     "merge with nil",
+			claims:   map[string]interface{}{"foo": "bar"},
+			other:    nil,
+			expected: map[string]interface{}{"foo": "bar"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := Merge(tt.claims, tt.other)
+			
+			// 解码结果
+			var got map[string]interface{}
+			if err := json.Unmarshal(result, &got); err != nil {
+				t.Fatalf("Failed to unmarshal result: %v", err)
+			}
+
+			// 比较解码后的结果
+			if !reflect.DeepEqual(got, tt.expected) {
+				t.Errorf("Merge() = %v, want %v", got, tt.expected)
+			}
+		})
+	}
+}
+
+func TestMergeAndSign(t *testing.T) {
+	now := time.Now().Unix()
+	expiry := time.Now().Add(15 * time.Minute).Unix()
+
+	tests := []struct {
+		name     string
+		claims   interface{}
+		other    interface{}
+		expected map[string]interface{}
+	}{
+		{
+			name:     "merge and sign with empty object",
+			claims:   map[string]interface{}{"foo": "bar"},
+			other:    map[string]interface{}{},
+			expected: map[string]interface{}{"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"},
+		},
+		{
+			name: "merge and sign with Claims struct",
+			claims: map[string]interface{}{
+				"custom": "value",
+			},
+			other: Claims{
+				Issuer:   "test-issuer",
+				IssuedAt: now,
+				Expiry:   expiry,
+			},
+			expected: map[string]interface{}{
+				"custom": "value",
+				"iss":   "test-issuer",
+				"iat":   fmt.Sprintf("%d", now),
+				"exp":   fmt.Sprintf("%d", expiry),
+			},
+		},
+	}
+
+	key := []byte("secret")
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// 合并 claims
+			mergedClaims := Merge(tt.claims, tt.other)
+
+			// 使用合并后的 claims 生成 token
+			token, err := Sign(HS256, key, mergedClaims)
+			if err != nil {
+				t.Fatalf("Failed to sign token: %v", err)
+			}
+
+			// 打印生成的 token
+			t.Logf("Generated token: %s", string(token))
+
+			// 验证并解析 token
+			var verifiedClaims map[string]interface{}
+			verifiedToken, err := Verify(HS256, key, token)
+			if err != nil {
+				t.Fatalf("Failed to verify token: %v", err)
+			}
+
+			err = verifiedToken.Claims(&verifiedClaims)
+			if err != nil {
+				t.Fatalf("Failed to get claims from token: %v", err)
+			}
+
+			// 将 json.Number 转换为字符串
+			if exp, ok := verifiedClaims["exp"].(json.Number); ok {
+				verifiedClaims["exp"] = exp.String()
+			}
+			if iat, ok := verifiedClaims["iat"].(json.Number); ok {
+				verifiedClaims["iat"] = iat.String()
+			}
+
+			// 打印类型信息
+			t.Logf("Expected exp type: %T, value: %v", tt.expected["exp"], tt.expected["exp"])
+			t.Logf("Actual exp type: %T, value: %v", verifiedClaims["exp"], verifiedClaims["exp"])
+			t.Logf("Expected iat type: %T, value: %v", tt.expected["iat"], tt.expected["iat"])
+			t.Logf("Actual iat type: %T, value: %v", verifiedClaims["iat"], verifiedClaims["iat"])
+
+			// 比较解析后的 claims 是否与预期一致
+			if !reflect.DeepEqual(verifiedClaims, tt.expected) {
+				t.Errorf("Claims after merge and verify = %#v, want %#v", verifiedClaims, tt.expected)
+			}
+		})
+	}
+}