@aws-amplify/core 6.0.1-console-preview.8f82e46.0 → 6.0.1-console-preview.b278dcb.0

package/lib/Cache/StorageCacheCommon.js

@@ -61,7 +61,6 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageCacheCommon = void 0;
-var singleton_1 = require("../singleton");
 var Logger_1 = require("../Logger");
 var constants_1 = require("./constants");
 var utils_1 = require("./utils");
@@ -79,9 +78,7 @@ var StorageCacheCommon = /** @class */ (function () {
      */
     function StorageCacheCommon(_a) {
         var config = _a.config, keyValueStorage = _a.keyValueStorage;
-        var _b;
-        var globalCacheConfig = (_b = singleton_1.Amplify.getConfig().Cache) !== null && _b !== void 0 ? _b : {};
-        this.config = __assign(__assign(__assign({}, constants_1.defaultConfig), globalCacheConfig), config);
+        this.config = __assign(__assign({}, constants_1.defaultConfig), config);
         this.keyValueStorage = keyValueStorage;
         this.sanitizeConfig();
     }

package/lib/I18n/I18n.js

@@ -15,7 +15,6 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.I18n = void 0;
 var Logger_1 = require("../Logger");
-var singleton_1 = require("../singleton");
 var logger = new Logger_1.ConsoleLogger('I18n');
 /**
  * Language translation utility.
@@ -44,11 +43,7 @@ var I18n = /** @class */ (function () {
      * Sets the default language from the configuration when required.
      */
     I18n.prototype.setDefaultLanguage = function () {
-        if (!this._lang) {
-            var i18nConfig = singleton_1.Amplify.getConfig().I18n;
-            this._lang = i18nConfig === null || i18nConfig === void 0 ? void 0 : i18nConfig.language;
-        }
-        // Default to window language if not set in config
+        // Default to window language if not set in instance
         if (!this._lang &&
             typeof window !== 'undefined' &&
             window &&

package/lib/Platform/types.d.ts

@@ -73,7 +73,14 @@ export declare enum DataStoreAction {
     GraphQl = "2"
 }
 export declare enum GeoAction {
-    None = "0"
+    SearchByText = "0",
+    SearchByCoordinates = "1",
+    SearchForSuggestions = "2",
+    SearchByPlaceId = "3",
+    SaveGeofences = "4",
+    GetGeofence = "5",
+    ListGeofences = "6",
+    DeleteGeofences = "7"
 }
 export declare enum InAppMessagingAction {
     SyncMessages = "1",
@@ -92,7 +99,8 @@ export declare enum PubSubAction {
     Subscribe = "1"
 }
 export declare enum PushNotificationAction {
-    None = "0"
+    InitializePushNotifications = "1",
+    IdentifyUser = "2"
 }
 export declare enum StorageAction {
     UploadData = "1",
@@ -139,23 +147,25 @@ export type CategoryUserAgentStateMap = Record<string, {
 }>;
 export type CustomUserAgentStateMap = Record<string, CategoryUserAgentStateMap>;
 export type AdditionalDetails = [string, string?][];
-type StorageUserAgentInput = {
+export type StorageUserAgentInput = {
     category: Category.Storage;
     apis: StorageAction[];
+    additionalDetails: AdditionalDetails;
 };
-type AuthUserAgentInput = {
+export type AuthUserAgentInput = {
     category: Category.Auth;
     apis: AuthAction[];
+    additionalDetails: AdditionalDetails;
 };
-type InAppMessagingUserAgentInput = {
+export type InAppMessagingUserAgentInput = {
     category: Category.InAppMessaging;
     apis: InAppMessagingAction[];
+    additionalDetails: AdditionalDetails;
 };
-type GeoUserAgentInput = {
+export type GeoUserAgentInput = {
     category: Category.Geo;
     apis: GeoAction[];
-};
-export type SetCustomUserAgentInput = (StorageUserAgentInput | AuthUserAgentInput | InAppMessagingUserAgentInput | GeoUserAgentInput) & {
     additionalDetails: AdditionalDetails;
 };
+export type SetCustomUserAgentInput = StorageUserAgentInput | AuthUserAgentInput | InAppMessagingUserAgentInput | GeoUserAgentInput;
 export {};

package/lib/Platform/types.js

@@ -88,7 +88,14 @@ var DataStoreAction;
 })(DataStoreAction = exports.DataStoreAction || (exports.DataStoreAction = {}));
 var GeoAction;
 (function (GeoAction) {
-    GeoAction["None"] = "0";
+    GeoAction["SearchByText"] = "0";
+    GeoAction["SearchByCoordinates"] = "1";
+    GeoAction["SearchForSuggestions"] = "2";
+    GeoAction["SearchByPlaceId"] = "3";
+    GeoAction["SaveGeofences"] = "4";
+    GeoAction["GetGeofence"] = "5";
+    GeoAction["ListGeofences"] = "6";
+    GeoAction["DeleteGeofences"] = "7";
 })(GeoAction = exports.GeoAction || (exports.GeoAction = {}));
 var InAppMessagingAction;
 (function (InAppMessagingAction) {
@@ -112,7 +119,8 @@ var PubSubAction;
 })(PubSubAction = exports.PubSubAction || (exports.PubSubAction = {}));
 var PushNotificationAction;
 (function (PushNotificationAction) {
-    PushNotificationAction["None"] = "0";
+    PushNotificationAction["InitializePushNotifications"] = "1";
+    PushNotificationAction["IdentifyUser"] = "2";
 })(PushNotificationAction = exports.PushNotificationAction || (exports.PushNotificationAction = {}));
 var StorageAction;
 (function (StorageAction) {

package/lib/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.1-console-preview.8f82e46.0+8f82e46";
+export declare const version = "6.0.1-console-preview.b278dcb.0+b278dcb";

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-console-preview.8f82e46.0+8f82e46';
+exports.version = '6.0.1-console-preview.b278dcb.0+b278dcb';

package/lib/Reachability/Reachability.js

@@ -20,7 +20,12 @@ var Reachability = exports.Reachability = /** @class */ (function () {
     function Reachability() {
     }
     Reachability.prototype.networkMonitor = function (_) {
-        var globalObj = (0, libraryUtils_1.isWebWorker)() ? self : window;
+        var globalObj = (0, libraryUtils_1.isWebWorker)()
+            ? self
+            : typeof window !== 'undefined' && window;
+        if (!globalObj) {
+            return (0, rxjs_1.from)([{ online: true }]);
+        }
         return new rxjs_1.Observable(function (observer) {
             observer.next({ online: globalObj.navigator.onLine });
             var notifyOnline = function () { return observer.next({ online: true }); };

package/lib/errors/errorHelpers.d.ts

@@ -0,0 +1,2 @@
+import { AmplifyErrorCode, AssertionFunction } from '../types';
+export declare const assert: AssertionFunction<AmplifyErrorCode>;

package/lib/errors/errorHelpers.js

@@ -0,0 +1,20 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+var createAssertionFunction_1 = require("./createAssertionFunction");
+var types_1 = require("../types");
+var amplifyErrorMap = (_a = {},
+    _a[types_1.AmplifyErrorCode.NoEndpointId] = {
+        message: 'Endpoint ID was not found and was unable to be created.',
+    },
+    _a[types_1.AmplifyErrorCode.PlatformNotSupported] = {
+        message: 'Function not supported on current platform.',
+    },
+    _a[types_1.AmplifyErrorCode.Unknown] = {
+        message: 'An unknown error occurred.',
+    },
+    _a);
+exports.assert = (0, createAssertionFunction_1.createAssertionFunction)(amplifyErrorMap);

package/lib/errors/index.d.ts

@@ -1,3 +1,4 @@
 export { AmplifyError } from './AmplifyError';
 export { createAssertionFunction } from './createAssertionFunction';
 export { PlatformNotSupportedError } from './PlatformNotSupportedError';
+export { assert } from './errorHelpers';

package/lib/errors/index.js

@@ -2,10 +2,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PlatformNotSupportedError = exports.createAssertionFunction = exports.AmplifyError = void 0;
+exports.assert = exports.PlatformNotSupportedError = exports.createAssertionFunction = exports.AmplifyError = void 0;
 var AmplifyError_1 = require("./AmplifyError");
 Object.defineProperty(exports, "AmplifyError", { enumerable: true, get: function () { return AmplifyError_1.AmplifyError; } });
 var createAssertionFunction_1 = require("./createAssertionFunction");
 Object.defineProperty(exports, "createAssertionFunction", { enumerable: true, get: function () { return createAssertionFunction_1.createAssertionFunction; } });
 var PlatformNotSupportedError_1 = require("./PlatformNotSupportedError");
 Object.defineProperty(exports, "PlatformNotSupportedError", { enumerable: true, get: function () { return PlatformNotSupportedError_1.PlatformNotSupportedError; } });
+var errorHelpers_1 = require("./errorHelpers");
+Object.defineProperty(exports, "assert", { enumerable: true, get: function () { return errorHelpers_1.assert; } });

package/lib/index.d.ts

@@ -1,12 +1,14 @@
 export { Hub } from './Hub';
 export { HubCapsule, HubCallback, HubPayload } from './Hub/types';
 export { TokenProvider, AuthTokens, FetchAuthSessionOptions, AWSCredentialsAndIdentityIdProvider, AWSCredentialsAndIdentityId, Identity, OAuthConfig, CognitoUserPoolConfig, } from './singleton/Auth/types';
-export { AuthConfig, AuthUserPoolConfig, AuthUserPoolAndIdentityPoolConfig, APIConfig, CacheConfig, StorageAccessLevel, StorageConfig, GetCredentialsOptions, ResourcesConfig, LibraryOptions, AnalyticsConfig, GeoConfig, } from './singleton/types';
+export { AuthConfig, AuthUserPoolConfig, AuthUserPoolAndIdentityPoolConfig, APIConfig, StorageAccessLevel, StorageConfig, GetCredentialsOptions, ResourcesConfig, LibraryOptions, AnalyticsConfig, GeoConfig, } from './singleton/types';
 export { Amplify, fetchAuthSession, AmplifyClass as AmplifyClassV6, clearCredentials, } from './singleton';
 export { getCredentialsForIdentity, getId, GetCredentialsForIdentityInput, GetCredentialsForIdentityOutput, } from './awsClients/cognitoIdentity';
 export { UserProfile } from './types';
 export { CookieStorage, defaultStorage, sessionStorage, sharedInMemoryStorage, } from './storage';
 export { KeyValueStorageInterface } from './types';
 export { Cache } from './Cache';
+export { CacheConfig } from './Cache/types';
 export { I18n } from './I18n';
+export { ConsoleLogger } from './Logger';
 export { ServiceWorker } from './ServiceWorker';

package/lib/index.js

@@ -2,7 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServiceWorker = exports.I18n = exports.Cache = exports.sharedInMemoryStorage = exports.sessionStorage = exports.defaultStorage = exports.CookieStorage = exports.getId = exports.getCredentialsForIdentity = exports.clearCredentials = exports.AmplifyClassV6 = exports.fetchAuthSession = exports.Amplify = exports.Hub = void 0;
+exports.ServiceWorker = exports.ConsoleLogger = exports.I18n = exports.Cache = exports.sharedInMemoryStorage = exports.sessionStorage = exports.defaultStorage = exports.CookieStorage = exports.getId = exports.getCredentialsForIdentity = exports.clearCredentials = exports.AmplifyClassV6 = exports.fetchAuthSession = exports.Amplify = exports.Hub = void 0;
 /*
 This file maps top-level exports from `@aws-amplify/core`. These are intended to be potentially customer-facing exports.
 */
@@ -30,6 +30,9 @@ Object.defineProperty(exports, "Cache", { enumerable: true, get: function () { r
 // Internationalization utilities
 var I18n_1 = require("./I18n");
 Object.defineProperty(exports, "I18n", { enumerable: true, get: function () { return I18n_1.I18n; } });
+// Logging utilities
+var Logger_1 = require("./Logger");
+Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return Logger_1.ConsoleLogger; } });
 // Service worker
 var ServiceWorker_1 = require("./ServiceWorker");
 Object.defineProperty(exports, "ServiceWorker", { enumerable: true, get: function () { return ServiceWorker_1.ServiceWorker; } });

package/lib/libraryUtils.d.ts

@@ -7,19 +7,20 @@ export { decodeJWT, assertTokenProviderConfig, assertIdentityPoolIdConfig, asser
 export { isTokenExpired } from './singleton/Auth';
 export { GraphQLAuthMode, DocumentType } from './singleton/API/types';
 export { Signer } from './Signer';
-export { JWT, StrictUnion, CognitoIdentityPoolConfig, JwtPayload, AuthStandardAttributeKey, AuthVerifiableAttributeKey, AWSCredentials } from './singleton/Auth/types';
-export { ConsoleLogger, ConsoleLogger as Logger } from './Logger';
+export { JWT, StrictUnion, CognitoIdentityPoolConfig, JwtPayload, AuthStandardAttributeKey, AuthVerifiableAttributeKey, AWSCredentials, } from './singleton/Auth/types';
 export { Platform, getAmplifyUserAgentObject, getAmplifyUserAgent, } from './Platform';
-export { ApiAction, AuthAction, AnalyticsAction, Category, CustomUserAgentDetails, DataStoreAction, Framework, GeoAction, InteractionsAction, InAppMessagingAction, PredictionsAction, PubSubAction, PushNotificationAction, StorageAction, SetCustomUserAgentInput, } from './Platform/types';
+export { ApiAction, AuthAction, AnalyticsAction, Category, CustomUserAgentDetails, DataStoreAction, Framework, GeoAction, InteractionsAction, InAppMessagingAction, PredictionsAction, PubSubAction, PushNotificationAction, StorageAction, SetCustomUserAgentInput, StorageUserAgentInput, AuthUserAgentInput, InAppMessagingUserAgentInput, GeoUserAgentInput, } from './Platform/types';
 export { setCustomUserAgent } from './Platform/customUserAgent';
+export { AmplifyError, PlatformNotSupportedError, createAssertionFunction, } from './errors';
+export { AmplifyErrorCode, AmplifyErrorMap, AmplifyErrorParams, AssertionFunction, ServiceError, } from './types';
 export { BackgroundProcessManager } from './BackgroundProcessManager';
 export { Mutex } from './Mutex';
 export { Reachability } from './Reachability';
-export { AmplifyError, PlatformNotSupportedError, createAssertionFunction, } from './errors';
-export { AmplifyErrorCode, AmplifyErrorMap, AmplifyErrorParams, AssertionFunction, ServiceError, } from './types';
 export { INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER, USER_AGENT_HEADER, } from './constants';
 export { fetchAuthSession } from './singleton/apis/internal/fetchAuthSession';
 export { AMPLIFY_SYMBOL } from './Hub';
 export { base64Decoder, base64Encoder } from './utils/convert';
 export { getCrypto } from './utils/globalHelpers';
 export { HubInternal } from './Hub';
+export { sessionListener } from './utils/sessionListener';
+export { SessionState } from './utils/sessionListener/types';

package/lib/libraryUtils.js

@@ -2,8 +2,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AMPLIFY_SYMBOL = exports.fetchAuthSession = exports.USER_AGENT_HEADER = exports.INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = exports.AmplifyErrorCode = exports.createAssertionFunction = exports.PlatformNotSupportedError = exports.AmplifyError = exports.Reachability = exports.Mutex = exports.BackgroundProcessManager = 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.Logger = exports.ConsoleLogger = 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.HubInternal = exports.getCrypto = exports.base64Encoder = exports.base64Decoder = void 0;
+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.sessionListener = exports.HubInternal = exports.getCrypto = void 0;
 /*
 This file maps top-level exports from `@aws-amplify/core/internals/utils`. These are intended to be internal
 utils for use throughout the library.
@@ -37,10 +37,6 @@ var Auth_1 = require("./singleton/Auth");
 Object.defineProperty(exports, "isTokenExpired", { enumerable: true, get: function () { return Auth_1.isTokenExpired; } });
 var Signer_1 = require("./Signer");
 Object.defineProperty(exports, "Signer", { enumerable: true, get: function () { return Signer_1.Signer; } });
-// Logging utilities
-var Logger_1 = require("./Logger");
-Object.defineProperty(exports, "ConsoleLogger", { enumerable: true, get: function () { return Logger_1.ConsoleLogger; } });
-Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return Logger_1.ConsoleLogger; } });
 // Platform & user-agent utilities
 var Platform_1 = require("./Platform");
 Object.defineProperty(exports, "Platform", { enumerable: true, get: function () { return Platform_1.Platform; } });
@@ -62,6 +58,13 @@ Object.defineProperty(exports, "PushNotificationAction", { enumerable: true, get
 Object.defineProperty(exports, "StorageAction", { enumerable: true, get: function () { return types_1.StorageAction; } });
 var customUserAgent_1 = require("./Platform/customUserAgent");
 Object.defineProperty(exports, "setCustomUserAgent", { enumerable: true, get: function () { return customUserAgent_1.setCustomUserAgent; } });
+// Error handling
+var errors_1 = require("./errors");
+Object.defineProperty(exports, "AmplifyError", { enumerable: true, get: function () { return errors_1.AmplifyError; } });
+Object.defineProperty(exports, "PlatformNotSupportedError", { enumerable: true, get: function () { return errors_1.PlatformNotSupportedError; } });
+Object.defineProperty(exports, "createAssertionFunction", { enumerable: true, get: function () { return errors_1.createAssertionFunction; } });
+var types_2 = require("./types");
+Object.defineProperty(exports, "AmplifyErrorCode", { enumerable: true, get: function () { return types_2.AmplifyErrorCode; } });
 // Other utilities & constants
 var BackgroundProcessManager_1 = require("./BackgroundProcessManager");
 Object.defineProperty(exports, "BackgroundProcessManager", { enumerable: true, get: function () { return BackgroundProcessManager_1.BackgroundProcessManager; } });
@@ -69,12 +72,6 @@ var Mutex_1 = require("./Mutex");
 Object.defineProperty(exports, "Mutex", { enumerable: true, get: function () { return Mutex_1.Mutex; } });
 var Reachability_1 = require("./Reachability");
 Object.defineProperty(exports, "Reachability", { enumerable: true, get: function () { return Reachability_1.Reachability; } });
-var errors_1 = require("./errors");
-Object.defineProperty(exports, "AmplifyError", { enumerable: true, get: function () { return errors_1.AmplifyError; } });
-Object.defineProperty(exports, "PlatformNotSupportedError", { enumerable: true, get: function () { return errors_1.PlatformNotSupportedError; } });
-Object.defineProperty(exports, "createAssertionFunction", { enumerable: true, get: function () { return errors_1.createAssertionFunction; } });
-var types_2 = require("./types");
-Object.defineProperty(exports, "AmplifyErrorCode", { enumerable: true, get: function () { return types_2.AmplifyErrorCode; } });
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER", { enumerable: true, get: function () { return constants_1.INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER; } });
 Object.defineProperty(exports, "USER_AGENT_HEADER", { enumerable: true, get: function () { return constants_1.USER_AGENT_HEADER; } });
@@ -90,3 +87,6 @@ Object.defineProperty(exports, "getCrypto", { enumerable: true, get: function ()
 // Hub
 var Hub_2 = require("./Hub");
 Object.defineProperty(exports, "HubInternal", { enumerable: true, get: function () { return Hub_2.HubInternal; } });
+// Session listener
+var sessionListener_1 = require("./utils/sessionListener");
+Object.defineProperty(exports, "sessionListener", { enumerable: true, get: function () { return sessionListener_1.sessionListener; } });

package/lib/parseAWSExports.js

@@ -58,9 +58,9 @@ var authTypeMapping = {
  * @returns A {@link ResourcesConfig} object.
  */
 var parseAWSExports = function (config) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     if (config === void 0) { config = {}; }
-    var aws_appsync_apiKey = config.aws_appsync_apiKey, aws_appsync_authenticationType = config.aws_appsync_authenticationType, aws_appsync_graphqlEndpoint = config.aws_appsync_graphqlEndpoint, aws_appsync_region = config.aws_appsync_region, aws_cognito_identity_pool_id = config.aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method = config.aws_cognito_sign_up_verification_method, aws_cognito_mfa_configuration = config.aws_cognito_mfa_configuration, aws_cognito_mfa_types = config.aws_cognito_mfa_types, aws_cognito_password_protection_settings = config.aws_cognito_password_protection_settings, aws_cognito_verification_mechanisms = config.aws_cognito_verification_mechanisms, aws_cognito_signup_attributes = config.aws_cognito_signup_attributes, aws_cognito_username_attributes = config.aws_cognito_username_attributes, aws_mandatory_sign_in = config.aws_mandatory_sign_in, aws_mobile_analytics_app_id = config.aws_mobile_analytics_app_id, aws_mobile_analytics_app_region = config.aws_mobile_analytics_app_region, aws_user_files_s3_bucket = config.aws_user_files_s3_bucket, aws_user_files_s3_bucket_region = config.aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing = config.aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id = config.aws_user_pools_id, aws_user_pools_web_client_id = config.aws_user_pools_web_client_id, geo = config.geo, oauth = config.oauth, aws_cloud_logic_custom = config.aws_cloud_logic_custom, Notifications = config.Notifications;
+    var aws_appsync_apiKey = config.aws_appsync_apiKey, aws_appsync_authenticationType = config.aws_appsync_authenticationType, aws_appsync_graphqlEndpoint = config.aws_appsync_graphqlEndpoint, aws_appsync_region = config.aws_appsync_region, aws_bots = config.aws_bots, aws_bots_config = config.aws_bots_config, aws_cognito_identity_pool_id = config.aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method = config.aws_cognito_sign_up_verification_method, aws_cognito_mfa_configuration = config.aws_cognito_mfa_configuration, aws_cognito_mfa_types = config.aws_cognito_mfa_types, aws_cognito_password_protection_settings = config.aws_cognito_password_protection_settings, aws_cognito_verification_mechanisms = config.aws_cognito_verification_mechanisms, aws_cognito_signup_attributes = config.aws_cognito_signup_attributes, aws_cognito_username_attributes = config.aws_cognito_username_attributes, aws_mandatory_sign_in = config.aws_mandatory_sign_in, aws_mobile_analytics_app_id = config.aws_mobile_analytics_app_id, aws_mobile_analytics_app_region = config.aws_mobile_analytics_app_region, aws_user_files_s3_bucket = config.aws_user_files_s3_bucket, aws_user_files_s3_bucket_region = config.aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing = config.aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id = config.aws_user_pools_id, aws_user_pools_web_client_id = config.aws_user_pools_web_client_id, geo = config.geo, oauth = config.oauth, aws_cloud_logic_custom = config.aws_cloud_logic_custom, Notifications = config.Notifications;
     var amplifyConfig = {};
     // Analytics
     if (aws_mobile_analytics_app_id) {
@@ -72,18 +72,33 @@ var parseAWSExports = function (config) {
         };
     }
     // Notifications
-    if (Notifications) {
-        if ((_a = Notifications.InAppMessaging) === null || _a === void 0 ? void 0 : _a.AWSPinpoint) {
-            var _p = Notifications.InAppMessaging.AWSPinpoint, appId = _p.appId, region = _p.region;
-            amplifyConfig.Notifications = {
-                InAppMessaging: {
-                    Pinpoint: {
-                        appId: appId,
-                        region: region,
-                    },
+    var _o = Notifications !== null && Notifications !== void 0 ? Notifications : {}, InAppMessaging = _o.InAppMessaging, Push = _o.Push;
+    if ((InAppMessaging === null || InAppMessaging === void 0 ? void 0 : InAppMessaging.AWSPinpoint) || (Push === null || Push === void 0 ? void 0 : Push.AWSPinpoint)) {
+        amplifyConfig.Notifications = {};
+        if (InAppMessaging === null || InAppMessaging === void 0 ? void 0 : InAppMessaging.AWSPinpoint) {
+            var _p = InAppMessaging.AWSPinpoint, appId = _p.appId, region = _p.region;
+            amplifyConfig.Notifications.InAppMessaging = {
+                Pinpoint: {
+                    appId: appId,
+                    region: region,
                 },
             };
         }
+        if (Push === null || Push === void 0 ? void 0 : Push.AWSPinpoint) {
+            var _q = Push.AWSPinpoint, appId = _q.appId, region = _q.region;
+            amplifyConfig.Notifications.PushNotification = {
+                Pinpoint: {
+                    appId: appId,
+                    region: region,
+                },
+            };
+        }
+    }
+    // Interactions
+    if (Array.isArray(aws_bots_config)) {
+        amplifyConfig.Interactions = {
+            LexV1: Object.fromEntries(aws_bots_config.map(function (bot) { return [bot.name, bot]; })),
+        };
     }
     // API
     if (aws_appsync_graphqlEndpoint) {
@@ -105,17 +120,17 @@ var parseAWSExports = function (config) {
         ? {
             status: aws_cognito_mfa_configuration &&
                 aws_cognito_mfa_configuration.toLowerCase(),
-            totpEnabled: (_b = aws_cognito_mfa_types === null || aws_cognito_mfa_types === void 0 ? void 0 : aws_cognito_mfa_types.includes('TOTP')) !== null && _b !== void 0 ? _b : false,
-            smsEnabled: (_c = aws_cognito_mfa_types === null || aws_cognito_mfa_types === void 0 ? void 0 : aws_cognito_mfa_types.includes('SMS')) !== null && _c !== void 0 ? _c : false,
+            totpEnabled: (_a = aws_cognito_mfa_types === null || aws_cognito_mfa_types === void 0 ? void 0 : aws_cognito_mfa_types.includes('TOTP')) !== null && _a !== void 0 ? _a : false,
+            smsEnabled: (_b = aws_cognito_mfa_types === null || aws_cognito_mfa_types === void 0 ? void 0 : aws_cognito_mfa_types.includes('SMS')) !== null && _b !== void 0 ? _b : false,
         }
         : undefined;
     var passwordFormatConfig = aws_cognito_password_protection_settings
         ? {
             minLength: aws_cognito_password_protection_settings.passwordPolicyMinLength,
-            requireLowercase: (_e = (_d = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _d === void 0 ? void 0 : _d.includes('REQUIRES_LOWERCASE')) !== null && _e !== void 0 ? _e : false,
-            requireUppercase: (_g = (_f = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _f === void 0 ? void 0 : _f.includes('REQUIRES_UPPERCASE')) !== null && _g !== void 0 ? _g : false,
-            requireNumbers: (_j = (_h = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _h === void 0 ? void 0 : _h.includes('REQUIRES_NUMBERS')) !== null && _j !== void 0 ? _j : false,
-            requireSpecialCharacters: (_l = (_k = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _k === void 0 ? void 0 : _k.includes('REQUIRES_SYMBOLS')) !== null && _l !== void 0 ? _l : false,
+            requireLowercase: (_d = (_c = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _c === void 0 ? void 0 : _c.includes('REQUIRES_LOWERCASE')) !== null && _d !== void 0 ? _d : false,
+            requireUppercase: (_f = (_e = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _e === void 0 ? void 0 : _e.includes('REQUIRES_UPPERCASE')) !== null && _f !== void 0 ? _f : false,
+            requireNumbers: (_h = (_g = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _g === void 0 ? void 0 : _g.includes('REQUIRES_NUMBERS')) !== null && _h !== void 0 ? _h : false,
+            requireSpecialCharacters: (_k = (_j = aws_cognito_password_protection_settings.passwordPolicyCharacters) === null || _j === void 0 ? void 0 : _j.includes('REQUIRES_SYMBOLS')) !== null && _k !== void 0 ? _k : false,
         }
         : undefined;
     var mergedUserAttributes = Array.from(new Set(__spreadArray(__spreadArray([], __read((aws_cognito_verification_mechanisms !== null && aws_cognito_verification_mechanisms !== void 0 ? aws_cognito_verification_mechanisms : [])), false), __read((aws_cognito_signup_attributes !== null && aws_cognito_signup_attributes !== void 0 ? aws_cognito_signup_attributes : [])), false)));
@@ -127,8 +142,8 @@ var parseAWSExports = function (config) {
             },
             _a);
     });
-    var loginWithEmailEnabled = (_m = aws_cognito_username_attributes === null || aws_cognito_username_attributes === void 0 ? void 0 : aws_cognito_username_attributes.includes('EMAIL')) !== null && _m !== void 0 ? _m : false;
-    var loginWithPhoneEnabled = (_o = aws_cognito_username_attributes === null || aws_cognito_username_attributes === void 0 ? void 0 : aws_cognito_username_attributes.includes('PHONE_NUMBER')) !== null && _o !== void 0 ? _o : false;
+    var loginWithEmailEnabled = (_l = aws_cognito_username_attributes === null || aws_cognito_username_attributes === void 0 ? void 0 : aws_cognito_username_attributes.includes('EMAIL')) !== null && _l !== void 0 ? _l : false;
+    var loginWithPhoneEnabled = (_m = aws_cognito_username_attributes === null || aws_cognito_username_attributes === void 0 ? void 0 : aws_cognito_username_attributes.includes('PHONE_NUMBER')) !== null && _m !== void 0 ? _m : false;
     if (aws_cognito_identity_pool_id || aws_user_pools_id) {
         amplifyConfig.Auth = {
             Cognito: {

package/lib/providers/pinpoint/apis/record.d.ts

@@ -2,4 +2,4 @@ import { PinpointRecordInput } from '../types';
 /**
  * @internal
  */
-export declare const record: ({ appId, category, credentials, event, identityId, region, userAgentValue, }: PinpointRecordInput) => Promise<void>;
+export declare const record: ({ appId, category, channelType, credentials, event, identityId, region, userAgentValue, }: PinpointRecordInput) => Promise<void>;

package/lib/providers/pinpoint/apis/record.js

@@ -42,26 +42,21 @@ exports.record = void 0;
 var amplifyUuid_1 = require("../../../utils/amplifyUuid");
 var utils_1 = require("../utils");
 var constants_1 = require("../utils/constants");
-var updateEndpoint_1 = require("./updateEndpoint");
 var getEventBuffer_1 = require("../utils/getEventBuffer");
-var errors_1 = require("../../../errors");
 // TODO(v6) Refactor when we add support for session tracking & `autoTrack`
 var session;
 /**
  * @internal
  */
 var record = function (_a) {
-    var appId = _a.appId, category = _a.category, credentials = _a.credentials, event = _a.event, identityId = _a.identityId, region = _a.region, userAgentValue = _a.userAgentValue;
+    var appId = _a.appId, category = _a.category, channelType = _a.channelType, credentials = _a.credentials, event = _a.event, identityId = _a.identityId, region = _a.region, userAgentValue = _a.userAgentValue;
     return __awaiter(void 0, void 0, void 0, function () {
-        var timestampISOString, eventId, endpointId, buffer, sessionId;
+        var timestampISOString, eventId, buffer, endpointId, sessionId;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     timestampISOString = new Date().toISOString();
                     eventId = (0, amplifyUuid_1.amplifyUuid)();
-                    return [4 /*yield*/, (0, utils_1.getEndpointId)(appId, category)];
-                case 1:
-                    endpointId = _b.sent();
                     buffer = (0, getEventBuffer_1.getEventBuffer)({
                         appId: appId,
                         bufferSize: constants_1.BUFFER_SIZE,
@@ -73,28 +68,17 @@ var record = function (_a) {
                         resendLimit: constants_1.RESEND_LIMIT,
                         userAgentValue: userAgentValue,
                     });
-                    if (!!endpointId) return [3 /*break*/, 4];
-                    return [4 /*yield*/, (0, updateEndpoint_1.updateEndpoint)({
+                    return [4 /*yield*/, (0, utils_1.resolveEndpointId)({
                             appId: appId,
                             category: category,
+                            channelType: channelType,
                             credentials: credentials,
                             identityId: identityId,
                             region: region,
                             userAgentValue: userAgentValue,
                         })];
-                case 2:
-                    _b.sent();
-                    return [4 /*yield*/, (0, utils_1.getEndpointId)(appId, category)];
-                case 3:
+                case 1:
                     endpointId = _b.sent();
-                    _b.label = 4;
-                case 4:
-                    if (!endpointId) {
-                        throw new errors_1.AmplifyError({
-                            name: 'ENDPOINT_NOT_CREATED',
-                            message: 'Endpoint was not created.',
-                        });
-                    }
                     // Generate session if required
                     if (!session) {
                         sessionId = (0, amplifyUuid_1.amplifyUuid)();

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

@@ -1,3 +1,3 @@
 export * from './apis';
-export { PinpointAnalyticsEvent, PinpointServiceOptions } from './types';
-export { getEndpointId } from './utils';
+export { PinpointAnalyticsEvent, PinpointServiceOptions, UpdateEndpointException, } from './types';
+export { resolveEndpointId } from './utils';

package/lib/providers/pinpoint/index.js

@@ -16,7 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEndpointId = void 0;
+exports.resolveEndpointId = exports.UpdateEndpointException = void 0;
 __exportStar(require("./apis"), exports);
+var types_1 = require("./types");
+Object.defineProperty(exports, "UpdateEndpointException", { enumerable: true, get: function () { return types_1.UpdateEndpointException; } });
 var utils_1 = require("./utils");
-Object.defineProperty(exports, "getEndpointId", { enumerable: true, get: function () { return utils_1.getEndpointId; } });
+Object.defineProperty(exports, "resolveEndpointId", { enumerable: true, get: function () { return utils_1.resolveEndpointId; } });

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

@@ -0,0 +1,9 @@
+export declare enum UpdateEndpointException {
+    BadRequestException = "BadRequestException",
+    ForbiddenException = "ForbiddenException",
+    InternalServerErrorException = "InternalServerErrorException",
+    MethodNotAllowedException = "MethodNotAllowedException",
+    NotFoundException = "NotFoundException",
+    PayloadTooLargeException = "PayloadTooLargeException",
+    TooManyRequestsException = "TooManyRequestsException"
+}

package/lib/providers/pinpoint/types/errors.js

@@ -0,0 +1,15 @@
+"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.UpdateEndpointException = void 0;
+var UpdateEndpointException;
+(function (UpdateEndpointException) {
+    UpdateEndpointException["BadRequestException"] = "BadRequestException";
+    UpdateEndpointException["ForbiddenException"] = "ForbiddenException";
+    UpdateEndpointException["InternalServerErrorException"] = "InternalServerErrorException";
+    UpdateEndpointException["MethodNotAllowedException"] = "MethodNotAllowedException";
+    UpdateEndpointException["NotFoundException"] = "NotFoundException";
+    UpdateEndpointException["PayloadTooLargeException"] = "PayloadTooLargeException";
+    UpdateEndpointException["TooManyRequestsException"] = "TooManyRequestsException";
+})(UpdateEndpointException = exports.UpdateEndpointException || (exports.UpdateEndpointException = {}));

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

@@ -1 +1,2 @@
+export { UpdateEndpointException } from './errors';
 export * from './pinpoint';

package/lib/providers/pinpoint/types/index.js

@@ -16,4 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateEndpointException = void 0;
+var errors_1 = require("./errors");
+Object.defineProperty(exports, "UpdateEndpointException", { enumerable: true, get: function () { return errors_1.UpdateEndpointException; } });
 __exportStar(require("./pinpoint"), exports);

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

@@ -1,7 +1,7 @@
 import { AuthSession } from '../../../singleton/Auth/types';
 import { UserProfile } from '../../../types';
 export type SupportedCategory = 'Analytics' | 'Core' | 'InAppMessaging' | 'PushNotification';
-export type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
+type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 export type PinpointProviderConfig = {
     Pinpoint?: {
         appId: string;
@@ -25,13 +25,13 @@ export type PinpointAnalyticsEvent = {
 type PinpointCommonParameters = {
     appId: string;
     category: SupportedCategory;
+    channelType?: SupportedChannelType;
     credentials: Required<AuthSession>['credentials'];
     identityId?: AuthSession['identityId'];
     region: string;
     userAgentValue?: string;
 };
 export type PinpointUpdateEndpointInput = PinpointCommonParameters & PinpointServiceOptions & {
-    channelType?: SupportedChannelType;
     userId?: string;
     userProfile?: UserProfile;
 };

package/lib/providers/pinpoint/utils/index.d.ts

@@ -1,3 +1,4 @@
 export { cacheEndpointId } from './cacheEndpointId';
 export { getCacheKey } from './getCacheKey';
 export { getEndpointId } from './getEndpointId';
+export { resolveEndpointId } from './resolveEndpointId';

package/lib/providers/pinpoint/utils/index.js

@@ -2,10 +2,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEndpointId = exports.getCacheKey = exports.cacheEndpointId = void 0;
+exports.resolveEndpointId = exports.getEndpointId = exports.getCacheKey = exports.cacheEndpointId = void 0;
 var cacheEndpointId_1 = require("./cacheEndpointId");
 Object.defineProperty(exports, "cacheEndpointId", { enumerable: true, get: function () { return cacheEndpointId_1.cacheEndpointId; } });
 var getCacheKey_1 = require("./getCacheKey");
 Object.defineProperty(exports, "getCacheKey", { enumerable: true, get: function () { return getCacheKey_1.getCacheKey; } });
 var getEndpointId_1 = require("./getEndpointId");
 Object.defineProperty(exports, "getEndpointId", { enumerable: true, get: function () { return getEndpointId_1.getEndpointId; } });
+var resolveEndpointId_1 = require("./resolveEndpointId");
+Object.defineProperty(exports, "resolveEndpointId", { enumerable: true, get: function () { return resolveEndpointId_1.resolveEndpointId; } });

package/lib/providers/pinpoint/utils/resolveEndpointId.d.ts

@@ -0,0 +1,8 @@
+import { PinpointUpdateEndpointInput } from '../types';
+/**
+ * Resolves an endpoint id from cache or prepare via updateEndpoint if one does not already exist,
+ * which will generate and cache an endpoint id between calls.
+ *
+ * @internal
+ */
+export declare const resolveEndpointId: ({ address, appId, category, channelType, credentials, identityId, region, userAgentValue, }: PinpointUpdateEndpointInput) => Promise<string>;