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

package/lib/ServiceWorker/ServiceWorker.js

@@ -1,26 +1,14 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceWorkerClass = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
-var Logger_1 = require("../Logger");
-var JS_1 = require("../Util/JS");
-var Amplify_1 = require("../Amplify");
-var AssertError_1 = require("../Util/errors/AssertError");
-var Errors_1 = require("../Util/Errors");
-var Constants_1 = require("../Util/Constants");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ServiceWorkerClass = void 0;
+const Logger_1 = require("../Logger");
+const utils_1 = require("../utils");
+const errors_1 = require("../errors");
+const errorHelpers_1 = require("./errorHelpers");
+const pinpoint_1 = require("../providers/pinpoint");
+const singleton_1 = require("../singleton");
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -33,25 +21,18 @@ var Constants_1 = require("../Util/Constants");
  * and attempt to dispatch messages on state change and record analytics
  * events based on the service worker lifecycle.
  */
-var ServiceWorkerClass = /** @class */ (function () {
-    function ServiceWorkerClass() {
+class ServiceWorkerClass {
+    constructor() {
         // The AWS Amplify logger
         this._logger = new Logger_1.ConsoleLogger('ServiceWorker');
     }
-    Object.defineProperty(ServiceWorkerClass.prototype, "serviceWorker", {
-        /**
-         * Get the currently active service worker
-         */
-        get: function () {
-            (0, AssertError_1.asserts)(this._serviceWorker !== undefined, {
-                name: Constants_1.SERVICE_WORKER_EXCEPTION,
-                message: 'Service Worker instance is undefined',
-            });
-            return this._serviceWorker;
-        },
-        enumerable: false,
-        configurable: true
-    });
+    /**
+     * Get the currently active service worker
+     */
+    get serviceWorker() {
+        (0, errorHelpers_1.assert)(this._serviceWorker !== undefined, errorHelpers_1.ServiceWorkerErrorCode.UndefinedInstance);
+        return this._serviceWorker;
+    }
     /**
      * Register the service-worker.js file in the browser
      * Make sure the service-worker.js is part of the build
@@ -64,50 +45,47 @@ var ServiceWorkerClass = /** @class */ (function () {
      *	- resolve(ServiceWorkerRegistration)
      *	- reject(Error)
      **/
-    ServiceWorkerClass.prototype.register = function (filePath, scope) {
-        var _this = this;
-        if (filePath === void 0) { filePath = '/service-worker.js'; }
-        if (scope === void 0) { scope = '/'; }
-        this._logger.debug("registering ".concat(filePath));
-        this._logger.debug("registering service worker with scope ".concat(scope));
-        return new Promise(function (resolve, reject) {
+    register(filePath = '/service-worker.js', scope = '/') {
+        this._logger.debug(`registering ${filePath}`);
+        this._logger.debug(`registering service worker with scope ${scope}`);
+        return new Promise((resolve, reject) => {
             if (navigator && 'serviceWorker' in navigator) {
                 navigator.serviceWorker
                     .register(filePath, {
-                    scope: scope,
+                    scope,
                 })
-                    .then(function (registration) {
+                    .then(registration => {
                     if (registration.installing) {
-                        _this._serviceWorker = registration.installing;
+                        this._serviceWorker = registration.installing;
                     }
                     else if (registration.waiting) {
-                        _this._serviceWorker = registration.waiting;
+                        this._serviceWorker = registration.waiting;
                     }
                     else if (registration.active) {
-                        _this._serviceWorker = registration.active;
+                        this._serviceWorker = registration.active;
                     }
-                    _this._registration = registration;
-                    _this._setupListeners();
-                    _this._logger.debug("Service Worker Registration Success: ".concat(registration));
+                    this._registration = registration;
+                    this._setupListeners();
+                    this._logger.debug(`Service Worker Registration Success: ${registration}`);
                     return resolve(registration);
                 })
-                    .catch(function (error) {
-                    _this._logger.debug("Service Worker Registration Failed ".concat(error));
-                    return reject(new Errors_1.AmplifyError({
-                        name: Constants_1.SERVICE_WORKER_EXCEPTION,
+                    .catch(error => {
+                    this._logger.debug(`Service Worker Registration Failed ${error}`);
+                    return reject(new errors_1.AmplifyError({
+                        name: errorHelpers_1.ServiceWorkerErrorCode.Unavailable,
                         message: 'Service Worker not available',
                         underlyingError: error,
                     }));
                 });
             }
             else {
-                return reject(new Errors_1.AmplifyError({
-                    name: Constants_1.SERVICE_WORKER_EXCEPTION,
+                return reject(new errors_1.AmplifyError({
+                    name: errorHelpers_1.ServiceWorkerErrorCode.Unavailable,
                     message: 'Service Worker not available',
                 }));
             }
         });
-    };
+    }
     /**
      * Enable web push notifications. If not subscribed, a new subscription will
      * be created and registered.
@@ -119,66 +97,59 @@ var ServiceWorkerClass = /** @class */ (function () {
      * 	- resolve(PushSubscription)
      *  - reject(Error)
      */
-    ServiceWorkerClass.prototype.enablePush = function (publicKey) {
-        var _this = this;
-        (0, AssertError_1.asserts)(this._registration !== undefined, {
-            name: Constants_1.SERVICE_WORKER_EXCEPTION,
-            message: 'Service Worker registration is undefined',
-        });
+    enablePush(publicKey) {
+        (0, errorHelpers_1.assert)(this._registration !== undefined, errorHelpers_1.ServiceWorkerErrorCode.UndefinedRegistration);
         this._publicKey = publicKey;
-        return new Promise(function (resolve, reject) {
-            if ((0, JS_1.isBrowser)()) {
-                (0, AssertError_1.asserts)(_this._registration !== undefined, {
-                    name: Constants_1.SERVICE_WORKER_EXCEPTION,
-                    message: 'Service Worker registration is undefined',
-                });
-                _this._registration.pushManager.getSubscription().then(function (subscription) {
+        return new Promise((resolve, reject) => {
+            if ((0, utils_1.isBrowser)()) {
+                (0, errorHelpers_1.assert)(this._registration !== undefined, errorHelpers_1.ServiceWorkerErrorCode.UndefinedRegistration);
+                this._registration.pushManager.getSubscription().then(subscription => {
                     if (subscription) {
-                        _this._subscription = subscription;
-                        _this._logger.debug("User is subscribed to push: ".concat(JSON.stringify(subscription)));
+                        this._subscription = subscription;
+                        this._logger.debug(`User is subscribed to push: ${JSON.stringify(subscription)}`);
                         resolve(subscription);
                     }
                     else {
-                        _this._logger.debug("User is NOT subscribed to push");
-                        return _this._registration.pushManager.subscribe({
+                        this._logger.debug(`User is NOT subscribed to push`);
+                        return this._registration.pushManager.subscribe({
                             userVisibleOnly: true,
-                            applicationServerKey: _this._urlB64ToUint8Array(publicKey),
+                            applicationServerKey: this._urlB64ToUint8Array(publicKey),
                         })
-                            .then(function (subscription) {
-                            _this._subscription = subscription;
-                            _this._logger.debug("User subscribed: ".concat(JSON.stringify(subscription)));
+                            .then(subscription => {
+                            this._subscription = subscription;
+                            this._logger.debug(`User subscribed: ${JSON.stringify(subscription)}`);
                             resolve(subscription);
                         })
-                            .catch(function (error) {
-                            _this._logger.error(error);
+                            .catch(error => {
+                            this._logger.error(error);
                         });
                     }
                 });
             }
             else {
-                return reject(new Errors_1.AmplifyError({
-                    name: Constants_1.SERVICE_WORKER_EXCEPTION,
+                return reject(new errors_1.AmplifyError({
+                    name: errorHelpers_1.ServiceWorkerErrorCode.Unavailable,
                     message: 'Service Worker not available',
                 }));
             }
         });
-    };
+    }
     /**
      * Convert a base64 encoded string to a Uint8 array for the push server key
      * @param base64String
      */
-    ServiceWorkerClass.prototype._urlB64ToUint8Array = function (base64String) {
-        var padding = '='.repeat((4 - (base64String.length % 4)) % 4);
-        var base64 = (base64String + padding)
+    _urlB64ToUint8Array(base64String) {
+        const padding = '='.repeat((4 - (base64String.length % 4)) % 4);
+        const base64 = (base64String + padding)
             .replace(/\-/g, '+')
             .replace(/_/g, '/');
-        var rawData = window.atob(base64);
-        var outputArray = new Uint8Array(rawData.length);
-        for (var i = 0; i < rawData.length; ++i) {
+        const rawData = window.atob(base64);
+        const outputArray = new Uint8Array(rawData.length);
+        for (let i = 0; i < rawData.length; ++i) {
             outputArray[i] = rawData.charCodeAt(i);
         }
         return outputArray;
-    };
+    }
     /**
      * Send a message to the service worker. The service worker needs
      * to implement `self.addEventListener('message') to handle the
@@ -187,37 +158,40 @@ var ServiceWorkerClass = /** @class */ (function () {
      *	- see: https://developer.mozilla.org/en-US/docs/Web/API/Transferable
      * @returns {Promise}
      **/
-    ServiceWorkerClass.prototype.send = function (message) {
+    send(message) {
         if (this._serviceWorker) {
             this._serviceWorker.postMessage(typeof message === 'object' ? JSON.stringify(message) : message);
         }
-    };
+    }
     /**
      * Listen for service worker state change and message events
      * https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker/state
      **/
-    ServiceWorkerClass.prototype._setupListeners = function () {
-        var _this = this;
-        this.serviceWorker.addEventListener('statechange', function (event) {
-            var currentState = _this.serviceWorker.state;
-            _this._logger.debug("ServiceWorker statechange: ".concat(currentState));
-            Amplify_1.Amplify.Analytics;
-            if (isAmplifyWithAnalytics(Amplify_1.Amplify)) {
-                Amplify_1.Amplify.Analytics.record({
-                    name: 'ServiceWorker',
-                    attributes: {
-                        state: currentState,
+    _setupListeners() {
+        this.serviceWorker.addEventListener('statechange', async (event) => {
+            const currentState = this.serviceWorker.state;
+            this._logger.debug(`ServiceWorker statechange: ${currentState}`);
+            const { appId, region } = singleton_1.Amplify.getConfig().Analytics?.Pinpoint ?? {};
+            const { credentials } = await (0, singleton_1.fetchAuthSession)();
+            if (appId && region && credentials) {
+                // Pinpoint is configured, record an event
+                (0, pinpoint_1.record)({
+                    appId,
+                    region,
+                    category: 'Core',
+                    credentials,
+                    event: {
+                        name: 'ServiceWorker',
+                        attributes: {
+                            state: currentState,
+                        },
                     },
                 });
             }
         });
-        this.serviceWorker.addEventListener('message', function (event) {
-            _this._logger.debug("ServiceWorker message event: ".concat(event));
+        this.serviceWorker.addEventListener('message', event => {
+            this._logger.debug(`ServiceWorker message event: ${event}`);
         });
-    };
-    return ServiceWorkerClass;
-}());
-exports.ServiceWorkerClass = ServiceWorkerClass;
-function isAmplifyWithAnalytics(amplify) {
-    return amplify.Analytics && typeof amplify.Analytics.record === 'function';
+    }
 }
+exports.ServiceWorkerClass = ServiceWorkerClass;

package/lib/ServiceWorker/errorHelpers.d.ts

@@ -0,0 +1,7 @@
+import { AssertionFunction } from '../types';
+export declare enum ServiceWorkerErrorCode {
+    UndefinedInstance = "UndefinedInstance",
+    UndefinedRegistration = "UndefinedRegistration",
+    Unavailable = "Unavailable"
+}
+export declare const assert: AssertionFunction<ServiceWorkerErrorCode>;

package/lib/ServiceWorker/errorHelpers.js

@@ -0,0 +1,24 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = exports.ServiceWorkerErrorCode = void 0;
+const errors_1 = require("../errors");
+var ServiceWorkerErrorCode;
+(function (ServiceWorkerErrorCode) {
+    ServiceWorkerErrorCode["UndefinedInstance"] = "UndefinedInstance";
+    ServiceWorkerErrorCode["UndefinedRegistration"] = "UndefinedRegistration";
+    ServiceWorkerErrorCode["Unavailable"] = "Unavailable";
+})(ServiceWorkerErrorCode = exports.ServiceWorkerErrorCode || (exports.ServiceWorkerErrorCode = {}));
+const serviceWorkerErrorMap = {
+    [ServiceWorkerErrorCode.UndefinedInstance]: {
+        message: 'Service Worker instance is undefined.',
+    },
+    [ServiceWorkerErrorCode.UndefinedRegistration]: {
+        message: 'Service Worker registration is undefined.',
+    },
+    [ServiceWorkerErrorCode.Unavailable]: {
+        message: 'Service Worker not available.',
+    },
+};
+exports.assert = (0, errors_1.createAssertionFunction)(serviceWorkerErrorMap);

package/lib/ServiceWorker/index.d.ts

@@ -1,13 +1 @@
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 export { ServiceWorkerClass as ServiceWorker } from './ServiceWorker';

package/lib/ServiceWorker/index.js

@@ -1,18 +1,6 @@
 "use strict";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceWorker = void 0;
 var ServiceWorker_1 = require("./ServiceWorker");

package/lib/{Util → Signer}/DateUtils.js

@@ -7,32 +7,16 @@
  *
  * @see https://github.com/aws/aws-sdk-js/blob/6edf586dcc1de7fe8fbfbbd9a0d2b1847921e6e1/lib/util.js#L262
  */
-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;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateUtils = void 0;
 // Comment - TODO: remove
-var FIVE_MINUTES_IN_MS = 1000 * 60 * 5;
+const FIVE_MINUTES_IN_MS = 1000 * 60 * 5;
 exports.DateUtils = {
     /**
      * Milliseconds to offset the date to compensate for clock skew between device & services
      */
     clockOffset: 0,
-    getDateWithClockOffset: function () {
+    getDateWithClockOffset() {
         if (exports.DateUtils.clockOffset) {
             return new Date(new Date().getTime() + exports.DateUtils.clockOffset);
         }
@@ -43,33 +27,32 @@ exports.DateUtils = {
     /**
      * @returns {number} Clock offset in milliseconds
      */
-    getClockOffset: function () {
+    getClockOffset() {
         return exports.DateUtils.clockOffset;
     },
-    getHeaderStringFromDate: function (date) {
-        if (date === void 0) { date = exports.DateUtils.getDateWithClockOffset(); }
+    getHeaderStringFromDate(date = exports.DateUtils.getDateWithClockOffset()) {
         return date.toISOString().replace(/[:\-]|\.\d{3}/g, '');
     },
-    getDateFromHeaderString: function (header) {
-        var _a = __read(header.match(/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2}).+/), 7), year = _a[1], month = _a[2], day = _a[3], hour = _a[4], minute = _a[5], second = _a[6];
+    getDateFromHeaderString(header) {
+        const [, year, month, day, hour, minute, second] = header.match(/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2}).+/);
         return new Date(Date.UTC(Number(year), Number(month) - 1, Number(day), Number(hour), Number(minute), Number(second)));
     },
-    isClockSkewed: function (serverDate) {
+    isClockSkewed(serverDate) {
         // API gateway permits client calls that are off by no more than ±5 minutes
         return (Math.abs(serverDate.getTime() - exports.DateUtils.getDateWithClockOffset().getTime()) >= FIVE_MINUTES_IN_MS);
     },
-    isClockSkewError: function (error) {
+    isClockSkewError(error) {
         if (!error.response || !error.response.headers) {
             return false;
         }
-        var headers = error.response.headers;
+        const { headers } = error.response;
         return Boolean(['BadRequestException', 'InvalidSignatureException'].includes(headers['x-amzn-errortype']) &&
             (headers.date || headers.Date));
     },
     /**
      * @param {number} offset Clock offset in milliseconds
      */
-    setClockOffset: function (offset) {
+    setClockOffset(offset) {
         exports.DateUtils.clockOffset = offset;
     },
 };

package/lib/{Signer.js → Signer/Signer.js}

@@ -1,27 +1,15 @@
 "use strict";
 // 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);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signer = void 0;
-var Util_1 = require("./Util");
-var signatureV4_1 = require("./clients/middleware/signing/signer/signatureV4");
-var IOT_SERVICE_NAME = 'iotdevicegateway';
+const DateUtils_1 = require("./DateUtils");
+const signatureV4_1 = require("../clients/middleware/signing/signer/signatureV4");
+const amplifyUrl_1 = require("../utils/amplifyUrl");
+const IOT_SERVICE_NAME = 'iotdevicegateway';
 // Best practice regex to parse the service and region from an AWS endpoint
-var AWS_ENDPOINT_REGEX = /([^\.]+)\.(?:([^\.]*)\.)?amazonaws\.com(.cn)?$/;
-var Signer = /** @class */ (function () {
-    function Signer() {
-    }
+const AWS_ENDPOINT_REGEX = /([^\.]+)\.(?:([^\.]*)\.)?amazonaws\.com(.cn)?$/;
+class Signer {
     /**
     * Sign a HTTP request, add 'Authorization' header to request param
     * @method sign
@@ -58,14 +46,18 @@ var Signer = /** @class */ (function () {
     *
     * @returns {object} Signed HTTP request
     */
-    Signer.sign = function (request, accessInfo, serviceInfo) {
+    static sign(request, accessInfo, serviceInfo) {
         request.headers = request.headers || {};
         if (request.body && !request.data) {
             throw new Error('The attribute "body" was found on the request object. Please use the attribute "data" instead.');
         }
-        var requestToSign = __assign(__assign({}, request), { body: request.data, url: new URL(request.url) });
-        var options = getOptions(requestToSign, accessInfo, serviceInfo);
-        var signedRequest = (0, signatureV4_1.signRequest)(requestToSign, options);
+        const requestToSign = {
+            ...request,
+            body: request.data,
+            url: new amplifyUrl_1.AmplifyUrl(request.url),
+        };
+        const options = getOptions(requestToSign, accessInfo, serviceInfo);
+        const signedRequest = (0, signatureV4_1.signRequest)(requestToSign, options);
         // Prior to using `signRequest`, Signer accepted urls as strings and outputted urls as string. Coerce the property
         // back to a string so as not to disrupt consumers of Signer.
         signedRequest.url = signedRequest.url.toString();
@@ -77,42 +69,50 @@ var Signer = /** @class */ (function () {
         delete signedRequest.headers.authorization;
         delete signedRequest.headers['x-amz-security-token'];
         return signedRequest;
-    };
-    Signer.signUrl = function (urlOrRequest, accessInfo, serviceInfo, expiration) {
-        var urlToSign = typeof urlOrRequest === 'object' ? urlOrRequest.url : urlOrRequest;
-        var method = typeof urlOrRequest === 'object' ? urlOrRequest.method : 'GET';
-        var body = typeof urlOrRequest === 'object' ? urlOrRequest.body : undefined;
-        var presignable = {
-            body: body,
-            method: method,
-            url: new URL(urlToSign),
+    }
+    static signUrl(urlOrRequest, accessInfo, serviceInfo, expiration) {
+        const urlToSign = typeof urlOrRequest === 'object' ? urlOrRequest.url : urlOrRequest;
+        const method = typeof urlOrRequest === 'object' ? urlOrRequest.method : 'GET';
+        const body = typeof urlOrRequest === 'object' ? urlOrRequest.body : undefined;
+        const presignable = {
+            body,
+            method,
+            url: new amplifyUrl_1.AmplifyUrl(urlToSign),
         };
-        var options = getOptions(presignable, accessInfo, serviceInfo, expiration);
-        var signedUrl = (0, signatureV4_1.presignUrl)(presignable, options);
+        const options = getOptions(presignable, accessInfo, serviceInfo, expiration);
+        const signedUrl = (0, signatureV4_1.presignUrl)(presignable, options);
         if (accessInfo.session_token &&
             !sessionTokenRequiredInSigning(options.signingService)) {
             signedUrl.searchParams.append(signatureV4_1.TOKEN_QUERY_PARAM, accessInfo.session_token);
         }
         return signedUrl.toString();
-    };
-    return Signer;
-}());
+    }
+}
 exports.Signer = Signer;
-var getOptions = function (request, accessInfo, serviceInfo, expiration) {
-    var _a = accessInfo !== null && accessInfo !== void 0 ? accessInfo : {}, access_key = _a.access_key, secret_key = _a.secret_key, session_token = _a.session_token;
-    var _b = parseServiceInfo(request.url), urlRegion = _b.region, urlService = _b.service;
-    var _c = serviceInfo !== null && serviceInfo !== void 0 ? serviceInfo : {}, _d = _c.region, region = _d === void 0 ? urlRegion : _d, _e = _c.service, service = _e === void 0 ? urlService : _e;
-    var credentials = __assign({ accessKeyId: access_key, secretAccessKey: secret_key }, (sessionTokenRequiredInSigning(service)
-        ? { sessionToken: session_token }
-        : {}));
-    return __assign({ credentials: credentials, signingDate: Util_1.DateUtils.getDateWithClockOffset(), signingRegion: region, signingService: service }, (expiration && { expiration: expiration }));
+const getOptions = (request, accessInfo, serviceInfo, expiration) => {
+    const { access_key, secret_key, session_token } = accessInfo ?? {};
+    const { region: urlRegion, service: urlService } = parseServiceInfo(request.url);
+    const { region = urlRegion, service = urlService } = serviceInfo ?? {};
+    const credentials = {
+        accessKeyId: access_key,
+        secretAccessKey: secret_key,
+        ...(sessionTokenRequiredInSigning(service)
+            ? { sessionToken: session_token }
+            : {}),
+    };
+    return {
+        credentials,
+        signingDate: DateUtils_1.DateUtils.getDateWithClockOffset(),
+        signingRegion: region,
+        signingService: service,
+        ...(expiration && { expiration }),
+    };
 };
 // TODO: V6 investigate whether add to custom clients' general signer implementation.
-var parseServiceInfo = function (url) {
-    var _a;
-    var host = url.host;
-    var matched = (_a = host.match(AWS_ENDPOINT_REGEX)) !== null && _a !== void 0 ? _a : [];
-    var parsed = matched.slice(1, 3);
+const parseServiceInfo = (url) => {
+    const host = url.host;
+    const matched = host.match(AWS_ENDPOINT_REGEX) ?? [];
+    let parsed = matched.slice(1, 3);
     if (parsed[1] === 'es') {
         // Elastic Search
         parsed = parsed.reverse();
@@ -125,6 +125,4 @@ var parseServiceInfo = function (url) {
 // IoT service does not allow the session token in the canonical request
 // https://docs.aws.amazon.com/general/latest/gr/sigv4-add-signature-to-request.html
 // TODO: V6 investigate whether add to custom clients' general signer implementation.
-var sessionTokenRequiredInSigning = function (service) {
-    return service !== IOT_SERVICE_NAME;
-};
+const sessionTokenRequiredInSigning = (service) => service !== IOT_SERVICE_NAME;

package/lib/Signer/index.d.ts

@@ -0,0 +1 @@
+export { Signer } from './Signer';

package/lib/Signer/index.js

@@ -0,0 +1,7 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Signer = void 0;
+var Signer_1 = require("./Signer");
+Object.defineProperty(exports, "Signer", { enumerable: true, get: function () { return Signer_1.Signer; } });

package/lib/adapterCore/error/AmplifyServerContextError.d.ts

@@ -1,4 +1,4 @@
-import { AmplifyError } from '../../libraryUtils';
+import { AmplifyError } from '../../errors';
 export declare class AmplifyServerContextError extends AmplifyError {
     constructor({ message, recoverySuggestion, underlyingError, }: {
         message: string;