Don't need to provide nonstandard claims

Justin Dahmubed · Justin Dahmubed · commit 709ca99aafe5 · 2017-11-14T09:35:30.000-08:00
diff --git a/lib/src/main/java/com/auth0/jwt/creators/ExtendedJwtCreator.java b/lib/src/main/java/com/auth0/jwt/creators/ExtendedJwtCreator.java
@@ -1,4 +1,4 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
@@ -12,7 +12,6 @@ public class ExtendedJwtCreator extends GoogleJwtCreator{
 
     public ExtendedJwtCreator() {
         super();
-        addedClaims.put("Nbf", false);
     }
 
     /**
@@ -23,7 +22,6 @@ public ExtendedJwtCreator() {
      */
     public GoogleJwtCreator withNbf(Date nbf) {
         jwt.withNotBefore(nbf);
-        addedClaims.put("Nbf", true);
         return this;
     }
 
diff --git a/lib/src/main/java/com/auth0/jwt/creators/FbJwtCreator.java b/lib/src/main/java/com/auth0/jwt/creators/FbJwtCreator.java
@@ -1,4 +1,4 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
@@ -24,7 +24,6 @@ public FbJwtCreator() {
         addedClaims = new HashMap<String, Boolean>() {{
             put("UserId", false);
             put("AppId", false);
-            put("Exp", false);
             put("Iat", false);
         }};
         publicClaims = new HashSet<String>() {{
@@ -53,7 +52,6 @@ public FbJwtCreator withIat(Date iat) {
      */
     public FbJwtCreator withExp(Date exp) {
         jwt.withExpiresAt(exp);
-        addedClaims.put("Exp", true);
         return this;
     }
 
diff --git a/lib/src/main/java/com/auth0/jwt/creators/GoogleJwtCreator.java b/lib/src/main/java/com/auth0/jwt/creators/GoogleJwtCreator.java
@@ -1,4 +1,4 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
@@ -27,9 +27,7 @@ public GoogleJwtCreator() {
             put("Picture", false);
             put("Issuer", false);
             put("Subject", false);
-            put("Audience", false);
             put("Iat", false);
-            put("Exp", false);
         }};
         publicClaims = new HashSet<String>() {{
             add(PublicClaims.ISSUER);
@@ -49,7 +47,7 @@ public GoogleJwtCreator() {
      * @param name the Name value.
      * @return this same Builder instance.
      */
-    protected GoogleJwtCreator withName(String name) {
+    public GoogleJwtCreator withName(String name) {
         jwt.withNonStandardClaim("name", name);
         addedClaims.put("Name", true);
         return this;
@@ -61,7 +59,7 @@ protected GoogleJwtCreator withName(String name) {
      * @param email the Email value.
      * @return this same Builder instance.
      */
-    GoogleJwtCreator withEmail(String email) {
+    public GoogleJwtCreator withEmail(String email) {
         jwt.withNonStandardClaim("email", email);
         addedClaims.put("Email", true);
         return this;
@@ -73,7 +71,7 @@ GoogleJwtCreator withEmail(String email) {
      * @param picture the Picture value.
      * @return this same Builder instance.
      */
-    protected GoogleJwtCreator withPicture(String picture) {
+    public GoogleJwtCreator withPicture(String picture) {
         jwt.withNonStandardClaim("picture", picture);
         addedClaims.put("Picture", true);
         return this;
@@ -114,7 +112,6 @@ public GoogleJwtCreator withSubject(String... subject) {
      */
     public GoogleJwtCreator withAudience(String... audience) {
         jwt.withAudience(audience);
-        addedClaims.put("Audience", true);
         return this;
     }
 
@@ -138,7 +135,6 @@ public GoogleJwtCreator withIat(Date iat) {
      */
     public GoogleJwtCreator withExp(Date exp) {
         jwt.withExpiresAt(exp);
-        addedClaims.put("Exp", true);
         return this;
     }
 
diff --git a/lib/src/main/java/com/auth0/jwt/creators/ImplicitJwtCreator.java b/lib/src/main/java/com/auth0/jwt/creators/ImplicitJwtCreator.java
@@ -1,4 +1,4 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
@@ -24,7 +24,6 @@ public ImplicitJwtCreator() {
         addedClaims = new HashMap<String, Boolean>() {{
             put("Issuer", false);
             put("Subject", false);
-            put("Audience", false);
             put("Iat", false);
         }};
         publicClaims = new HashSet<String>() {{
@@ -70,7 +69,6 @@ public ImplicitJwtCreator withSubject(String... subject) {
      */
     public ImplicitJwtCreator withAudience(String... audience) {
         jwt.withAudience(audience);
-        addedClaims.put("Audience", true);
         return this;
     }
 
diff --git a/lib/src/main/java/com/auth0/jwt/creators/JWTCreator.java b/lib/src/main/java/com/auth0/jwt/creators/JWTCreator.java
@@ -1,4 +1,4 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
@@ -48,7 +48,7 @@ private JWTCreator(Algorithm algorithm, Map<String, Object> headerClaims, Map<St
      *
      * @return a JWTCreator.Builder instance to configure.
      */
-    static JWTCreator.Builder init() {
+    public static JWTCreator.Builder init() {
         return new Builder();
     }
 
diff --git a/lib/src/main/java/com/auth0/jwt/creators/ScopedJwtCreator.java b/lib/src/main/java/com/auth0/jwt/creators/ScopedJwtCreator.java
@@ -1,4 +1,4 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
 import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTCreationException;
@@ -25,9 +25,7 @@ public ScopedJwtCreator() {
             put("Scope", false);
             put("Issuer", false);
             put("Subject", false);
-            put("Audience", false);
             put("Iat", false);
-            put("Exp", false);
         }};
         publicClaims = new HashSet<String>() {{
             add(PublicClaims.ISSUER);
@@ -88,7 +86,6 @@ public ScopedJwtCreator withSubject(String... subject) {
      */
     public ScopedJwtCreator withAudience(String... audience) {
         jwt.withAudience(audience);
-        addedClaims.put("Audience", true);
         return this;
     }
 
@@ -112,7 +109,6 @@ public ScopedJwtCreator withIat(Date iat) {
      */
     public ScopedJwtCreator withExp(Date exp) {
         jwt.withExpiresAt(exp);
-        addedClaims.put("Exp", true);
         return this;
     }
 
diff --git a/lib/src/test/java/com/auth0/jwt/creators/ExtendedJwtCreatorTest.java b/lib/src/test/java/com/auth0/jwt/creators/ExtendedJwtCreatorTest.java
@@ -1,6 +1,6 @@
-package com.auth0.jwt;
+package com.auth0.jwt.creators;
 
-import static com.auth0.jwt.GoogleJwtCreatorTest.*;
+import static com.auth0.jwt.creators.GoogleJwtCreatorTest.*;
 import static com.auth0.jwt.TimeUtil.generateRandomExpDateInFuture;
 import static com.auth0.jwt.TimeUtil.generateRandomIatDateInPast;
 import com.auth0.jwt.algorithms.Algorithm;
@@ -166,29 +166,6 @@ public void testExtendedJwtCreatorInvalidName() throws Exception {
         verifyClaims(claims, exp);
     }
 
-    @Test
-    public void testExtendedJwtCreatorNbfNotProvided() throws Exception {
-        thrown.expect(Exception.class);
-        thrown.expectMessage("Standard claim: Nbf has not been set");
-        Algorithm algorithm = Algorithm.HMAC256("secret");
-        String token = ExtendedJwtCreator.build()
-                .withPicture(PICTURE)
-                .withEmail(EMAIL)
-                .withIssuer("accounts.fake.com")
-                .withSubject("subject")
-                .withAudience("audience")
-                .withExp(exp)
-                .withIat(iat)
-                .withName(NAME)
-                .sign(algorithm);
-        GoogleVerification verification = ExtendedJWT.require(algorithm);
-        JWT verifier = verification.createVerifierForExtended(PICTURE, EMAIL, asList("accounts.fake.com"), asList("audience"),
-                NAME, 1, 1, 1).build();
-        DecodedJWT jwt = verifier.decode(token);
-        Map<String, Claim> claims = jwt.getClaims();
-        verifyClaims(claims, exp);
-    }
-
     @Test
     public void testExtendedJwtCreatorNoneAlgorithmNotAllowed() throws Exception {
         thrown.expect(IllegalAccessException.class);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.auth0.jwt;`
	`1`	`+package com.auth0.jwt.creators;`
`2`	`2`
`3`	`3`	`import com.auth0.jwt.algorithms.Algorithm;`
`4`	`4`	`import com.auth0.jwt.exceptions.JWTCreationException;`
`@@ -48,7 +48,7 @@ private JWTCreator(Algorithm algorithm, Map<String, Object> headerClaims, Map<St`
`48`	`48`	`*`
`49`	`49`	`* @return a JWTCreator.Builder instance to configure.`
`50`	`50`	`*/`
`51`		`- static JWTCreator.Builder init() {`
	`51`	`+ public static JWTCreator.Builder init() {`
`52`	`52`	`return new Builder();`
`53`	`53`	`}`
`54`	`54`