@aws-sdk/cloudfront-signer 3.910.0 → 3.914.0

package/dist-cjs/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var protocols = require('@smithy/core/protocols');
 var crypto = require('crypto');
 
 function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, privateKey, ipAddress, policy, passphrase, }) {
@@ -36,9 +37,19 @@ function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, privateKe
     const startFlag = baseUrl.includes("?") ? "&" : "?";
     const params = Object.entries(cloudfrontSignBuilder.createCloudfrontAttribute())
         .filter(([, value]) => value !== undefined)
-        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+        .map(([key, value]) => `${protocols.extendedEncodeURIComponent(key)}=${protocols.extendedEncodeURIComponent(value)}`)
         .join("&");
-    const urlString = baseUrl + startFlag + params;
+    function encodeBaseUrlQuery(url) {
+        if (url.includes("?")) {
+            const [hostAndPath, query] = url.split("?");
+            const params = [...new URLSearchParams(query).entries()]
+                .map(([key, value]) => `${protocols.extendedEncodeURIComponent(key)}=${protocols.extendedEncodeURIComponent(value)}`)
+                .join("&");
+            return `${hostAndPath}?${params}`;
+        }
+        return url;
+    }
+    const urlString = encodeBaseUrlQuery(baseUrl) + startFlag + params;
     return getResource(urlString);
 }
 function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLessThan, dateGreaterThan, policy, passphrase, }) {

package/dist-es/sign.js

@@ -1,3 +1,4 @@
+import { extendedEncodeURIComponent } from "@smithy/core/protocols";
 import { createSign } from "crypto";
 export function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, privateKey, ipAddress, policy, passphrase, }) {
     const cloudfrontSignBuilder = new CloudfrontSignBuilder({
@@ -33,9 +34,19 @@ export function getSignedUrl({ dateLessThan, dateGreaterThan, url, keyPairId, pr
     const startFlag = baseUrl.includes("?") ? "&" : "?";
     const params = Object.entries(cloudfrontSignBuilder.createCloudfrontAttribute())
         .filter(([, value]) => value !== undefined)
-        .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+        .map(([key, value]) => `${extendedEncodeURIComponent(key)}=${extendedEncodeURIComponent(value)}`)
         .join("&");
-    const urlString = baseUrl + startFlag + params;
+    function encodeBaseUrlQuery(url) {
+        if (url.includes("?")) {
+            const [hostAndPath, query] = url.split("?");
+            const params = [...new URLSearchParams(query).entries()]
+                .map(([key, value]) => `${extendedEncodeURIComponent(key)}=${extendedEncodeURIComponent(value)}`)
+                .join("&");
+            return `${hostAndPath}?${params}`;
+        }
+        return url;
+    }
+    const urlString = encodeBaseUrlQuery(baseUrl) + startFlag + params;
     return getResource(urlString);
 }
 export function getSignedCookies({ ipAddress, url, privateKey, keyPairId, dateLessThan, dateGreaterThan, policy, passphrase, }) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/cloudfront-signer",
-  "version": "3.910.0",
+  "version": "3.914.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "node ../../scripts/compilation/inline cloudfront-signer",
@@ -23,7 +23,8 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@smithy/url-parser": "^4.2.2",
+    "@smithy/core": "^3.17.0",
+    "@smithy/url-parser": "^4.2.3",
     "tslib": "^2.6.2"
   },
   "files": [