Fix twilio-java helper lib policies

Author: jwitz10

src/main/java/com/twilio/jwt/taskrouter/FilterRequirement.java

@@ -1,5 +1,8 @@
 package com.twilio.jwt.taskrouter;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum FilterRequirement {
     REQUIRED(true),
     OPTIONAL(false);

src/main/java/com/twilio/jwt/taskrouter/Policy.java

@@ -27,11 +27,9 @@ public class Policy {
     private final HttpMethod method;
 
     @JsonProperty("query_filter")
-    @JsonSerialize(using = FilterRequirementSerializer.class)
     private final Map<String, FilterRequirement> queryFilter;
 
     @JsonProperty("post_filter")
-    @JsonSerialize(using = FilterRequirementSerializer.class)
     private final Map<String, FilterRequirement> postFilter;
 
     @JsonProperty("allow")
@@ -149,19 +147,4 @@ public Policy build() {
             return new Policy(this);
         }
     }
-
-    private static class FilterRequirementSerializer extends JsonSerializer<Map<String, FilterRequirement>> {
-        @Override
-        public void serialize(
-            Map<String, FilterRequirement> stringFilterRequirementMap, 
-            JsonGenerator jsonGenerator, 
-            SerializerProvider serializerProvider
-        ) throws IOException, JsonProcessingException {
-            for (Map.Entry<String, FilterRequirement> entry : stringFilterRequirementMap.entrySet()) {
-                jsonGenerator.writeObjectFieldStart(entry.getKey());
-                jsonGenerator.writeBooleanField("required", entry.getValue().value());
-                jsonGenerator.writeEndObject();
-            }
-        }
-    }
 }

src/main/java/com/twilio/jwt/taskrouter/TaskRouterCapability.java

@@ -49,7 +49,7 @@ public Map<String, Object> getClaims() {
         payload.put("account_sid", this.accountSid);
         payload.put("friendly_name", this.friendlyName);
         payload.put("workspace_sid", this.workspaceSid);
-        payload.put("channel_id", this.channelId);
+        payload.put("channel", this.channelId);
 
         if (channelId.startsWith("WK")) {
             payload.put("worker_sid", this.channelId);

src/test/java/com/twilio/jwt/taskrouter/TaskRouterCapabilityTest.java

@@ -1,14 +1,19 @@
 package com.twilio.jwt.taskrouter;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import com.google.common.collect.Lists;
+import com.twilio.http.HttpMethod;
 import com.twilio.jwt.Jwt;
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.Date;
-import java.util.List;
 
 /**
  * Test class for {@link TaskRouterCapability}.
@@ -17,16 +22,16 @@ public class TaskRouterCapabilityTest {
 
     private static final String ACCOUNT_SID = "AC123";
     private static final String AUTH_TOKEN = "secret";
-    private static final String WORKSPACE_SID = "WK123";
-    private static final String CHANNEL_ID = "CH123";
+    private static final String WORKSPACE_SID = "WS123";
+    private static final String WORKER_SID = "WK123";
 
     @Test
     public void testToken() {
         List<Policy> policies = Lists.newArrayList(
             new Policy.Builder().url(UrlUtils.workspaces()).build()
         );
-        Jwt jwt =
-            new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, CHANNEL_ID)
+        final Jwt jwt =
+                new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, WORKER_SID)
                 .policies(policies)
                 .build();
         Claims claims =
@@ -36,9 +41,56 @@ public void testToken() {
                 .getBody();
 
         Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid"));
-        Assert.assertEquals(CHANNEL_ID, claims.get("channel_id"));
+        Assert.assertEquals(WORKER_SID, claims.get("channel"));
         Assert.assertEquals(ACCOUNT_SID, claims.get("account_sid"));
         Assert.assertEquals(ACCOUNT_SID, claims.getIssuer());
         Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime());
     }
+
+    @Test
+    public void testWorkerToken() {
+        final List<Policy> policies = PolicyUtils.defaultWorkerPolicies(WORKSPACE_SID, WORKER_SID);
+
+        final Map<String, FilterRequirement> activityUpdateFilter = new HashMap<>();
+        activityUpdateFilter.put("ActivitySid", FilterRequirement.REQUIRED);
+
+        final Policy allowActivityUpdates = new Policy.Builder()
+                .url(UrlUtils.worker(WORKSPACE_SID, WORKER_SID))
+                .method(HttpMethod.POST)
+                .postFilter(activityUpdateFilter).build();
+
+        final Policy allowTasksUpdate = new Policy.Builder()
+                .url(UrlUtils.allTasks(WORKER_SID))
+                .method(HttpMethod.POST)
+                .build();
+
+        final Policy allowReservationUpdate = new Policy.Builder()
+                .url(UrlUtils.allReservations(WORKSPACE_SID, WORKER_SID))
+                .method(HttpMethod.POST)
+                .build();
+
+        policies.add(allowActivityUpdates);
+        policies.add(allowTasksUpdate);
+        policies.add(allowReservationUpdate);
+
+        final Jwt jwt =
+                new TaskRouterCapability.Builder(ACCOUNT_SID, AUTH_TOKEN, WORKSPACE_SID, WORKER_SID)
+                        .policies(policies)
+                        .build();
+        final Claims claims =
+                Jwts.parser()
+                        .setSigningKey(AUTH_TOKEN.getBytes())
+                        .parseClaimsJws(jwt.toJwt())
+                        .getBody();
+
+        Assert.assertEquals(WORKSPACE_SID, claims.get("workspace_sid"));
+        Assert.assertEquals(WORKER_SID, claims.get("channel"));
+        Assert.assertEquals(ACCOUNT_SID, claims.get("account_sid"));
+        Assert.assertEquals(ACCOUNT_SID, claims.getIssuer());
+        Assert.assertTrue(claims.getExpiration().getTime() > new Date().getTime());
+
+        final List<Policy> claimedPolicies = (List<Policy>) claims.get("policies");
+        final int connectionPolicies = 2;
+        Assert.assertEquals(policies.size() + connectionPolicies, claimedPolicies.size());
+    }
 }