Merge branch 'next-gen' of https://github.com/twilio/twilio-java into next-gen

Author: jingming

pom.xml

@@ -7,7 +7,7 @@
   <artifactId>twilio</artifactId>
   <packaging>jar</packaging>
   <name>twilio</name>
-  <version>7.0.0-rc-23-SNAPSHOT</version>
+  <version>7.0.0-rc-25-SNAPSHOT</version>
   <description>Release Candidate for Next-Gen Twilio Java Helper Library</description>
   <url>https://www.twilio.com</url>
   <licenses>

src/main/java/com/twilio/Twilio.java

@@ -12,7 +12,7 @@
  */
 public class Twilio {
 
-    public static final String VERSION = "7.0.0-rc-22";
+    public static final String VERSION = "7.0.0-rc-24";
     public static final String JAVA_VERSION = System.getProperty("java.version");
 
     private static String username;

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

@@ -12,7 +12,7 @@
  */
 public class ConversationsGrant implements Grant {
 
-    public String configurationProfileSid;
+    private String configurationProfileSid;
 
     public String getConfigurationProfileSid() {
         return configurationProfileSid;

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

@@ -0,0 +1,85 @@
+package com.twilio.jwt.accesstoken;
+
+import com.google.common.base.Strings;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Grant used to access Twilio Conversations.
+ *
+ * <p>
+ *     For more information see:
+ *     <a href="https://www.twilio.com/docs/api/rest/access-tokens">
+ *         https://www.twilio.com/docs/api/rest/access-tokens
+ *     </a>
+ * </p>
+ */
+public class VoiceGrant implements Grant {
+
+    private String outgoingApplicationSid;
+    private Map<String, Object> outgoingApplicationParams;
+    private String pushCredentialSid;
+    private String endpointId;
+
+    public VoiceGrant setOutgoingApplicationSid(String outgoingApplicationSid) {
+        this.outgoingApplicationSid = outgoingApplicationSid;
+        return this;
+    }
+
+    public VoiceGrant setOutgoingApplication(
+        String outgoingApplicationSid,
+        Map<String, Object> outgoingApplicationParams
+    ) {
+        this.outgoingApplicationSid = outgoingApplicationSid;
+        this.outgoingApplicationParams = outgoingApplicationParams;
+        return this;
+    }
+
+    public VoiceGrant setPushCredentialSid(String pushCredentialSid) {
+        this.pushCredentialSid = pushCredentialSid;
+        return this;
+    }
+
+    public VoiceGrant setEndpointId(String endpointId) {
+        this.endpointId = endpointId;
+        return this;
+    }
+
+    @Override
+    public String getGrantKey() {
+        return "voice";
+    }
+
+    @Override
+    public Object getPayload() {
+        return new Payload(this);
+    }
+
+    @SuppressWarnings("checkstyle:membername")
+    public class Payload {
+        public Map<String, Object> outgoing;
+        public String push_credential_sid;
+        public String endpoint_id;
+
+        public Payload(VoiceGrant grant) {
+            if (!Strings.isNullOrEmpty(grant.outgoingApplicationSid)) {
+                this.outgoing = new HashMap<>();
+                this.outgoing.put("application_sid", grant.outgoingApplicationSid);
+
+                if (grant.outgoingApplicationParams != null) {
+                    this.outgoing.put("params", grant.outgoingApplicationParams);
+                }
+            }
+
+            if (!Strings.isNullOrEmpty(grant.pushCredentialSid)) {
+                this.push_credential_sid = grant.pushCredentialSid;
+            }
+
+            if (!Strings.isNullOrEmpty(grant.endpointId)) {
+                this.endpoint_id = grant.endpointId;
+            }
+        }
+    }
+
+}

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

@@ -7,6 +7,7 @@
 import org.junit.Test;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -181,4 +182,33 @@ public void testCompleteToken() {
         Assert.assertEquals("CP123", cGrant.get("configuration_profile_sid"));
     }
 
+    @Test
+    public void testVoiceToken() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("foo", "bar");
+
+        VoiceGrant pvg = new VoiceGrant()
+            .setOutgoingApplication("AP123", params);
+
+        Jwt token =
+            new AccessToken.Builder(ACCOUNT_SID, SIGNING_KEY_SID, SECRET)
+                .grant(pvg)
+                .build();
+
+        Claims claims =
+            Jwts.parser()
+                .setSigningKey(SECRET.getBytes())
+                .parseClaimsJws(token.toJwt())
+                .getBody();
+
+        validateToken(claims);
+        Map<String, Object> decodedGrants = (Map<String, Object>) claims.get("grants");
+        Assert.assertEquals(1, decodedGrants.size());
+
+        Map<String, Object> pvgGrant = (Map<String, Object>) decodedGrants.get("voice");
+        Map<String, Object> outgoing = (Map<String, Object>) pvgGrant.get("outgoing");
+        Map<String, Object> outgoingParams = (Map<String, Object>) outgoing.get("params");
+        Assert.assertEquals("AP123", outgoing.get("application_sid"));
+        Assert.assertEquals("bar", outgoingParams.get("foo"));
+    }
 }