@@ -735,15 +735,18 @@ function patchFetchFormat(options = {}) {
735735 }
736736}
737737
738- function build_distribution_domain ( options ) {
739- const source = consumeOption ( options , 'source' , '' ) ;
738+ function build_distribution_domain ( source , options ) {
740739 const cloud_name = consumeOption ( options , 'cloud_name' , config ( ) . cloud_name ) ;
741-
742740 if ( ! cloud_name ) {
743741 throw new Error ( 'Must supply cloud_name in tag or in configuration' ) ;
744742 }
745743
746- const secure = consumeOption ( options , 'secure' , config ( ) . secure ) ;
744+ const ssl_detected = consumeOption ( options , "ssl_detected" , config ( ) . ssl_detected ) ;
745+ let secure = consumeOption ( options , 'secure' , config ( ) . secure ) ;
746+ if ( secure === null ) {
747+ secure = ssl_detected || config ( ) . secure ;
748+ }
749+
747750 const private_cdn = consumeOption ( options , 'private_cdn' , config ( ) . private_cdn ) ;
748751 const cname = consumeOption ( options , 'cname' , config ( ) . cname ) ;
749752 const secure_distribution = consumeOption ( options , 'secure_distribution' , config ( ) . secure_distribution ) ;
@@ -767,20 +770,6 @@ function url(public_id, options = {}) {
767770 }
768771 let long_url_signature = ! ! consumeOption ( options , "long_url_signature" , config ( ) . long_url_signature ) ;
769772 let format = consumeOption ( options , "format" ) ;
770- let cloud_name = consumeOption ( options , "cloud_name" , config ( ) . cloud_name ) ;
771- if ( ! cloud_name ) {
772- throw "Unknown cloud_name" ;
773- }
774- let private_cdn = consumeOption ( options , "private_cdn" , config ( ) . private_cdn ) ;
775- let secure_distribution = consumeOption ( options , "secure_distribution" , config ( ) . secure_distribution ) ;
776- let secure = consumeOption ( options , "secure" , null ) ;
777- let ssl_detected = consumeOption ( options , "ssl_detected" , config ( ) . ssl_detected ) ;
778- if ( secure === null ) {
779- secure = ssl_detected || config ( ) . secure ;
780- }
781- let cdn_subdomain = consumeOption ( options , "cdn_subdomain" , config ( ) . cdn_subdomain ) ;
782- let secure_cdn_subdomain = consumeOption ( options , "secure_cdn_subdomain" , config ( ) . secure_cdn_subdomain ) ;
783- let cname = consumeOption ( options , "cname" , config ( ) . cname ) ;
784773 let shorten = consumeOption ( options , "shorten" , config ( ) . shorten ) ;
785774 let sign_url = consumeOption ( options , "sign_url" , config ( ) . sign_url ) ;
786775 let api_secret = consumeOption ( options , "api_secret" , config ( ) . api_secret ) ;
@@ -837,16 +826,7 @@ function url(public_id, options = {}) {
837826 signature = hash . replace ( / \/ / g, '_' ) . replace ( / \+ / g, '-' ) . substring ( 0 , long_url_signature ? 32 : 8 ) ;
838827 signature = `s--${ signature } --` ;
839828 }
840- let prefix = unsigned_url_prefix (
841- public_id ,
842- cloud_name ,
843- private_cdn ,
844- cdn_subdomain ,
845- secure_cdn_subdomain ,
846- cname ,
847- secure ,
848- secure_distribution
849- ) ;
829+ let prefix = build_distribution_domain ( public_id , options ) ;
850830 let resultUrl = [ prefix , resource_type , type , signature , transformation , version , public_id ] . filter ( function ( part ) {
851831 return ( part != null ) && part !== '' ;
852832 } ) . join ( '/' ) . replace ( / / g, '%20' ) ;
0 commit comments