Skip to content

Commit 5553c36

Browse files
adimiz1adimiz1
authored
Implement major version requirements
1 parent f4c5743 commit 5553c36

File tree

6 files changed

+80
-77
lines changed

6 files changed

+80
-77
lines changed

‎cloudinary-core/src/main/java/com/cloudinary/Configuration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void update(Map config) {
114114
this.apiSecret = (String) config.get("api_secret");
115115
this.secureDistribution = (String) config.get("secure_distribution");
116116
this.cname = (String) config.get("cname");
117-
this.secure = ObjectUtils.asBoolean(config.get("secure"), false);
117+
this.secure = ObjectUtils.asBoolean(config.get("secure"), true);
118118
this.privateCdn = ObjectUtils.asBoolean(config.get("private_cdn"), false);
119119
this.cdnSubdomain = ObjectUtils.asBoolean(config.get("cdn_subdomain"), false);
120120
this.shorten = ObjectUtils.asBoolean(config.get("shorten"), false);
@@ -128,7 +128,7 @@ public void update(Map config) {
128128
this.loadStrategies = ObjectUtils.asBoolean(config.get("load_strategies"), true);
129129
this.timeout = ObjectUtils.asInteger(config.get("timeout"), 0);
130130
this.clientHints = ObjectUtils.asBoolean(config.get("client_hints"), false);
131-
this.analytics = ObjectUtils.asBoolean(config.get("analytics"), null);
131+
this.analytics = ObjectUtils.asBoolean(config.get("analytics"), true);
132132
Map tokenMap = (Map) config.get("auth_token");
133133
if (tokenMap != null) {
134134
this.authToken = new AuthToken(tokenMap);

‎cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class AuthTokenTest {
3232
@Before
3333
public void setUp() {
3434
System.out.println("Running " + this.getClass().getName() + "." + currentTest.getMethodName());
35-
this.cloudinary = new Cloudinary("cloudinary://a:b@test123?load_strategies=false");
35+
this.cloudinary = new Cloudinary("cloudinary://a:b@test123?load_strategies=false&analytics=false");
3636
final AuthToken authToken = new AuthToken(KEY).duration(300);
3737
authToken.startTime(11111111); // start time is set for test purposes
3838
cloudinary.config.authToken = authToken;
@@ -74,28 +74,28 @@ public void testAuthenticatedUrl() {
7474

7575
String message = "should add token if authToken is globally set and signed = true";
7676
String url = cloudinary.url().signed(true).resourceType("image").type("authenticated").version("1486020273").generate("sample.jpg");
77-
assertEquals(message,"http://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=8db0d753ee7bbb9e2eaf8698ca3797436ba4c20e31f44527e43b6a6e995cfdb3", url);
77+
assertEquals(message,"https://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=8db0d753ee7bbb9e2eaf8698ca3797436ba4c20e31f44527e43b6a6e995cfdb3", url);
7878

7979
message = "should add token for 'public' resource";
8080
url = cloudinary.url().signed(true).resourceType("image").type("public").version("1486020273").generate("sample.jpg");
81-
assertEquals(message,"http://test123-res.cloudinary.com/image/public/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=c2b77d9f81be6d89b5d0ebc67b671557e88a40bcf03dd4a6997ff4b994ceb80e", url);
81+
assertEquals(message,"https://test123-res.cloudinary.com/image/public/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=c2b77d9f81be6d89b5d0ebc67b671557e88a40bcf03dd4a6997ff4b994ceb80e", url);
8282

8383
message = "should not add token if signed is false";
8484
url = cloudinary.url().resourceType("image").type("authenticated").version("1486020273").generate("sample.jpg");
85-
assertEquals(message,"http://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg", url);
85+
assertEquals(message,"https://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg", url);
8686

8787
message = "should not add token if authToken is globally set but null auth token is explicitly set and signed = true";
8888
url = cloudinary.url().authToken(AuthToken.NULL_AUTH_TOKEN).signed(true).resourceType("image").type("authenticated").version("1486020273").generate("sample.jpg");
89-
assertEquals(message,"http://test123-res.cloudinary.com/image/authenticated/s--v2fTPYTu--/v1486020273/sample.jpg", url);
89+
assertEquals(message,"https://test123-res.cloudinary.com/image/authenticated/s--v2fTPYTu--/v1486020273/sample.jpg", url);
9090

9191
message = "explicit authToken should override global setting";
9292
url = cloudinary.url().signed(true).authToken(new AuthToken(ALT_KEY).startTime(222222222).duration(100)).resourceType("image").type("authenticated").transformation(new Transformation().crop("scale").width(300)).generate("sample.jpg");
93-
assertEquals(message,"http://test123-res.cloudinary.com/image/authenticated/c_scale,w_300/sample.jpg?__cld_token__=st=222222222~exp=222222322~hmac=55cfe516530461213fe3b3606014533b1eca8ff60aeab79d1bb84c9322eebc1f", url);
93+
assertEquals(message,"https://test123-res.cloudinary.com/image/authenticated/c_scale,w_300/sample.jpg?__cld_token__=st=222222222~exp=222222322~hmac=55cfe516530461213fe3b3606014533b1eca8ff60aeab79d1bb84c9322eebc1f", url);
9494

9595
message = "should compute expiration as start time + duration";
9696
url = cloudinary.url().signed(true).authToken(new AuthToken().startTime(11111111).duration(300))
9797
.type("authenticated").version("1486020273").generate("sample.jpg");
98-
assertEquals(message,"http://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=8db0d753ee7bbb9e2eaf8698ca3797436ba4c20e31f44527e43b6a6e995cfdb3", url);
98+
assertEquals(message,"https://test123-res.cloudinary.com/image/authenticated/v1486020273/sample.jpg?__cld_token__=st=11111111~exp=11111411~hmac=8db0d753ee7bbb9e2eaf8698ca3797436ba4c20e31f44527e43b6a6e995cfdb3", url);
9999

100100
}
101101

@@ -120,7 +120,7 @@ public void testTokenGeneration(){
120120
public void testUrlInTag() {
121121
String message = "should add token to an image tag url";
122122
String url = cloudinary.url().signed(true).resourceType("image").type("authenticated").version("1486020273").imageTag("sample.jpg");
123-
assertThat(url, Matchers.matchesPattern("<img.*src='http://res.cloudinary.com/test123/image/authenticated/v1486020273/sample.jpg\\?__cld_token__=st=11111111~exp=11111411~hmac=9bd6f41e2a5893da8343dc8eb648de8bf73771993a6d1457d49851250caf3b80.*>"));
123+
assertThat(url, Matchers.matchesPattern("<img.*src='https://res.cloudinary.com/test123/image/authenticated/v1486020273/sample.jpg\\?__cld_token__=st=11111111~exp=11111411~hmac=9bd6f41e2a5893da8343dc8eb648de8bf73771993a6d1457d49851250caf3b80.*>"));
124124

125125
}
126126

‎cloudinary-core/src/test/java/com/cloudinary/analytics/AnalyticsTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,28 @@ public void testUrlWithAnalytics() {
6565
cloudinary.config.analytics = true;
6666
cloudinary.setAnalytics(new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0", "0"));
6767
String url = cloudinary.url().generate("test");
68-
Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=DAFAACMhZBi0");
68+
Assert.assertEquals(url, "https://res.cloudinary.com/test123/image/upload/test?_a=DAFAACMhZBi0");
6969
}
7070

7171
@Test
7272
public void testUrlWithNoAnalytics() {
73-
String url = cloudinary.url().generate("test");
74-
Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
73+
cloudinary.config.analytics = false;
74+
String url = cloudinary.url().secure(true).generate("test");
75+
Assert.assertEquals(url, "https://res.cloudinary.com/test123/image/upload/test");
7576
}
7677

7778
@Test
7879
public void testUrlWithNoAnalyticsDefined() {
7980
cloudinary.config.analytics = false;
8081
String url = cloudinary.url().generate("test");
81-
Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
82+
Assert.assertEquals(url, "https://res.cloudinary.com/test123/image/upload/test");
8283
}
8384

8485
@Test
8586
public void testUrlWithNoAnalyticsNull() {
87+
cloudinary.config.analytics = false;
8688
String url = cloudinary.url().generate("test");
87-
Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
89+
Assert.assertEquals(url, "https://res.cloudinary.com/test123/image/upload/test");
8890
}
8991

9092
@Test
@@ -93,7 +95,7 @@ public void testUrlWithNoAnalyticsNullAndTrue() {
9395
cloudinary.analytics.setSDKSemver("1.30.0");
9496
cloudinary.analytics.setTechVersion("12.0.0");
9597
String url = cloudinary.url().generate("test");
96-
Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=DAGAu5AMZAA0");
98+
Assert.assertEquals(url, "https://res.cloudinary.com/test123/image/upload/test?_a=DAGAu5AMZAA0");
9799
}
98100

99101
@Test
@@ -123,7 +125,7 @@ public void testUrlNoAnalyticsWithQueryParams() {
123125
cloudinary.setAnalytics(new Analytics("F", "2.0.0", System.getProperty("java.version"), "Z", System.getProperty("os.version"), "0"));
124126
cloudinary.config.privateCdn = true;
125127
String url = cloudinary.url().signed(true).type("authenticated").generate("test");
126-
assertEquals(url,"http://test123-res.cloudinary.com/image/authenticated/test?__cld_token__=st=11111111~exp=11111411~hmac=735a49389a72ac0b90d1a84ac5d43facd1a9047f153b39e914747ef6ed195e53");
128+
assertEquals(url,"https://test123-res.cloudinary.com/image/authenticated/test?__cld_token__=st=11111111~exp=11111411~hmac=735a49389a72ac0b90d1a84ac5d43facd1a9047f153b39e914747ef6ed195e53");
127129
cloudinary.config.privateCdn = false;
128130
}
129131

0 commit comments

Comments
 (0)