Skip to content

Commit 262d690

Browse files
author
cloudinary-bot
committed
Version 1.38.0
1 parent e0c9bb2 commit 262d690

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
1.38.0 / 2023-07-20
2+
==================
3+
4+
* feat: new method to_url added to support cached search feature
5+
16
1.37.3 / 2023-06-26
27
==================
38

lib-es5/utils/index.js

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -792,15 +792,18 @@ function patchFetchFormat() {
792792
}
793793
}
794794

795-
function build_distribution_domain(options) {
796-
var source = consumeOption(options, 'source', '');
795+
function build_distribution_domain(source, options) {
797796
var cloud_name = consumeOption(options, 'cloud_name', config().cloud_name);
798-
799797
if (!cloud_name) {
800798
throw new Error('Must supply cloud_name in tag or in configuration');
801799
}
802800

803-
var secure = consumeOption(options, 'secure', config().secure);
801+
var secure = consumeOption(options, 'secure', null);
802+
var ssl_detected = consumeOption(options, 'ssl_detected', config().ssl_detected);
803+
if (secure === null) {
804+
secure = ssl_detected || config().secure;
805+
}
806+
804807
var private_cdn = consumeOption(options, 'private_cdn', config().private_cdn);
805808
var cname = consumeOption(options, 'cname', config().cname);
806809
var secure_distribution = consumeOption(options, 'secure_distribution', config().secure_distribution);
@@ -827,20 +830,6 @@ function url(public_id) {
827830
}
828831
var long_url_signature = !!consumeOption(options, "long_url_signature", config().long_url_signature);
829832
var format = consumeOption(options, "format");
830-
var cloud_name = consumeOption(options, "cloud_name", config().cloud_name);
831-
if (!cloud_name) {
832-
throw "Unknown cloud_name";
833-
}
834-
var private_cdn = consumeOption(options, "private_cdn", config().private_cdn);
835-
var secure_distribution = consumeOption(options, "secure_distribution", config().secure_distribution);
836-
var secure = consumeOption(options, "secure", null);
837-
var ssl_detected = consumeOption(options, "ssl_detected", config().ssl_detected);
838-
if (secure === null) {
839-
secure = ssl_detected || config().secure;
840-
}
841-
var cdn_subdomain = consumeOption(options, "cdn_subdomain", config().cdn_subdomain);
842-
var secure_cdn_subdomain = consumeOption(options, "secure_cdn_subdomain", config().secure_cdn_subdomain);
843-
var cname = consumeOption(options, "cname", config().cname);
844833
var shorten = consumeOption(options, "shorten", config().shorten);
845834
var sign_url = consumeOption(options, "sign_url", config().sign_url);
846835
var api_secret = consumeOption(options, "api_secret", config().api_secret);
@@ -909,7 +898,7 @@ function url(public_id) {
909898
signature = hash.replace(/\//g, '_').replace(/\+/g, '-').substring(0, long_url_signature ? 32 : 8);
910899
signature = `s--${signature}--`;
911900
}
912-
var prefix = unsigned_url_prefix(public_id, cloud_name, private_cdn, cdn_subdomain, secure_cdn_subdomain, cname, secure, secure_distribution);
901+
var prefix = build_distribution_domain(public_id, options);
913902
var resultUrl = [prefix, resource_type, type, signature, transformation, version, public_id].filter(function (part) {
914903
return part != null && part !== '';
915904
}).join('/').replace(/ /g, '%20');

lib-es5/v2/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ var Search = function () {
153153
var dataOrderedByKey = sort_object_by_key(clear_blank(query));
154154
var encodedQuery = base64Encode(JSON.stringify(dataOrderedByKey));
155155

156-
var urlPrefix = build_distribution_domain(options);
156+
var urlPrefix = build_distribution_domain(options.source, options);
157157

158158
var signature = compute_hash(`${urlTtl}${encodedQuery}${apiSecret}`, 'sha256', 'hex');
159159

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"author": "Cloudinary <[email protected]>",
33
"name": "cloudinary",
44
"description": "Cloudinary NPM for node.js integration",
5-
"version": "1.37.3",
5+
"version": "1.38.0",
66
"homepage": "http://cloudinary.com",
77
"license": "MIT",
88
"repository": {

0 commit comments

Comments
 (0)