@aws-amplify/core 6.0.1-ssr-api.df60e41.0 → 6.0.1-unstable.04fd02c.0

package/lib/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.1-ssr-api.df60e41.0+df60e41";
+export declare const version = "6.0.1-unstable.04fd02c.0+04fd02c";

package/lib/Platform/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // generated by genversion
-exports.version = '6.0.1-ssr-api.df60e41.0+df60e41';
+exports.version = '6.0.1-unstable.04fd02c.0+04fd02c';

package/lib/Signer/DateUtils.d.ts

@@ -14,5 +14,14 @@ type DateUtils = {
     isClockSkewError: (error: any) => boolean;
     setClockOffset: (offset: number) => void;
 };
+/**
+ * This utility is intended to be deprecated and replaced by `signRequest` and `presignUrl` functions from
+ * `clients/middleware/signing/signer/signatureV4`.
+ *
+ * TODO: refactor the logics here into `signRequest` and `presignUrl` functions and remove this class.
+ *
+ * @internal
+ * @deprecated
+ */
 export declare const DateUtils: DateUtils;
 export {};

package/lib/Signer/DateUtils.js

@@ -9,8 +9,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DateUtils = void 0;
-// Comment - TODO: remove
 const FIVE_MINUTES_IN_MS = 1000 * 60 * 5;
