feat: Regional support for access token (#602)

Co-authored-by: Elise Shanholtz <[email protected]>

Author: charliesantos

src/main/java/com/twilio/jwt/accesstoken/AccessToken.java

@@ -27,6 +27,7 @@ public class AccessToken extends Jwt {
     private final String id;
     private final String accountSid;
     private final String identity;
+    private final String region;
     private final Date nbf;
     private final Set<Grant> grants;
 
@@ -42,6 +43,7 @@ private AccessToken(Builder b) {
         this.id = b.keySid + "-" + (int)(Math.floor(now.getTime() / 1000.0f));
         this.accountSid = b.accountSid;
         this.identity = b.identity;
+        this.region = b.region;
         this.nbf = b.nbf;
         this.grants = Collections.unmodifiableSet(b.grants);
     }
@@ -65,6 +67,9 @@ public String getSubject() {
     public Map<String, Object> getHeaders() {
         Map<String, Object> headers = new HashMap<>();
         headers.put("cty", CTY);
+        if (this.region != null && !"".equals(this.region)) {
+            headers.put("twr", this.region);
+        }
         return headers;
     }
 
@@ -91,6 +96,7 @@ public static class Builder {
         private String keySid;
         private String secret;
         private String identity;
+        private String region;
         private Date nbf = null;
         private int ttl = 3600;
         private Set<Grant> grants = new HashSet<Grant>();
@@ -113,6 +119,11 @@ public Builder identity(String identity) {
             return this;
         }
 
+        public Builder region(String region) {
+          this.region = region;
+          return this;
+        }
+
         public Builder ttl(int ttl) {
             this.ttl = ttl;
             return this;

src/test/java/com/twilio/jwt/accesstoken/AccessTokenTest.java

@@ -2,6 +2,7 @@
 
 import com.twilio.jwt.Jwt;
 import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.JwsHeader;
 import io.jsonwebtoken.Jwts;
 import org.junit.Assert;
 import org.junit.Test;
@@ -93,6 +94,32 @@ public void testOptionalValues() {
         Assert.assertTrue(claims.getNotBefore().getTime() <= new Date().getTime());
     }
 
+    @Test
+    public void testRegion() {
+        Jwt token = new AccessToken.Builder(ACCOUNT_SID, SIGNING_KEY_SID, SECRET)
+          .region("foo")
+          .build();
+
+        JwsHeader header = Jwts.parser()
+            .setSigningKey(SECRET.getBytes())
+            .parseClaimsJws(token.toJwt())
+            .getHeader();
+
+        Assert.assertEquals("foo", header.get("twr"));
+    }
+
+    @Test
+    public void testEmptyRegion() {
+        Jwt token = new AccessToken.Builder(ACCOUNT_SID, SIGNING_KEY_SID, SECRET).build();
+
+        JwsHeader header = Jwts.parser()
+            .setSigningKey(SECRET.getBytes())
+            .parseClaimsJws(token.toJwt())
+            .getHeader();
+
+        Assert.assertEquals(null, header.get("twr"));
+    }
+
     @Test
     public void testVideoGrant() {
         VideoGrant cg = new VideoGrant().setRoom("RM123");