GJWT
diff --git a/‎lib/src/main/java/com/auth0/jwt/JWTDecoder.java‎
Lines changed: 15 additions & 27 deletions b/‎lib/src/main/java/com/auth0/jwt/JWTDecoder.java‎
Lines changed: 15 additions & 27 deletions
diff --git a/‎lib/src/main/java/com/auth0/jwt/creators/AccessJwtCreator.java‎
Lines changed: 30 additions & 30 deletions b/‎lib/src/main/java/com/auth0/jwt/creators/AccessJwtCreator.java‎
Lines changed: 30 additions & 30 deletions
diff --git a/‎lib/src/main/java/com/auth0/jwt/creators/ExtendedJwtCreator.java‎
Lines changed: 8 additions & 8 deletions b/‎lib/src/main/java/com/auth0/jwt/creators/ExtendedJwtCreator.java‎
Lines changed: 8 additions & 8 deletions
@@ -20,21 +20,19 @@
 package com.auth0.jwt;
 
 import com.auth0.jwt.creators.*;
-import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.impl.JWTParser;
-import com.auth0.jwt.impl.PublicClaims;
+import com.auth0.jwt.impl.Claims;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.auth0.jwt.interfaces.Header;
 import com.auth0.jwt.interfaces.Payload;
-import com.auth0.jwt.jwts.ExtendedJWT;
+import com.auth0.jwt.utils.TokenUtils;
 import org.apache.commons.codec.binary.Base32;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.binary.StringUtils;
 
 import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.*;
 
 /**
@@ -47,16 +45,6 @@ public final class JWTDecoder implements DecodedJWT {
     private final Header header;
     private final Payload payload;
 
-    private static final String NAME = "name";
-    private static final String EMAIL = "email";
-    private static final String PICTURE = "picture";
-    private static final String ISSUER = "iss";
-    private static final String AUDIENCE = "aud";
-    private static final String SUBJECT = "sub";
-    private static final String ISSUED_AT = "iat";
-    private static final String EXP = "exp";
-    private static final String APP_ID = "appId";
-    private static final String USER_ID = "userId";
     private static final String FACEBOOK = "facebook";
     private static final String GOOGLE = "google";
 
@@ -176,24 +164,24 @@ public String getToken() {
 
     public static GoogleOrFbJwtCreator decodeJWT(DecodedJWT jwt) {
         Map<String, Claim> claims = jwt.getClaims();
-        String issuer = claims.get(ISSUER).asString();
+        String issuer = claims.get(Claims.ISSUER).asString();
         GoogleOrFbJwtCreator googleOrFbJwtCreator = null;
         if(issuer.contains(FACEBOOK)) {
             googleOrFbJwtCreator = FbJwtCreator.build()
-                    .withExp(claims.get(EXP).asDate())
-                    .withIat(claims.get(ISSUED_AT).asDate())
-                    .withAppId(claims.get(APP_ID).asString())
-                    .withUserId(claims.get(USER_ID).asString());
+                    .withExp(claims.get(Claims.EXPIRES_AT).asDate())
+                    .withIat(claims.get(Claims.ISSUED_AT).asDate())
+                    .withAppId(claims.get(Claims.APP_ID).asString())
+                    .withUserId(claims.get(Claims.USER_ID).asString());
         } else if(issuer.contains(GOOGLE)) {
             googleOrFbJwtCreator = GoogleJwtCreator.build()
-                    .withPicture(claims.get(PICTURE).asString())
-                    .withEmail(claims.get(EMAIL).asString())
-                    .withIssuer(claims.get(ISSUER).asString())
-                    .withSubject(claims.get(SUBJECT).asString())
-                    .withAudience(claims.get(AUDIENCE).asString())
-                    .withExp(claims.get(EXP).asDate())
-                    .withIat(claims.get(ISSUED_AT).asDate())
-                    .withName(claims.get(NAME).asString());
+                    .withPicture(claims.get(Claims.PICTURE).asString())
+                    .withEmail(claims.get(Claims.EMAIL).asString())
+                    .withIssuer(claims.get(Claims.ISSUER).asString())
+                    .withSubject(claims.get(Claims.SUBJECT).asString())
+                    .withAudience(claims.get(Claims.AUDIENCE).asString())
+                    .withExp(claims.get(Claims.EXPIRES_AT).asDate())
+                    .withIat(claims.get(Claims.ISSUED_AT).asDate())
+                    .withName(claims.get(Claims.NAME).asString());
         } else {
             throw new IllegalArgumentException("Not from a Facebook or Google issuer");
         }
 
@@ -21,7 +21,7 @@
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
-import com.auth0.jwt.impl.PublicClaims;
+import com.auth0.jwt.impl.Claims;
 import com.auth0.jwt.jwts.JWT;
 
 import java.util.Date;
@@ -36,47 +36,37 @@ public class AccessJwtCreator {
 
     protected JWTCreator.Builder jwt;
     protected HashMap<String, Boolean> requiredClaims;
-    protected Set<String> publicClaims;
 
-    public AccessJwtCreator() {
+    private AccessJwtCreator() {
         jwt = JWT.create();
         requiredClaims = new HashMap<String, Boolean>() {{
-            put("Issuer", false);
-            put("Subject", false);
-            put("Iat", false);
-        }};
-        publicClaims = new HashSet<String>() {{
-            add(PublicClaims.ISSUER);
-            add(PublicClaims.SUBJECT);
-            add(PublicClaims.EXPIRES_AT);
-            add(PublicClaims.NOT_BEFORE);
-            add(PublicClaims.ISSUED_AT);
-            add(PublicClaims.JWT_ID);
-            add(PublicClaims.AUDIENCE);
+            put(Claims.ISSUER, false);
+            put(Claims.SUBJECT, false);
+            put(Claims.ISSUED_AT, false);
         }};
     }
 
     /**
-     * Add a specific Issuer ("issuer") claim to the Payload.
+     * Add a specific Issuer (Claims.ISSUER) claim to the Payload.
      *
      * @param issuer the Issuer value.
      * @return this same Builder instance.
      */
     public AccessJwtCreator withIssuer(String issuer) {
         jwt.withIssuer(issuer);
-        requiredClaims.put("Issuer", true);
+        requiredClaims.put(Claims.ISSUER, true);
         return this;
     }
 
     /**
-     * Add a specific Subject ("subject") claim to the Payload.
+     * Add a specific Subject (Claims.SUBJECT) claim to the Payload.
      *
      * @param subject the Subject value.
      * @return this same Builder instance.
      */
     public AccessJwtCreator withSubject(String subject) {
         jwt.withSubject(subject);
-        requiredClaims.put("Subject", true);
+        requiredClaims.put(Claims.SUBJECT, true);
         return this;
     }
 
