Skip to content

Commit fb3937a

Browse files
committed
added fix for signed url issue 25
1 parent 8a5f142 commit fb3937a

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

imagekit-sdk/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
group 'io.imagekit.sdk'
7-
version '2.0.0'
7+
version '2.0.1'
88

99
sourceCompatibility = 1.8
1010

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package io.imagekit.sdk.constants;
22

33
public class Version {
4-
public static final String VERSION_CODE="java-2.0.0";
4+
public static final String VERSION_CODE="java-2.0.1";
55
}

imagekit-sdk/src/main/java/io/imagekit/sdk/tasks/UrlGen.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ private static String buildFullUrl(String src, Map<String, String> queryParamete
124124
List<Map<String, String>> transformation, String transformationPosition, boolean signed, long expireSeconds,
125125
String privateKey, String urlEndpoint) {
126126
StringBuilder tr = new StringBuilder("");
127-
if (transformation.size() > 0) {
127+
if (transformation != null && transformation.size() > 0) {
128128
tr.append("tr=");
129129
for (Map<String, String> map : transformation) {
130130
Set<Map.Entry<String, String>> entries = map.entrySet();
@@ -193,10 +193,10 @@ private static void sign(String urlEndpoint, long expireSeconds, String privateK
193193
expiryTimestamp = ((Calendar.getInstance().getTimeInMillis() / 1000) + expireSeconds);
194194
}
195195
String signature = signUrl(privateKey, tmpUri.toString(), urlEndpoint, expiryTimestamp);
196-
queryMaker.put("ik-s=" + signature);
197196
if (expiryTimestamp > 0 && expiryTimestamp != DEFAULT_TIMESTAMP) {
198197
queryMaker.put("ik-t=" + expiryTimestamp);
199198
}
199+
queryMaker.put("ik-s=" + signature);
200200
}
201201

202202
public static String signUrl(String privateKey, String url, String urlEndpoint, long expiryTimestamp) {

imagekit-sdk/src/test/java/io/imagekit/sdk/GetUrlTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.junit.Assert.assertTrue;
2121

2222
public class GetUrlTest {
23-
private static final Pattern IMAGEKIT_SIGNED_URL_PATTERN = Pattern.compile("(https://.*)\\?ik-s=(.*)&ik-t=(.*)");
23+
private static final Pattern IMAGEKIT_SIGNED_URL_PATTERN = Pattern.compile("(https://.*)\\?ik-t=(.*)&ik-s=(.*)");
2424
private ImageKit SUT;
2525

2626
@Before
@@ -460,7 +460,6 @@ public void getUrl_with_signature() {
460460
public void getUrl_with_signature_src_noTransform() {
461461
Map<String, Object> options = new HashMap<>();
462462
options.put("src", "https://ik.imagekit.io/your_imagekit_id/endpoint/default-image.jpg");
463-
options.put("transformation", Collections.emptyList());
464463
options.put("signed", true);
465464
options.put("expireSeconds", 1000);
466465

0 commit comments

Comments
 (0)