Align quarkus-test-security-jwt with how smallrye-jwt currently handles some unknown claims

Author: sberyozkin

test-framework/security-jwt/src/main/java/io/quarkus/test/security/jwt/JwtTestSecurityIdentityAugmentor.java

@@ -12,6 +12,7 @@
 import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonReader;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
@@ -63,7 +64,7 @@ public <T> T getClaim(String claimName) {
                 if (jwtSecurity != null && jwtSecurity.claims() != null) {
                     for (Claim claim : jwtSecurity.claims()) {
                         if (claim.key().equals(claimName)) {
-                            return convertClaimValue(claim);
+                            return (T) wrapValue(claim, convertClaimValue(claim));
                         }
                     }
                 }
@@ -92,6 +93,30 @@ private static JwtSecurity findJwtSecurity(Annotation[] annotations) {
         return null;
     }
 
+    private Object wrapValue(Claim claim, Object convertedClaimValue) {
+        Claims claimType = getClaimType(claim.key());
+        if (Claims.UNKNOWN == claimType) {
+            if (convertedClaimValue instanceof Long) {
+                return Json.createValue((Long) convertedClaimValue);
+            } else if (convertedClaimValue instanceof Integer) {
+                return Json.createValue((Integer) convertedClaimValue);
+            } else if (convertedClaimValue instanceof Boolean) {
+                return (Boolean) convertedClaimValue ? JsonValue.TRUE : JsonValue.FALSE;
+            }
+        }
+        return convertedClaimValue;
+    }
+
+    protected Claims getClaimType(String claimName) {
+        Claims claimType;
+        try {
+            claimType = Claims.valueOf(claimName);
+        } catch (IllegalArgumentException e) {
+            claimType = Claims.UNKNOWN;
+        }
+        return claimType;
+    }
+
     @SuppressWarnings("unchecked")
     private <T> T convertClaimValue(Claim claim) {
         if (claim.type() != Object.class) {

test-framework/security-jwt/src/test/java/io/quarkus/test/security/jwt/JwtTestSecurityIdentityAugmentorTest.java

@@ -1,15 +1,16 @@
 package io.quarkus.test.security.jwt;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.annotation.Annotation;
 import java.security.Principal;
 import java.util.Set;
 
 import jakarta.json.JsonArray;
+import jakarta.json.JsonNumber;
 import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
@@ -57,10 +58,10 @@ public String getName() {
         assertEquals(123456788, jwt.getIssuedAtTime());
         assertEquals(123456787, (Long) jwt.getClaim(Claims.nbf.name()));
         assertEquals(123456786, (Long) jwt.getClaim(Claims.auth_time.name()));
-        assertEquals(123456785, (Long) jwt.getClaim("customlong"));
+        assertEquals(123456785, ((JsonNumber) jwt.getClaim("customlong")).longValue());
         assertEquals("[email protected]", jwt.getClaim(Claims.email));
         assertTrue((Boolean) jwt.getClaim(Claims.email_verified.name()));
-        assertFalse((Boolean) jwt.getClaim("email_checked"));
+        assertEquals(JsonValue.FALSE, jwt.getClaim("email_checked"));
 
         JsonArray array = jwt.getClaim("jsonarray_claim");
         assertEquals("1", array.getString(0));