@@ -93,14 +83,14 @@ public AccessJwtCreator withAudience(String... audience) {
     }
 
     /**
-     * Add a specific Issued At ("iat") claim to the Payload.
+     * Add a specific Issued At (Claims.ISSUED_AT) claim to the Payload.
      *
      * @param iat the Issued At value.
      * @return this same Builder instance.
      */
     public AccessJwtCreator withIat(Date iat) {
         jwt.withIssuedAt(iat);
-        requiredClaims.put("Iat", true);
+        requiredClaims.put(Claims.ISSUED_AT, true);
         return this;
     }
 
@@ -124,7 +114,13 @@ public AccessJwtCreator withExp(Date exp) {
      * @throws IllegalArgumentException if the name is null.
      */
     public AccessJwtCreator withNonStandardClaim(String name, String value) {
-        jwt.withNonStandardClaim(name, value);
+        if(name.equalsIgnoreCase("subject") || name.equalsIgnoreCase(Claims.SUBJECT)) {
+            withSubject(value);
+        } else if(name.equalsIgnoreCase("issuer") || name.equalsIgnoreCase(Claims.ISSUER)) {
+            withIssuer(value);
+        } else {
+            jwt.withNonStandardClaim(name, value);
+        }
         return this;
     }
 
@@ -189,7 +185,11 @@ public AccessJwtCreator withNonStandardClaim(String name, Double value) throws I
      * @throws IllegalArgumentException if the name is null.
      */
     public AccessJwtCreator withNonStandardClaim(String name, Date value) throws IllegalArgumentException {
-        jwt.withNonStandardClaim(name, value);
+        if(name.equalsIgnoreCase(Claims.ISSUED_AT) || name.equalsIgnoreCase("issuedAt") || name.equalsIgnoreCase("issued_at")) {
+            withIat(value);
+        } else {
+            jwt.withNonStandardClaim(name, value);
+        }
         return this;
     }
 
@@ -203,7 +203,7 @@ public AccessJwtCreator withNonStandardClaim(String name, Date value) throws Ill
      */
     public AccessJwtCreator withArrayClaim(String name, String... items) throws IllegalArgumentException {
         jwt.withArrayClaim(name, items);
-        if(publicClaims.contains(name))
+        if(requiredClaims.containsKey(name))
             requiredClaims.put(name, true);
         return this;
     }
@@ -230,11 +230,11 @@ public AccessJwtCreator setIsNoneAlgorithmAllowed(boolean isNoneAlgorithmAllowed
      * @throws JWTCreationException     if the claims could not be converted to a valid JSON or there was a problem with the signing key.
      */
     public String sign(Algorithm algorithm) throws Exception {
-        if(!jwt.getIsNoneAlgorithmAllowed() && algorithm.equals(Algorithm.none())) {
+        if(!jwt.getIsNoneAlgorithmAllowed() && Algorithm.none().equals(algorithm)) {
             throw new IllegalAccessException("None algorithm isn't allowed");
         }
-        String JWS = jwt.sign(algorithm);
         verifyClaims();
+        String JWS = jwt.sign(algorithm);
         return JWS;
     }
 
@@ -248,11 +248,11 @@ public String sign(Algorithm algorithm) throws Exception {
      * @throws JWTCreationException     if the claims could not be converted to a valid JSON or there was a problem with the signing key.
      */
     public String signBase16Encoding(Algorithm algorithm) throws Exception {
-        if(!jwt.getIsNoneAlgorithmAllowed() && algorithm.equals(Algorithm.none())) {
+        if(!jwt.getIsNoneAlgorithmAllowed() && Algorithm.none().equals(algorithm)) {
             throw new IllegalAccessException("None algorithm isn't allowed");
         }
-        String JWS = jwt.sign(algorithm, EncodeType.Base16);
         verifyClaims();
+        String JWS = jwt.sign(algorithm, EncodeType.Base16);
         return JWS;
     }
 
@@ -266,11 +266,11 @@ public String signBase16Encoding(Algorithm algorithm) throws Exception {
      * @throws JWTCreationException     if the claims could not be converted to a valid JSON or there was a problem with the signing key.
      */
     public String signBase32Encoding(Algorithm algorithm) throws Exception {
-        if(!jwt.getIsNoneAlgorithmAllowed() && algorithm.equals(Algorithm.none())) {
+        if(!jwt.getIsNoneAlgorithmAllowed() && Algorithm.none().equals(algorithm)) {
             throw new IllegalAccessException("None algorithm isn't allowed");
         }
-        String JWS = jwt.sign(algorithm, EncodeType.Base32);
         verifyClaims();
+        String JWS = jwt.sign(algorithm, EncodeType.Base32);
         return JWS;
     }
 
 
@@ -29,7 +29,7 @@
  */
 public class ExtendedJwtCreator extends GoogleJwtCreator{
 
-    public ExtendedJwtCreator() {
+    private ExtendedJwtCreator() {
         super();
     }
 
@@ -39,7 +39,7 @@ public ExtendedJwtCreator() {
      * @param nbf the nbf value.
      * @return this same Builder instance.
      */
-    public GoogleJwtCreator withNbf(Date nbf) {
+    public ExtendedJwtCreator withNbf(Date nbf) {
         jwt.withNotBefore(nbf);
         return this;
     }
@@ -54,11 +54,11 @@ public GoogleJwtCreator withNbf(Date nbf) {
      * @throws JWTCreationException     if the claims could not be converted to a valid JSON or there was a problem with the signing key.
      */
     public String sign(Algorithm algorithm) throws Exception {
-        if(!jwt.getIsNoneAlgorithmAllowed() && algorithm.equals(Algorithm.none())) {
+        if(!jwt.getIsNoneAlgorithmAllowed() && Algorithm.none().equals(algorithm)) {
             throw new IllegalAccessException("None algorithm isn't allowed");
         }
-        String JWS = jwt.sign(algorithm);
         verifyClaims();
+        String JWS = jwt.sign(algorithm);
         return JWS;
     }
 
@@ -72,11 +72,11 @@ public String sign(Algorithm algorithm) throws Exception {
      * @throws JWTCreationException     if the claims could not be converted to a valid JSON or there was a problem with the signing key.
      */
     public String signBase16Encoding(Algorithm algorithm) throws Exception {
-        if(!jwt.getIsNoneAlgorithmAllowed() && algorithm.equals(Algorithm.none())) {
+        if(!jwt.getIsNoneAlgorithmAllowed() && Algorithm.none().equals(algorithm)) {
             throw new IllegalAccessException("None algorithm isn't allowed");
         }
-        String JWS = jwt.sign(algorithm, EncodeType.Base16);
         verifyClaims();
+        String JWS = jwt.sign(algorithm, EncodeType.Base16);
         return JWS;
     }
 
@@ -90,11 +90,11 @@ public String signBase16Encoding(Algorithm algorithm) throws Exception {
      * @throws JWTCreationException     if the claims could not be converted to a valid JSON or there was a problem with the signing key.
      */
     public String signBase32Encoding(Algorithm algorithm) throws Exception {
-        if(!jwt.getIsNoneAlgorithmAllowed() && algorithm.equals(Algorithm.none())) {
+        if(!jwt.getIsNoneAlgorithmAllowed() && Algorithm.none().equals(algorithm)) {
             throw new IllegalAccessException("None algorithm isn't allowed");
         }
-        String JWS = jwt.sign(algorithm, EncodeType.Base32);
         verifyClaims();
+        String JWS = jwt.sign(algorithm, EncodeType.Base32);
         return JWS;
     }