Skip to content

Commit ab6ab3a

Browse files
nitzanjtocker
authored andcommitted
Add expired_at to private download. (#60)
1 parent 5b0cc2a commit ab6ab3a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ public String privateDownload(String publicId, String format, Map<String, Object
172172
params.put("format", format);
173173
params.put("attachment", options.get("attachment"));
174174
params.put("type", options.get("type"));
175+
params.put("expires_at", options.get("expires_at"));
175176
params.put("timestamp", Util.timestamp());
176177
signRequest(params, options);
177178
return buildUrl(cloudinaryApiUrl("download", options), params);

cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.net.URI;
2020
import java.net.URLDecoder;
2121
import java.util.Arrays;
22+
import java.util.Collections;
2223
import java.util.HashMap;
2324
import java.util.Map;
2425
import java.util.regex.Matcher;
@@ -519,12 +520,14 @@ public void testShorten() {
519520
@SuppressWarnings("unchecked")
520521
@Test
521522
public void testPrivateDownload() throws Exception {
522-
String url = cloudinary.privateDownload("imgÿ=&é", "jpg", emptyMap());
523+
long inTwentyMinutes = System.currentTimeMillis() / 1000 + 20 * 60;
524+
String url = cloudinary.privateDownload("imgÿ=&é", "jpg", Collections.<String, Object>singletonMap("expires_at", inTwentyMinutes));
523525
URI uri = new URI(url);
524526
Map<String, String> parameters = getUrlParameters(uri);
525527
assertEquals("imgÿ=&é", parameters.get("public_id"));
526528
assertEquals("jpg", parameters.get("format"));
527529
assertEquals("a", parameters.get("api_key"));
530+
assertEquals(String.valueOf(inTwentyMinutes), parameters.get("expires_at"));
528531
assertEquals("/v1_1/test123/image/download", uri.getPath());
529532
}
530533

0 commit comments

Comments
 (0)