Rename AuthToken. Add url parameter.

Author: Amir Tocker

…ain/java/com/cloudinary/AkamaiToken.java …/main/java/com/cloudinary/AuthToken.javacloudinary-core/src/main/java/com/cloudinary/AkamaiToken.java renamed to cloudinary-core/src/main/java/com/cloudinary/AuthToken.java cloudinary-core/src/main/java/com/cloudinary/AkamaiToken.java renamed to cloudinary-core/src/main/java/com/cloudinary/AuthToken.java

@@ -12,9 +12,9 @@
 import java.util.TimeZone;
 
 /**
- * Token generator for Akamai authentication
+ * Authentication Token generator
  */
-public class AkamaiToken {
+public class AuthToken {
     public String tokenName = Cloudinary.AKAMAI_TOKEN_NAME;
     public String key;
     public long startTime;
@@ -23,11 +23,11 @@ public class AkamaiToken {
     public String acl;
     public long window;
 
-    public AkamaiToken(String key) {
+    public AuthToken(String key) {
         this.key = key;
     }
 
-    public AkamaiToken setTokenName(String tokenName) {
+    public AuthToken setTokenName(String tokenName) {
         this.tokenName = tokenName;
         return this;
     }
@@ -38,7 +38,7 @@ public AkamaiToken setTokenName(String tokenName) {
      * @param startTime in seconds since epoch
      * @return
      */
-    public AkamaiToken setStartTime(long startTime) {
+    public AuthToken setStartTime(long startTime) {
         this.startTime = startTime;
         return this;
     }
@@ -49,17 +49,17 @@ public AkamaiToken setStartTime(long startTime) {
      * @param endTime in seconds since epoch
      * @return
      */
-    public AkamaiToken setEndTime(long endTime) {
+    public AuthToken setEndTime(long endTime) {
         this.endTime = endTime;
         return this;
     }
 
-    public AkamaiToken setIp(String ip) {
+    public AuthToken setIp(String ip) {
         this.ip = ip;
         return this;
     }
 
-    public AkamaiToken setAcl(String acl) {
+    public AuthToken setAcl(String acl) {
         this.acl = acl;
         return this;
     }
@@ -71,7 +71,7 @@ public AkamaiToken setAcl(String acl) {
      * @param window
      * @return
      */
-    public AkamaiToken setWindow(long window) {
+    public AuthToken setWindow(long window) {
         this.window = window;
         return this;
     }
@@ -82,6 +82,10 @@ public AkamaiToken setWindow(long window) {
      * @return a signed token
      */
     public String generate() {
+        return generate(null);
+    }
+
+    public String generate(String url) {
         long expiration = endTime;
         if (expiration == 0) {
             if (window > 0) {
@@ -99,12 +103,18 @@ public String generate() {
             tokenParts.add("st=" + startTime);
         }
         tokenParts.add("exp=" + expiration);
-        tokenParts.add("acl=" + acl);
+        if (url != null) {
+            tokenParts.add("url=" + url);
+        } else if (acl != null) {
+            tokenParts.add("acl=" + acl);
+        } else {
+            throw new IllegalArgumentException("Must provide either url or acl");
+        }
         String auth = digest(StringUtils.join(tokenParts, "~"));
         tokenParts.add("hmac=" + auth);
         return tokenName + "=" + StringUtils.join(tokenParts, "~");
-    }
 
+    }
 
     private String digest(String message) {
         byte[] binKey = DatatypeConverter.parseHexBinary(key);

…java/com/cloudinary/AkamaiTokenTest.java …t/java/com/cloudinary/AuthTokenTest.javacloudinary-core/src/test/java/com/cloudinary/AkamaiTokenTest.java renamed to cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java cloudinary-core/src/test/java/com/cloudinary/AkamaiTokenTest.java renamed to cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java

@@ -10,12 +10,12 @@
 
 import static org.junit.Assert.*;
 
-public class AkamaiTokenTest {
+public class AuthTokenTest {
     public static final String KEY = "00112233FF99";
 
     @Test
     public void generateWithStartAndWindow() throws Exception {
-        AkamaiToken t = new AkamaiToken(KEY);
+        AuthToken t = new AuthToken(KEY);
         t.setStartTime(1111111111).setAcl("/image/*").setWindow(300);
         assertEquals("should generate an Akamai token with startTime and window", "__cld_token__=st=1111111111~exp=1111111411~acl=/image/*~hmac=0854e8b6b6a46471a80b2dc28c69bd352d977a67d031755cc6f3486c121b43af", t.generate());
     }
@@ -24,7 +24,7 @@ public void generateWithStartAndWindow() throws Exception {
     public void generateWithWindow() throws Exception {
         long firstExp = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() / 1000L + 300;
         Thread.sleep(1200);
-        String token = new AkamaiToken(KEY).setAcl("*").setWindow(300).generate();
+        String token = new AuthToken(KEY).setAcl("*").setWindow(300).generate();
         Thread.sleep(1200);
         long secondExp = Calendar.getInstance(TimeZone.getTimeZone("UTC")).getTimeInMillis() / 1000L + 300;
         Matcher m = Pattern.compile("exp=(\\d+)").matcher(token);
@@ -33,12 +33,12 @@ public void generateWithWindow() throws Exception {
         final long actual = Long.parseLong(expString);
         assertThat(actual, Matchers.greaterThanOrEqualTo(firstExp));
         assertThat(actual, Matchers.lessThanOrEqualTo(secondExp));
-        assertEquals(token, new AkamaiToken(KEY).setAcl("*").setEndTime(actual).generate());
+        assertEquals(token, new AuthToken(KEY).setAcl("*").setEndTime(actual).generate());
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testMustProvideEndTimeOrWindow(){
-        new AkamaiToken(KEY).setAcl("*").generate();
+        new AuthToken(KEY).setAcl("*").generate();
     }