+/**
+ * This utility is intended to be deprecated and replaced by `signRequest` and `presignUrl` functions from
+ * `clients/middleware/signing/signer/signatureV4`.
+ *
+ * TODO: refactor the logics here into `signRequest` and `presignUrl` functions and remove this class.
+ *
+ * @internal
+ * @deprecated
+ */
 exports.DateUtils = {
     /**
      * Milliseconds to offset the date to compensate for clock skew between device & services

package/lib/Signer/Signer.d.ts

@@ -1,3 +1,12 @@
+/**
+ * This class is intended to be deprecated and replaced by `signRequest` and `presignUrl` functions from
+ * `clients/middleware/signing/signer/signatureV4`.
+ *
+ * TODO: refactor the logics here into `signRequest` and `presignUrl` functions and remove this class.
+ *
+ * @internal
+ * @deprecated
+ */
 export declare class Signer {
     /**
     * Sign a HTTP request, add 'Authorization' header to request param

package/lib/Signer/Signer.js

@@ -9,6 +9,15 @@ const amplifyUrl_1 = require("../utils/amplifyUrl");
 const IOT_SERVICE_NAME = 'iotdevicegateway';
 // Best practice regex to parse the service and region from an AWS endpoint
 const AWS_ENDPOINT_REGEX = /([^\.]+)\.(?:([^\.]*)\.)?amazonaws\.com(.cn)?$/;
+/**
+ * This class is intended to be deprecated and replaced by `signRequest` and `presignUrl` functions from
+ * `clients/middleware/signing/signer/signatureV4`.
+ *
+ * TODO: refactor the logics here into `signRequest` and `presignUrl` functions and remove this class.
+ *
+ * @internal
+ * @deprecated
+ */
 class Signer {
     /**
     * Sign a HTTP request, add 'Authorization' header to request param
@@ -108,7 +117,6 @@ const getOptions = (request, accessInfo, serviceInfo, expiration) => {
         ...(expiration && { expiration }),
     };
 };
-// TODO: V6 investigate whether add to custom clients' general signer implementation.
 const parseServiceInfo = (url) => {
     const host = url.host;
     const matched = host.match(AWS_ENDPOINT_REGEX) ?? [];
@@ -124,5 +132,4 @@ const parseServiceInfo = (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.
 const sessionTokenRequiredInSigning = (service) => service !== IOT_SERVICE_NAME;

package/lib/clients/middleware/signing/signer/signatureV4/index.js

@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHashedPayload = exports.TOKEN_QUERY_PARAM = exports.presignUrl = exports.signRequest = void 0;
-// TODO: V6 replace Signer
 var signRequest_1 = require("./signRequest");
 Object.defineProperty(exports, "signRequest", { enumerable: true, get: function () { return signRequest_1.signRequest; } });
 var presignUrl_1 = require("./presignUrl");

package/lib/libraryUtils.d.ts

@@ -1,3 +1,4 @@
+import WordArray from './utils/WordArray';
 export { generateRandomString, isBrowser, isNonRetryableError, isWebWorker, jitteredBackoff, jitteredExponentialRetry, NonRetryableError, retry, urlSafeDecode, urlSafeEncode, } from './utils';
 export { parseAWSExports } from './parseAWSExports';
 export { LegacyConfig } from './singleton/types';
@@ -21,6 +22,8 @@ export { fetchAuthSession } from './singleton/apis/internal/fetchAuthSession';
 export { AMPLIFY_SYMBOL } from './Hub';
 export { base64Decoder, base64Encoder } from './utils/convert';
 export { getCrypto } from './utils/globalHelpers';
+export { cryptoSecureRandomInt } from './utils/cryptoSecureRandomInt';
+export { WordArray };
 export { HubInternal } from './Hub';
 export { sessionListener } from './utils/sessionListener';
 export { SessionState } from './utils/sessionListener/types';

package/lib/libraryUtils.js

@@ -1,9 +1,14 @@
 "use strict";
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.base64Encoder = exports.base64Decoder = exports.AMPLIFY_SYMBOL = exports.fetchAuthSession = exports.USER_AGENT_HEADER = exports.INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = exports.Reachability = exports.Mutex = exports.BackgroundProcessManager = exports.AmplifyErrorCode = exports.createAssertionFunction = exports.PlatformNotSupportedError = exports.AmplifyError = exports.setCustomUserAgent = exports.StorageAction = exports.PushNotificationAction = exports.PubSubAction = exports.PredictionsAction = exports.InAppMessagingAction = exports.InteractionsAction = exports.GeoAction = exports.Framework = exports.DataStoreAction = exports.Category = exports.AnalyticsAction = exports.AuthAction = exports.ApiAction = exports.getAmplifyUserAgent = exports.getAmplifyUserAgentObject = exports.Platform = exports.Signer = exports.isTokenExpired = exports.assertOAuthConfig = exports.assertIdentityPoolIdConfig = exports.assertTokenProviderConfig = exports.decodeJWT = exports.AmplifyUrlSearchParams = exports.AmplifyUrl = exports.amplifyUuid = exports.parseAWSExports = exports.urlSafeEncode = exports.urlSafeDecode = exports.retry = exports.NonRetryableError = exports.jitteredExponentialRetry = exports.jitteredBackoff = exports.isWebWorker = exports.isNonRetryableError = exports.isBrowser = exports.generateRandomString = void 0;
-exports.SESSION_STOP_EVENT = exports.SESSION_START_EVENT = exports.sessionListener = exports.HubInternal = exports.getCrypto = void 0;
+exports.SESSION_STOP_EVENT = exports.SESSION_START_EVENT = exports.sessionListener = exports.HubInternal = exports.WordArray = exports.cryptoSecureRandomInt = exports.getCrypto = void 0;
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+const WordArray_1 = __importDefault(require("./utils/WordArray"));
+exports.WordArray = WordArray_1.default;
 /*
 This file maps top-level exports from `@aws-amplify/core/internals/utils`. These are intended to be internal
 utils for use throughout the library.
@@ -84,6 +89,8 @@ Object.defineProperty(exports, "base64Decoder", { enumerable: true, get: functio
 Object.defineProperty(exports, "base64Encoder", { enumerable: true, get: function () { return convert_1.base64Encoder; } });
 var globalHelpers_1 = require("./utils/globalHelpers");
 Object.defineProperty(exports, "getCrypto", { enumerable: true, get: function () { return globalHelpers_1.getCrypto; } });
+var cryptoSecureRandomInt_1 = require("./utils/cryptoSecureRandomInt");
+Object.defineProperty(exports, "cryptoSecureRandomInt", { enumerable: true, get: function () { return cryptoSecureRandomInt_1.cryptoSecureRandomInt; } });
 // Hub
 var Hub_2 = require("./Hub");
 Object.defineProperty(exports, "HubInternal", { enumerable: true, get: function () { return Hub_2.HubInternal; } });

package/lib/providers/kinesis/types/kinesis.d.ts

@@ -1,5 +1,5 @@
 export type KinesisProviderConfig = {
-    Kinesis?: {
+    Kinesis: {
         region: string;
         bufferSize?: number;
         flushSize?: number;

package/lib/providers/kinesis-firehose/types/kinesis-firehose.d.ts

@@ -1,5 +1,5 @@
 export type KinesisFirehoseProviderConfig = {
-    KinesisFirehose?: {
+    KinesisFirehose: {
         region: string;
         bufferSize?: number;
         flushSize?: number;

package/lib/providers/personalize/types/personalize.d.ts

@@ -1,5 +1,5 @@
 export type PersonalizeProviderConfig = {
-    Personalize?: {
+    Personalize: {
         trackingId: string;
         region: string;
         flushSize?: number;

package/lib/providers/pinpoint/types/pinpoint.d.ts

@@ -3,7 +3,7 @@ import { UserProfile } from '../../../types';
 export type SupportedCategory = 'Analytics' | 'Core' | 'InAppMessaging' | 'PushNotification';
 type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 export type PinpointProviderConfig = {
-    Pinpoint?: {
+    Pinpoint: {
         appId: string;
         region: string;
     };

package/lib/singleton/Amplify.d.ts

@@ -14,6 +14,10 @@ export declare class AmplifyClass {
      * Configures Amplify for use with your back-end resources.
      *
      * @remarks
+     * This API does not perform any merging of either `resourcesConfig` or `libraryOptions`. The most recently
+     * provided values will be used after configuration.
+     *
+     * @remarks
      * `configure` can be used to specify additional library options where available for supported categories.
      *
      * @param resourceConfig - Back-end resource configuration. Typically provided via the `aws-exports.js` file.

package/lib/singleton/Amplify.js

@@ -17,12 +17,16 @@ class AmplifyClass {
      * Configures Amplify for use with your back-end resources.
      *
      * @remarks
+     * This API does not perform any merging of either `resourcesConfig` or `libraryOptions`. The most recently
+     * provided values will be used after configuration.
+     *
+     * @remarks
      * `configure` can be used to specify additional library options where available for supported categories.
      *
      * @param resourceConfig - Back-end resource configuration. Typically provided via the `aws-exports.js` file.
      * @param libraryOptions - Additional options for customizing the behavior of the library.
      */
-    configure(resourcesConfig, libraryOptions = {}) {
+    configure(resourcesConfig, libraryOptions) {
         let resolvedResourceConfig;
         if (Object.keys(resourcesConfig).some(key => key.startsWith('aws_'))) {
             resolvedResourceConfig = (0, parseAWSExports_1.parseAWSExports)(resourcesConfig);
@@ -30,8 +34,10 @@ class AmplifyClass {
         else {
             resolvedResourceConfig = resourcesConfig;
         }
-        this.resourcesConfig = mergeResourceConfig(this.resourcesConfig, resolvedResourceConfig);
-        this.libraryOptions = mergeLibraryOptions(this.libraryOptions, libraryOptions);
+        this.resourcesConfig = resolvedResourceConfig;
+        if (libraryOptions) {
+            this.libraryOptions = libraryOptions;
+        }
         // Make resource config immutable
         this.resourcesConfig = (0, utils_1.deepFreeze)(this.resourcesConfig);
         this.Auth.configure(this.resourcesConfig.Auth, this.libraryOptions.Auth);
@@ -57,31 +63,3 @@ exports.AmplifyClass = AmplifyClass;
  * `Amplify` is responsible for orchestrating cross-category communication within the library.
  */
 exports.Amplify = new AmplifyClass();
-// TODO(v6): validate until which level this will nested, during Amplify.configure API review.
-function mergeResourceConfig(existingConfig, newConfig) {
-    const resultConfig = {};
-    for (const category of Object.keys(existingConfig)) {
-        resultConfig[category] = existingConfig[category];
-    }
-    for (const key of Object.keys(newConfig)) {
-        resultConfig[key] = {
-            ...resultConfig[key],
-            ...newConfig[key],
-        };
-    }
-    return resultConfig;
-}
-function mergeLibraryOptions(existingConfig, newConfig) {
-    const resultConfig = {};
-    for (const category of Object.keys(existingConfig)) {
-        resultConfig[category] = existingConfig[category];
-    }
-    for (const key of Object.keys(newConfig).filter(key => key !== 'ssr')) {
-        resultConfig[key] = {
-            ...resultConfig[key],
-            ...newConfig[key],
-        };
-    }
-    resultConfig.ssr = newConfig.ssr;
-    return resultConfig;
-}

package/lib/singleton/Analytics/types.d.ts

@@ -2,4 +2,8 @@ import { PinpointProviderConfig } from '../../providers/pinpoint/types';
 import { KinesisProviderConfig } from '../../providers/kinesis/types';
 import { KinesisFirehoseProviderConfig } from '../../providers/kinesis-firehose/types';
 import { PersonalizeProviderConfig } from '../../providers/personalize/types';
-export type AnalyticsConfig = PinpointProviderConfig & KinesisProviderConfig & KinesisFirehoseProviderConfig & PersonalizeProviderConfig;
+type AtLeastOne<T, U = {
+    [K in keyof T]: Pick<T, K>;
+}> = Partial<T> & U[keyof U];
+export type AnalyticsConfig = AtLeastOne<PinpointProviderConfig & KinesisProviderConfig & KinesisFirehoseProviderConfig & PersonalizeProviderConfig>;
+export {};