Update URLs and allow Activities fetch by default

skimbrel · skimbrel · commit af5afd3f8a3f · 2015-02-18T10:56:37.000-08:00
diff --git a/src/main/java/com/twilio/sdk/taskrouter/TaskRouterCapability.java b/src/main/java/com/twilio/sdk/taskrouter/TaskRouterCapability.java
@@ -38,6 +38,7 @@ public TaskRouterCapability(final String accountSid, final String authToken, fin
 		this.workerSid = workerSid;
 		this.policies = new ArrayList<Policy>();
 		addEventBridgePolicies();
+		allowActivityListFetch();
 	}
 
 	/**
@@ -112,7 +113,7 @@ public String generateToken(long ttl) throws DomainException {
 	}
 
 	private String getWorkspaceUrl() {
-		return TASKROUTER_BASE_URL + "/" + TASKROUTER_VERSION + "/Accounts/" + accountSid + "/Workspaces/" + workspaceSid;
+		return TASKROUTER_BASE_URL + "/" + TASKROUTER_VERSION + "/Workspaces/" + workspaceSid;
 	}
 
 	private String getWorkerUrl() {
@@ -126,6 +127,11 @@ private void addEventBridgePolicies() {
 		addPolicy(new Policy(eventBridgeUrl, "POST", true));
 	}
 
+	private void allowActivityListFetch() {
+		String url = getWorkspaceUrl() + "/Activities";
+		addPolicy(new Policy(url, "GET", true));
+	}
+
 	public class Policy implements JSONAware {
 		private String url;
 		private String method;
diff --git a/src/test/java/com/twilio/sdk/taskrouter/TaskRouterCapabilityTest.java b/src/test/java/com/twilio/sdk/taskrouter/TaskRouterCapabilityTest.java
@@ -11,6 +11,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class TaskRouterCapabilityTest {
 
@@ -34,15 +35,19 @@ public void testGenerateToken() throws Exception {
 		assertEquals("v1", o.get("version"));
 		assertEquals("WS456", o.get("workspace_sid"));
 		JSONArray policies = (JSONArray) o.get("policies");
-		assertEquals(3, policies.size());
+		assertEquals(4, policies.size());
 		JSONObject p = (JSONObject) policies.get(0);
 		assertEquals("https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", p.get("url"));
 		assertEquals("GET", p.get("method"));
 		p = (JSONObject) policies.get(1);
 		assertEquals("https://event-bridge.twilio.com/v1/wschannels/AC123/WK789", p.get("url"));
 		assertEquals("POST", p.get("method"));
 		p = (JSONObject) policies.get(2);
-		assertEquals("https://taskrouter.twilio.com/v1/Accounts/AC123/Workspaces/WS456/Workers/WK789", p.get("url"));
+		assertEquals("https://taskrouter.twilio.com/v1/Workspaces/WS456/Activities", p.get("url"));
+		assertEquals("GET", p.get("method"));
+		assertTrue((Boolean)p.get("allow"));
+		p = (JSONObject) policies.get(3);
+		assertEquals("https://taskrouter.twilio.com/v1/Workspaces/WS456/Workers/WK789", p.get("url"));
 		assertEquals("POST", p.get("method"));
 		JSONObject filters = (JSONObject) p.get("post_filter");
 		assertEquals(1, filters.size());

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public TaskRouterCapability(final String accountSid, final String authToken, fin`
`38`	`38`	`this.workerSid = workerSid;`
`39`	`39`	`this.policies = new ArrayList<Policy>();`
`40`	`40`	`addEventBridgePolicies();`
	`41`	`+ allowActivityListFetch();`
`41`	`42`	`}`
`42`	`43`
`43`	`44`	`/**`
`@@ -112,7 +113,7 @@ public String generateToken(long ttl) throws DomainException {`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`private String getWorkspaceUrl() {`
`115`		`- return TASKROUTER_BASE_URL + "/" + TASKROUTER_VERSION + "/Accounts/" + accountSid + "/Workspaces/" + workspaceSid;`
	`116`	`+ return TASKROUTER_BASE_URL + "/" + TASKROUTER_VERSION + "/Workspaces/" + workspaceSid;`
`116`	`117`	`}`
`117`	`118`
`118`	`119`	`private String getWorkerUrl() {`
`@@ -126,6 +127,11 @@ private void addEventBridgePolicies() {`
`126`	`127`	`addPolicy(new Policy(eventBridgeUrl, "POST", true));`
`127`	`128`	`}`
`128`	`129`
	`130`	`+ private void allowActivityListFetch() {`
	`131`	`+ String url = getWorkspaceUrl() + "/Activities";`
	`132`	`+ addPolicy(new Policy(url, "GET", true));`
	`133`	`+ }`
	`134`	`+`
`129`	`135`	`public class Policy implements JSONAware {`
`130`	`136`	`private String url;`
`131`	`137`	`private String method;`