@aws-sdk/s3-request-presigner 3.460.0 → 3.461.0

package/dist-cjs/getSignedUrl.js

@@ -29,11 +29,18 @@ const getSignedUrl = async (client, command, options = {}) => {
         delete request.headers["amz-sdk-invocation-id"];
         delete request.headers["amz-sdk-request"];
         delete request.headers["x-amz-user-agent"];
-        const presigned = await s3Presigner.presign(request, {
+        let presigned;
+        const presignerOptions = {
             ...options,
             signingRegion: (_a = options.signingRegion) !== null && _a !== void 0 ? _a : context["signing_region"],
             signingService: (_b = options.signingService) !== null && _b !== void 0 ? _b : context["signing_service"],
-        });
+        };
+        if (context.s3ExpressIdentity) {
+            presigned = await s3Presigner.presignWithCredentials(request, context.s3ExpressIdentity, presignerOptions);
+        }
+        else {
+            presigned = await s3Presigner.presign(request, presignerOptions);
+        }
         return {
             response: {},
             output: {

package/dist-cjs/presigner.js

@@ -14,6 +14,30 @@ class S3RequestPresigner {
         this.signer = new signature_v4_multi_region_1.SignatureV4MultiRegion(resolvedOptions);
     }
     presign(requestToSign, { unsignableHeaders = new Set(), unhoistableHeaders = new Set(), ...options } = {}) {
+        this.prepareRequest(requestToSign, {
+            unsignableHeaders,
+            unhoistableHeaders,
+        });
+        return this.signer.presign(requestToSign, {
+            expiresIn: 900,
+            unsignableHeaders,
+            unhoistableHeaders,
+            ...options,
+        });
+    }
+    presignWithCredentials(requestToSign, credentials, { unsignableHeaders = new Set(), unhoistableHeaders = new Set(), ...options } = {}) {
+        this.prepareRequest(requestToSign, {
+            unsignableHeaders,
+            unhoistableHeaders,
+        });
+        return this.signer.presignWithCredentials(requestToSign, credentials, {
+            expiresIn: 900,
+            unsignableHeaders,
+            unhoistableHeaders,
+            ...options,
+        });
+    }
+    prepareRequest(requestToSign, { unsignableHeaders = new Set(), unhoistableHeaders = new Set() } = {}) {
         unsignableHeaders.add("content-type");
         Object.keys(requestToSign.headers)
             .map((header) => header.toLowerCase())
@@ -28,12 +52,6 @@ class S3RequestPresigner {
         if (!currentHostHeader || (currentHostHeader === requestToSign.hostname && requestToSign.port != null)) {
             requestToSign.headers.host = expectedHostHeader;
         }
-        return this.signer.presign(requestToSign, {
-            expiresIn: 900,
-            unsignableHeaders,
-            unhoistableHeaders,
-            ...options,
-        });
     }
 }
 exports.S3RequestPresigner = S3RequestPresigner;

package/dist-es/getSignedUrl.js

@@ -24,11 +24,18 @@ export const getSignedUrl = async (client, command, options = {}) => {
         delete request.headers["amz-sdk-invocation-id"];
         delete request.headers["amz-sdk-request"];
         delete request.headers["x-amz-user-agent"];
-        const presigned = await s3Presigner.presign(request, {
+        let presigned;
+        const presignerOptions = {
             ...options,
             signingRegion: options.signingRegion ?? context["signing_region"],
             signingService: options.signingService ?? context["signing_service"],
-        });
+        };
+        if (context.s3ExpressIdentity) {
+            presigned = await s3Presigner.presignWithCredentials(request, context.s3ExpressIdentity, presignerOptions);
+        }
+        else {
+            presigned = await s3Presigner.presign(request, presignerOptions);
+        }
         return {
             response: {},
             output: {

package/dist-es/presigner.js

@@ -11,6 +11,30 @@ export class S3RequestPresigner {
         this.signer = new SignatureV4MultiRegion(resolvedOptions);
     }
     presign(requestToSign, { unsignableHeaders = new Set(), unhoistableHeaders = new Set(), ...options } = {}) {
+        this.prepareRequest(requestToSign, {
+            unsignableHeaders,
+            unhoistableHeaders,
+        });
+        return this.signer.presign(requestToSign, {
+            expiresIn: 900,
+            unsignableHeaders,
+            unhoistableHeaders,
+            ...options,
+        });
+    }
+    presignWithCredentials(requestToSign, credentials, { unsignableHeaders = new Set(), unhoistableHeaders = new Set(), ...options } = {}) {
+        this.prepareRequest(requestToSign, {
+            unsignableHeaders,
+            unhoistableHeaders,
+        });
+        return this.signer.presignWithCredentials(requestToSign, credentials, {
+            expiresIn: 900,
+            unsignableHeaders,
+            unhoistableHeaders,
+            ...options,
+        });
+    }
+    prepareRequest(requestToSign, { unsignableHeaders = new Set(), unhoistableHeaders = new Set() } = {}) {
         unsignableHeaders.add("content-type");
         Object.keys(requestToSign.headers)
             .map((header) => header.toLowerCase())
@@ -25,11 +49,5 @@ export class S3RequestPresigner {
         if (!currentHostHeader || (currentHostHeader === requestToSign.hostname && requestToSign.port != null)) {
             requestToSign.headers.host = expectedHostHeader;
         }
-        return this.signer.presign(requestToSign, {
-            expiresIn: 900,
-            unsignableHeaders,
-            unhoistableHeaders,
-            ...options,
-        });
     }
 }

package/dist-types/getSignedUrl.d.ts

@@ -1,3 +1,6 @@
 import { Client, Command } from "@smithy/smithy-client";
 import { MetadataBearer, RequestPresigningArguments } from "@smithy/types";
+/**
+ * @public
+ */
 export declare const getSignedUrl: <InputTypesUnion extends object, InputType extends InputTypesUnion, OutputType extends MetadataBearer = MetadataBearer>(client: Client<any, InputTypesUnion, MetadataBearer, any>, command: Command<InputType, OutputType, any, InputTypesUnion, MetadataBearer>, options?: RequestPresigningArguments) => Promise<string>;

package/dist-types/presigner.d.ts

@@ -1,5 +1,5 @@
 import { SignatureV4MultiRegionInit } from "@aws-sdk/signature-v4-multi-region";
-import { RequestPresigner, RequestPresigningArguments } from "@smithy/types";
+import { AwsCredentialIdentity, RequestPresigner, RequestPresigningArguments } from "@smithy/types";
 import { HttpRequest as IHttpRequest } from "@smithy/types";
 type PartialBy<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
 export type S3RequestPresignerOptions = PartialBy<SignatureV4MultiRegionInit, "service" | "uriEscapePath"> & {
@@ -9,5 +9,7 @@ export declare class S3RequestPresigner implements RequestPresigner {
     private readonly signer;
     constructor(options: S3RequestPresignerOptions);
     presign(requestToSign: IHttpRequest, { unsignableHeaders, unhoistableHeaders, ...options }?: RequestPresigningArguments): Promise<IHttpRequest>;
+    presignWithCredentials(requestToSign: IHttpRequest, credentials: AwsCredentialIdentity, { unsignableHeaders, unhoistableHeaders, ...options }?: RequestPresigningArguments): Promise<IHttpRequest>;
+    private prepareRequest;
 }
 export {};

package/dist-types/ts3.4/presigner.d.ts

@@ -1,5 +1,9 @@
 import { SignatureV4MultiRegionInit } from "@aws-sdk/signature-v4-multi-region";
-import { RequestPresigner, RequestPresigningArguments } from "@smithy/types";
+import {
+  AwsCredentialIdentity,
+  RequestPresigner,
+  RequestPresigningArguments,
+} from "@smithy/types";
 import { HttpRequest as IHttpRequest } from "@smithy/types";
 type PartialBy<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>> &
   Partial<Pick<T, K>>;
@@ -20,5 +24,15 @@ export declare class S3RequestPresigner implements RequestPresigner {
       ...options
     }?: RequestPresigningArguments
   ): Promise<IHttpRequest>;
+  presignWithCredentials(
+    requestToSign: IHttpRequest,
+    credentials: AwsCredentialIdentity,
+    {
+      unsignableHeaders,
+      unhoistableHeaders,
+      ...options
+    }?: RequestPresigningArguments
+  ): Promise<IHttpRequest>;
+  private prepareRequest;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/s3-request-presigner",
-  "version": "3.460.0",
+  "version": "3.461.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types'",
     "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -21,7 +21,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/signature-v4-multi-region": "3.460.0",
+    "@aws-sdk/signature-v4-multi-region": "3.461.0",
     "@aws-sdk/types": "3.460.0",
     "@aws-sdk/util-format-url": "3.460.0",
     "@smithy/middleware-endpoint": "^2.2.0",
@@ -31,7 +31,7 @@
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "3.460.0",
+    "@aws-sdk/client-s3": "3.461.0",
     "@smithy/hash-node": "^2.0.15",
     "@tsconfig/recommended": "1.0.1",
     "@types/node": "^14.14.31",