@aws-amplify/core 6.0.1-preview-testing.be90020.0 → 6.0.1-ssr-api.df60e41.0

package/lib-esm/clients/middleware/signing/signer/signatureV4/presignUrl.js

@@ -1,46 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 import { ALGORITHM_QUERY_PARAM, AMZ_DATE_QUERY_PARAM, CREDENTIAL_QUERY_PARAM, EXPIRES_QUERY_PARAM, HOST_HEADER, SHA256_ALGORITHM_IDENTIFIER, SIGNATURE_QUERY_PARAM, SIGNED_HEADERS_QUERY_PARAM, TOKEN_QUERY_PARAM, } from './constants';
 import { getSigningValues } from './utils/getSigningValues';
 import { getSignature } from './utils/getSignature';
+import { AmplifyUrl } from '../../../../../utils/amplifyUrl';
 /**
  * Given a `Presignable` object, returns a Signature Version 4 presigned `URL` object.
  *
@@ -48,27 +11,30 @@ import { getSignature } from './utils/getSignature';
  * @param presignUrlOptions `PresignUrlOptions` object containing values used to construct the signature.
  * @returns A `URL` with authentication query params which can grant temporary access to AWS resources.
  */
-export var presignUrl = function (_a, _b) {
-    var _c, _d, _e, _f;
-    var body = _a.body, _g = _a.method, method = _g === void 0 ? 'GET' : _g, url = _a.url;
-    var expiration = _b.expiration, options = __rest(_b, ["expiration"]);
-    var signingValues = getSigningValues(options);
-    var accessKeyId = signingValues.accessKeyId, credentialScope = signingValues.credentialScope, longDate = signingValues.longDate, sessionToken = signingValues.sessionToken;
+export const presignUrl = ({ body, method = 'GET', url }, { expiration, ...options }) => {
+    const signingValues = getSigningValues(options);
+    const { accessKeyId, credentialScope, longDate, sessionToken } = signingValues;
     // create the request to sign
     // @ts-ignore URL constructor accepts a URL object
-    var presignedUrl = new URL(url);
-    Object.entries(__assign(__assign((_c = {}, _c[ALGORITHM_QUERY_PARAM] = SHA256_ALGORITHM_IDENTIFIER, _c[CREDENTIAL_QUERY_PARAM] = "".concat(accessKeyId, "/").concat(credentialScope), _c[AMZ_DATE_QUERY_PARAM] = longDate, _c[SIGNED_HEADERS_QUERY_PARAM] = HOST_HEADER, _c), (expiration && (_d = {}, _d[EXPIRES_QUERY_PARAM] = expiration.toString(), _d))), (sessionToken && (_e = {}, _e[TOKEN_QUERY_PARAM] = sessionToken, _e)))).forEach(function (_a) {
-        var _b = __read(_a, 2), key = _b[0], value = _b[1];
+    const presignedUrl = new AmplifyUrl(url);
+    Object.entries({
+        [ALGORITHM_QUERY_PARAM]: SHA256_ALGORITHM_IDENTIFIER,
+        [CREDENTIAL_QUERY_PARAM]: `${accessKeyId}/${credentialScope}`,
+        [AMZ_DATE_QUERY_PARAM]: longDate,
+        [SIGNED_HEADERS_QUERY_PARAM]: HOST_HEADER,
+        ...(expiration && { [EXPIRES_QUERY_PARAM]: expiration.toString() }),
+        ...(sessionToken && { [TOKEN_QUERY_PARAM]: sessionToken }),
+    }).forEach(([key, value]) => {
         presignedUrl.searchParams.append(key, value);
     });
-    var requestToSign = {
-        body: body,
-        headers: (_f = {}, _f[HOST_HEADER] = url.host, _f),
-        method: method,
+    const requestToSign = {
+        body,
+        headers: { [HOST_HEADER]: url.host },
+        method,
         url: presignedUrl,
     };
     // calculate and add the signature to the url
-    var signature = getSignature(requestToSign, signingValues);
+    const signature = getSignature(requestToSign, signingValues);
     presignedUrl.searchParams.append(SIGNATURE_QUERY_PARAM, signature);
     return presignedUrl;
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/signRequest.js

@@ -1,16 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 import { getSignedHeaders } from './utils/getSignedHeaders';
 import { getSigningValues } from './utils/getSigningValues';
 import { AMZ_DATE_HEADER, AUTH_HEADER, HOST_HEADER, SHA256_ALGORITHM_IDENTIFIER, TOKEN_HEADER, } from './constants';
@@ -22,22 +11,22 @@ import { getSignature } from './utils/getSignature';
  * @param signRequestOptions `SignRequestOptions` object containing values used to construct the signature.
  * @returns A `HttpRequest` with authentication headers which can grant temporary access to AWS resources.
  */
-export var signRequest = function (request, options) {
-    var signingValues = getSigningValues(options);
-    var accessKeyId = signingValues.accessKeyId, credentialScope = signingValues.credentialScope, longDate = signingValues.longDate, sessionToken = signingValues.sessionToken;
+export const signRequest = (request, options) => {
+    const signingValues = getSigningValues(options);
+    const { accessKeyId, credentialScope, longDate, sessionToken } = signingValues;
     // create the request to sign
-    var headers = __assign({}, request.headers);
+    const headers = { ...request.headers };
     headers[HOST_HEADER] = request.url.host;
     headers[AMZ_DATE_HEADER] = longDate;
     if (sessionToken) {
         headers[TOKEN_HEADER] = sessionToken;
     }
-    var requestToSign = __assign(__assign({}, request), { headers: headers });
+    const requestToSign = { ...request, headers };
     // calculate and add the signature to the request
-    var signature = getSignature(requestToSign, signingValues);
-    var credentialEntry = "Credential=".concat(accessKeyId, "/").concat(credentialScope);
-    var signedHeadersEntry = "SignedHeaders=".concat(getSignedHeaders(headers));
-    var signatureEntry = "Signature=".concat(signature);
-    headers[AUTH_HEADER] = "".concat(SHA256_ALGORITHM_IDENTIFIER, " ").concat(credentialEntry, ", ").concat(signedHeadersEntry, ", ").concat(signatureEntry);
+    const signature = getSignature(requestToSign, signingValues);
+    const credentialEntry = `Credential=${accessKeyId}/${credentialScope}`;
+    const signedHeadersEntry = `SignedHeaders=${getSignedHeaders(headers)}`;
+    const signatureEntry = `Signature=${signature}`;
+    headers[AUTH_HEADER] = `${SHA256_ALGORITHM_IDENTIFIER} ${credentialEntry}, ${signedHeadersEntry}, ${signatureEntry}`;
     return requestToSign;
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/dataHashHelpers.js

@@ -10,11 +10,11 @@ import { toHex } from '@smithy/util-hex-encoding';
  * @param data Hashable `SourceData`.
  * @returns `Uint8Array` created from the data as input to a hash function.
  */
-export var getHashedData = function (key, data) {
-    var sha256 = new Sha256(key !== null && key !== void 0 ? key : undefined);
+export const getHashedData = (key, data) => {
+    const sha256 = new Sha256(key ?? undefined);
     sha256.update(data);
     // TODO: V6 flip to async digest
-    var hashedData = sha256.digestSync();
+    const hashedData = sha256.digestSync();
     return hashedData;
 };
 /**
@@ -26,7 +26,7 @@ export var getHashedData = function (key, data) {
  *
  * @internal
  */
-export var getHashedDataAsHex = function (key, data) {
-    var hashedData = getHashedData(key, data);
+export const getHashedDataAsHex = (key, data) => {
+    const hashedData = getHashedData(key, data);
     return toHex(hashedData);
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getCanonicalHeaders.js

@@ -1,21 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 /**
  * Returns canonical headers.
  *
@@ -27,17 +11,11 @@ var __read = (this && this.__read) || function (o, n) {
  *
  * @internal
  */
-export var getCanonicalHeaders = function (headers) {
-    return Object.entries(headers)
-        .map(function (_a) {
-        var _b;
-        var _c = __read(_a, 2), key = _c[0], value = _c[1];
-        return ({
-            key: key.toLowerCase(),
-            value: (_b = value === null || value === void 0 ? void 0 : value.trim().replace(/\s+/g, ' ')) !== null && _b !== void 0 ? _b : '',
-        });
-    })
-        .sort(function (a, b) { return (a.key < b.key ? -1 : 1); })
-        .map(function (entry) { return "".concat(entry.key, ":").concat(entry.value, "\n"); })
-        .join('');
-};
+export const getCanonicalHeaders = (headers) => Object.entries(headers)
+    .map(([key, value]) => ({
+    key: key.toLowerCase(),
+    value: value?.trim().replace(/\s+/g, ' ') ?? '',
+}))
+    .sort((a, b) => (a.key < b.key ? -1 : 1))
+    .map(entry => `${entry.key}:${entry.value}\n`)
+    .join('');

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getCanonicalQueryString.js

@@ -1,21 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 /**
  * Returns a canonical query string.
  *
@@ -27,25 +11,14 @@ var __read = (this && this.__read) || function (o, n) {
  *
  * @internal
  */
-export var getCanonicalQueryString = function (searchParams) {
-    return Array.from(searchParams)
-        .sort(function (_a, _b) {
-        var _c = __read(_a, 2), keyA = _c[0], valA = _c[1];
-        var _d = __read(_b, 2), keyB = _d[0], valB = _d[1];
-        if (keyA === keyB) {
-            return valA < valB ? -1 : 1;
-        }
-        return keyA < keyB ? -1 : 1;
-    })
-        .map(function (_a) {
-        var _b = __read(_a, 2), key = _b[0], val = _b[1];
-        return "".concat(escapeUri(key), "=").concat(escapeUri(val));
-    })
-        .join('&');
-};
-var escapeUri = function (uri) {
-    return encodeURIComponent(uri).replace(/[!'()*]/g, hexEncode);
-};
-var hexEncode = function (c) {
-    return "%".concat(c.charCodeAt(0).toString(16).toUpperCase());
-};
+export const getCanonicalQueryString = (searchParams) => Array.from(searchParams)
+    .sort(([keyA, valA], [keyB, valB]) => {
+    if (keyA === keyB) {
+        return valA < valB ? -1 : 1;
+    }
+    return keyA < keyB ? -1 : 1;
+})
+    .map(([key, val]) => `${escapeUri(key)}=${escapeUri(val)}`)
+    .join('&');
+const escapeUri = (uri) => encodeURIComponent(uri).replace(/[!'()*]/g, hexEncode);
+const hexEncode = (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`;

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getCanonicalRequest.js

@@ -21,15 +21,11 @@ import { getSignedHeaders } from './getSignedHeaders';
  *
  * @internal
  */
-export var getCanonicalRequest = function (_a, uriEscapePath) {
-    var body = _a.body, headers = _a.headers, method = _a.method, url = _a.url;
-    if (uriEscapePath === void 0) { uriEscapePath = true; }
-    return [
-        method,
-        getCanonicalUri(url.pathname, uriEscapePath),
-        getCanonicalQueryString(url.searchParams),
-        getCanonicalHeaders(headers),
-        getSignedHeaders(headers),
-        getHashedPayload(body),
-    ].join('\n');
-};
+export const getCanonicalRequest = ({ body, headers, method, url }, uriEscapePath = true) => [
+    method,
+    getCanonicalUri(url.pathname, uriEscapePath),
+    getCanonicalQueryString(url.searchParams),
+    getCanonicalHeaders(headers),
+    getSignedHeaders(headers),
+    getHashedPayload(body),
+].join('\n');

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getCanonicalUri.js

@@ -11,11 +11,8 @@
  *
  * @internal
  */
-export var getCanonicalUri = function (pathname, uriEscapePath) {
-    if (uriEscapePath === void 0) { uriEscapePath = true; }
-    return pathname
-        ? uriEscapePath
-            ? encodeURIComponent(pathname).replace(/%2F/g, '/')
-            : pathname
-        : '/';
-};
+export const getCanonicalUri = (pathname, uriEscapePath = true) => pathname
+    ? uriEscapePath
+        ? encodeURIComponent(pathname).replace(/%2F/g, '/')
+        : pathname
+    : '/';

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getCredentialScope.js

@@ -12,4 +12,4 @@ import { KEY_TYPE_IDENTIFIER } from '../constants';
  *
  * @internal
  */
-export var getCredentialScope = function (date, region, service) { return "".concat(date, "/").concat(region, "/").concat(service, "/").concat(KEY_TYPE_IDENTIFIER); };
+export const getCredentialScope = (date, region, service) => `${date}/${region}/${service}/${KEY_TYPE_IDENTIFIER}`;

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getFormattedDates.js

@@ -10,10 +10,10 @@
  *
  * @internal
  */
-export var getFormattedDates = function (date) {
-    var longDate = date.toISOString().replace(/[:\-]|\.\d{3}/g, '');
+export const getFormattedDates = (date) => {
+    const longDate = date.toISOString().replace(/[:\-]|\.\d{3}/g, '');
     return {
-        longDate: longDate,
+        longDate,
         shortDate: longDate.slice(0, 8),
     };
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getHashedPayload.js

@@ -11,22 +11,18 @@ import { getHashedDataAsHex } from './dataHashHelpers';
  *
  * @internal
  */
-export var getHashedPayload = function (body) {
+export const getHashedPayload = (body) => {
     // return precalculated empty hash if body is undefined or null
     if (body == null) {
         return EMPTY_HASH;
     }
     if (isSourceData(body)) {
-        var hashedData = getHashedDataAsHex(null, body);
+        const hashedData = getHashedDataAsHex(null, body);
         return hashedData;
     }
     // Defined body is not signable. Return unsigned payload which may or may not be accepted by the service.
     return UNSIGNED_PAYLOAD;
 };
-var isSourceData = function (body) {
-    return typeof body === 'string' || ArrayBuffer.isView(body) || isArrayBuffer(body);
-};
-var isArrayBuffer = function (arg) {
-    return (typeof ArrayBuffer === 'function' && arg instanceof ArrayBuffer) ||
-        Object.prototype.toString.call(arg) === '[object ArrayBuffer]';
-};
+const isSourceData = (body) => typeof body === 'string' || ArrayBuffer.isView(body) || isArrayBuffer(body);
+const isArrayBuffer = (arg) => (typeof ArrayBuffer === 'function' && arg instanceof ArrayBuffer) ||
+    Object.prototype.toString.call(arg) === '[object ArrayBuffer]';

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getSignature.js

@@ -14,15 +14,14 @@ import { getStringToSign } from './getStringToSign';
  *
  * @internal
  */
-export var getSignature = function (request, _a) {
-    var credentialScope = _a.credentialScope, longDate = _a.longDate, secretAccessKey = _a.secretAccessKey, shortDate = _a.shortDate, signingRegion = _a.signingRegion, signingService = _a.signingService, uriEscapePath = _a.uriEscapePath;
+export const getSignature = (request, { credentialScope, longDate, secretAccessKey, shortDate, signingRegion, signingService, uriEscapePath, }) => {
     // step 1: create a canonical request
-    var canonicalRequest = getCanonicalRequest(request, uriEscapePath);
+    const canonicalRequest = getCanonicalRequest(request, uriEscapePath);
     // step 2: create a hash of the canonical request
-    var hashedRequest = getHashedDataAsHex(null, canonicalRequest);
+    const hashedRequest = getHashedDataAsHex(null, canonicalRequest);
     // step 3: create a string to sign
-    var stringToSign = getStringToSign(longDate, credentialScope, hashedRequest);
+    const stringToSign = getStringToSign(longDate, credentialScope, hashedRequest);
     // step 4: calculate the signature
-    var signature = getHashedDataAsHex(getSigningKey(secretAccessKey, shortDate, signingRegion, signingService), stringToSign);
+    const signature = getHashedDataAsHex(getSigningKey(secretAccessKey, shortDate, signingRegion, signingService), stringToSign);
     return signature;
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getSignedHeaders.js

@@ -9,9 +9,7 @@
  *
  * @internal
  */
-export var getSignedHeaders = function (headers) {
-    return Object.keys(headers)
-        .map(function (key) { return key.toLowerCase(); })
-        .sort()
-        .join(';');
-};
+export const getSignedHeaders = (headers) => Object.keys(headers)
+    .map(key => key.toLowerCase())
+    .sort()
+    .join(';');

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getSigningKey.js

@@ -14,11 +14,11 @@ import { getHashedData } from './dataHashHelpers';
  *
  * @internal
  */
-export var getSigningKey = function (secretAccessKey, date, region, service) {
-    var key = "".concat(SIGNATURE_IDENTIFIER).concat(secretAccessKey);
-    var dateKey = getHashedData(key, date);
-    var regionKey = getHashedData(dateKey, region);
-    var serviceKey = getHashedData(regionKey, service);
-    var signingKey = getHashedData(serviceKey, KEY_TYPE_IDENTIFIER);
+export const getSigningKey = (secretAccessKey, date, region, service) => {
+    const key = `${SIGNATURE_IDENTIFIER}${secretAccessKey}`;
+    const dateKey = getHashedData(key, date);
+    const regionKey = getHashedData(dateKey, region);
+    const serviceKey = getHashedData(regionKey, service);
+    const signingKey = getHashedData(serviceKey, KEY_TYPE_IDENTIFIER);
     return signingKey;
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getSigningValues.js

@@ -10,23 +10,22 @@ import { getFormattedDates } from './getFormattedDates';
  *
  * @internal
  */
-export var getSigningValues = function (_a) {
-    var credentials = _a.credentials, _b = _a.signingDate, signingDate = _b === void 0 ? new Date() : _b, signingRegion = _a.signingRegion, signingService = _a.signingService, _c = _a.uriEscapePath, uriEscapePath = _c === void 0 ? true : _c;
+export const getSigningValues = ({ credentials, signingDate = new Date(), signingRegion, signingService, uriEscapePath = true, }) => {
     // get properties from credentials
-    var accessKeyId = credentials.accessKeyId, secretAccessKey = credentials.secretAccessKey, sessionToken = credentials.sessionToken;
+    const { accessKeyId, secretAccessKey, sessionToken } = credentials;
     // get formatted dates for signing
-    var _d = getFormattedDates(signingDate), longDate = _d.longDate, shortDate = _d.shortDate;
+    const { longDate, shortDate } = getFormattedDates(signingDate);
     // copy header and set signing properties
-    var credentialScope = getCredentialScope(shortDate, signingRegion, signingService);
+    const credentialScope = getCredentialScope(shortDate, signingRegion, signingService);
     return {
-        accessKeyId: accessKeyId,
-        credentialScope: credentialScope,
-        longDate: longDate,
-        secretAccessKey: secretAccessKey,
-        sessionToken: sessionToken,
-        shortDate: shortDate,
-        signingRegion: signingRegion,
-        signingService: signingService,
-        uriEscapePath: uriEscapePath,
+        accessKeyId,
+        credentialScope,
+        longDate,
+        secretAccessKey,
+        sessionToken,
+        shortDate,
+        signingRegion,
+        signingService,
+        uriEscapePath,
     };
 };

package/lib-esm/clients/middleware/signing/signer/signatureV4/utils/getStringToSign.js

@@ -16,6 +16,4 @@ import { SHA256_ALGORITHM_IDENTIFIER } from '../constants';
  *
  * @internal
  */
-export var getStringToSign = function (date, credentialScope, hashedRequest) {
-    return [SHA256_ALGORITHM_IDENTIFIER, date, credentialScope, hashedRequest].join('\n');
-};
+export const getStringToSign = (date, credentialScope, hashedRequest) => [SHA256_ALGORITHM_IDENTIFIER, date, credentialScope, hashedRequest].join('\n');

package/lib-esm/clients/middleware/signing/utils/extendedEncodeURIComponent.js

@@ -9,11 +9,9 @@
  *
  * @internal
  */
-export var extendedEncodeURIComponent = function (uri) {
+export const extendedEncodeURIComponent = (uri) => {
     // Match characters normally not encoded by `encodeURIComponent`
-    var extendedCharacters = /[!'()*]/g;
+    const extendedCharacters = /[!'()*]/g;
     return encodeURIComponent(uri).replace(extendedCharacters, hexEncode);
 };
-var hexEncode = function (c) {
-    return "%".concat(c.charCodeAt(0).toString(16).toUpperCase());
-};
+const hexEncode = (c) => `%${c.charCodeAt(0).toString(16).toUpperCase()}`;

package/lib-esm/clients/middleware/signing/utils/getSkewCorrectedDate.js

@@ -9,6 +9,4 @@
  *
  * @internal
  */
-export var getSkewCorrectedDate = function (systemClockOffset) {
-    return new Date(Date.now() + systemClockOffset);
-};
+export const getSkewCorrectedDate = (systemClockOffset) => new Date(Date.now() + systemClockOffset);

package/lib-esm/clients/middleware/signing/utils/getUpdatedSystemClockOffset.js

@@ -9,7 +9,7 @@ import { isClockSkewed } from './isClockSkewed';
  *
  * @internal
  */
-export var getUpdatedSystemClockOffset = function (clockTimeInMilliseconds, currentSystemClockOffset) {
+export const getUpdatedSystemClockOffset = (clockTimeInMilliseconds, currentSystemClockOffset) => {
     if (isClockSkewed(clockTimeInMilliseconds, currentSystemClockOffset)) {
         return clockTimeInMilliseconds - Date.now();
     }

package/lib-esm/clients/middleware/signing/utils/isClockSkewed.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { getSkewCorrectedDate } from './getSkewCorrectedDate';
 // 5 mins in milliseconds. Ref: https://github.com/aws/aws-sdk-js-v3/blob/6c0f44fab30a1bb2134af47362a31332abc3666b/packages/middleware-signing/src/utils/isClockSkewed.ts#L10
-var SKEW_WINDOW = 5 * 60 * 1000;
+const SKEW_WINDOW = 5 * 60 * 1000;
 /**
  * Checks if the provided date is within the skew window of 5 minutes.
  *
@@ -13,7 +13,5 @@ var SKEW_WINDOW = 5 * 60 * 1000;
  *
  * @internal
  */
-export var isClockSkewed = function (clockTimeInMilliseconds, clockOffsetInMilliseconds) {
-    return Math.abs(getSkewCorrectedDate(clockOffsetInMilliseconds).getTime() -
-        clockTimeInMilliseconds) >= SKEW_WINDOW;
-};
+export const isClockSkewed = (clockTimeInMilliseconds, clockOffsetInMilliseconds) => Math.abs(getSkewCorrectedDate(clockOffsetInMilliseconds).getTime() -
+    clockTimeInMilliseconds) >= SKEW_WINDOW;

package/lib-esm/clients/middleware/userAgent/middleware.js

@@ -1,73 +1,24 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 /**
  * Middleware injects user agent string to specified header(default to 'x-amz-user-agent'),
  * if the header is not set already.
  *
  * TODO: incorporate new user agent design
  */
-export var userAgentMiddleware = function (_a) {
-    var _b = _a.userAgentHeader, userAgentHeader = _b === void 0 ? 'x-amz-user-agent' : _b, _c = _a.userAgentValue, userAgentValue = _c === void 0 ? '' : _c;
-    return function (next) {
-        return function userAgentMiddleware(request) {
-            return __awaiter(this, void 0, void 0, function () {
-                var result, headerName, response;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            if (!(userAgentValue.trim().length === 0)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, next(request)];
-                        case 1:
-                            result = _a.sent();
-                            return [2 /*return*/, result];
-                        case 2:
-                            headerName = userAgentHeader.toLowerCase();
-                            request.headers[headerName] = request.headers[headerName]
-                                ? "".concat(request.headers[headerName], " ").concat(userAgentValue)
-                                : userAgentValue;
-                            return [4 /*yield*/, next(request)];
-                        case 3:
-                            response = _a.sent();
-                            return [2 /*return*/, response];
-                    }
-                });
-            });
-        };
+export const userAgentMiddleware = ({ userAgentHeader = 'x-amz-user-agent', userAgentValue = '', }) => next => {
+    return async function userAgentMiddleware(request) {
+        if (userAgentValue.trim().length === 0) {
+            const result = await next(request);
+            return result;
+        }
+        else {
+            const headerName = userAgentHeader.toLowerCase();
+            request.headers[headerName] = request.headers[headerName]
+                ? `${request.headers[headerName]} ${userAgentValue}`
+                : userAgentValue;
+            const response = await next(request);
+            return response;
+        }
     };
 };