allow to add custom class claims

lbalmaceda · lbalmaceda · commit e53d31d6df9c · 2016-12-14T18:35:10.000-03:00
diff --git a/lib/src/main/java/com/auth0/jwt/JWTCreator.java b/lib/src/main/java/com/auth0/jwt/JWTCreator.java
@@ -153,20 +153,15 @@ public Builder withJWTId(String jwtId) {
         /**
          * Add a custom Claim value.
          *
-         * @param name  the Claim's name
-         * @param value the Claim's value. Must be an instance of Integer, Double, Boolean, Date or String class.
+         * @param name  the Claim's name.
+         * @param value the Claim's value.
          * @return this same Builder instance.
-         * @throws IllegalArgumentException if the name is null or the value class is not allowed.
+         * @throws IllegalArgumentException if the name is null.
          */
         public Builder withClaim(String name, Object value) throws IllegalArgumentException {
-            final boolean validValue = value instanceof Integer || value instanceof Double ||
-                    value instanceof Boolean || value instanceof Date || value instanceof String;
             if (name == null) {
                 throw new IllegalArgumentException("The Custom Claim's name can't be null.");
             }
-            if (!validValue) {
-                throw new IllegalArgumentException("The Custom Claim's value class must be an instance of Integer, Double, Boolean, Date or String.");
-            }
 
             addClaim(name, value);
             return this;
diff --git a/lib/src/main/java/com/auth0/jwt/interfaces/Claim.java b/lib/src/main/java/com/auth0/jwt/interfaces/Claim.java
@@ -54,18 +54,18 @@ public interface Claim {
 
     /**
      * Get this Claim as an Array of type T.
-     * If the value isn't an Array, an empty Array will be returned.
+     * If the value isn't an Array, null will be returned.
      *
-     * @return the value as an Array or an empty Array.
+     * @return the value as an Array or null.
      * @throws JWTDecodeException if the values inside the Array can't be converted to a class T.
      */
     <T> T[] asArray(Class<T> tClazz) throws JWTDecodeException;
 
     /**
      * Get this Claim as a List of type T.
-     * If the value isn't an Array, an empty List will be returned.
+     * If the value isn't an Array, null will be returned.
      *
-     * @return the value as a List or an empty List.
+     * @return the value as a List or null.
      * @throws JWTDecodeException if the values inside the List can't be converted to a class T.
      */
     <T> List<T> asList(Class<T> tClazz) throws JWTDecodeException;
diff --git a/lib/src/test/java/com/auth0/jwt/JWTCreatorTest.java b/lib/src/test/java/com/auth0/jwt/JWTCreatorTest.java
@@ -5,9 +5,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -153,14 +151,6 @@ public void shouldThrowOnNullCustomClaimName() throws Exception {
                 .withClaim(null, "value");
     }
 
-    @Test
-    public void shouldThrowOnIllegalCustomClaimValueClass() throws Exception {
-        exception.expect(IllegalArgumentException.class);
-        exception.expectMessage("The Custom Claim's value class must be an instance of Integer, Double, Boolean, Date or String.");
-        JWTCreator.init()
-                .withClaim("name", new Object());
-    }
-
     @Test
     public void shouldAcceptCustomClaimOfTypeString() throws Exception {
         String jwt = JWTCreator.init()
@@ -217,4 +207,47 @@ public void shouldAcceptCustomClaimOfTypeDate() throws Exception {
         assertThat(jwt, is(token));
     }
 
+    @Test
+    public void shouldAcceptCustomClaimOfTypeArray() throws Exception {
+        String jwt = JWTCreator.init()
+                .withClaim("name", new Object[]{"text", 123, true})
+                .sign(Algorithm.HMAC256("secret"));
+        String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjpbInRleHQiLDEyMyx0cnVlXX0.uSulPFzLSbgfG8Lpr0jq0JDMhDlGGeQrx09PHEymu1E";
+
+        assertThat(jwt, is(notNullValue()));
+        assertThat(jwt, is(token));
+    }
+
+    @Test
+    public void shouldAcceptCustomClaimOfTypeList() throws Exception {
+        String jwt = JWTCreator.init()
+                .withClaim("name", Arrays.asList("text", 123, true))
+                .sign(Algorithm.HMAC256("secret"));
+        String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjpbInRleHQiLDEyMyx0cnVlXX0.uSulPFzLSbgfG8Lpr0jq0JDMhDlGGeQrx09PHEymu1E";
+
+        assertThat(jwt, is(notNullValue()));
+        assertThat(jwt, is(token));
+    }
+
+    @Test
+    public void shouldAcceptCustomClaimOfTypeMap() throws Exception {
+        String jwt = JWTCreator.init()
+                .withClaim("name", Collections.singletonMap("value", new Object[]{"text", 123, true}))
+                .sign(Algorithm.HMAC256("secret"));
+        String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjp7InZhbHVlIjpbInRleHQiLDEyMyx0cnVlXX19.CtZqZMoG__8yJQisT__pcv3NlynrkDl6qvq4sERx6D0";
+
+        assertThat(jwt, is(notNullValue()));
+        assertThat(jwt, is(token));
+    }
+
+    @Test
+    public void shouldAcceptCustomClaimOfTypeObject() throws Exception {
+        String jwt = JWTCreator.init()
+                .withClaim("name", new UserPojo("john", 123))
+                .sign(Algorithm.HMAC256("secret"));
+        String token = "eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjp7Im5hbWUiOiJqb2huIiwiaWQiOjEyM319.4ar5Q2vy8h7mw-FjFp1XRoiiKQrrPqdrSqEfATCGmNM";
+
+        assertThat(jwt, is(notNullValue()));
+        assertThat(jwt, is(token));
+    }
 }
