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

package/lib-esm/parseAWSExports.js

@@ -1,13 +1,14 @@
-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);
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { ConsoleLogger as Logger } from './Logger';
+const logger = new Logger('parseAWSExports');
+const authTypeMapping = {
+    API_KEY: 'apiKey',
+    AWS_IAM: 'iam',
+    AMAZON_COGNITO_USER_POOLS: 'userPool',
+    OPENID_CONNECT: 'oidc',
+    NONE: 'none',
+    LAMBDA: 'lambda',
 };
 /**
  * This utility converts the `aws-exports.js` file generated by the Amplify CLI into a {@link ResourcesConfig} object
@@ -17,10 +18,9 @@ var __assign = (this && this.__assign) || function () {
  *
  * @returns A {@link ResourcesConfig} object.
  */
-export var parseAWSExports = function (config) {
-    if (config === void 0) { config = {}; }
-    var 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_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;
-    var amplifyConfig = {};
+export const parseAWSExports = (config = {}) => {
+    const { aws_appsync_apiKey, aws_appsync_authenticationType, aws_appsync_graphqlEndpoint, aws_appsync_region, aws_bots, aws_bots_config, aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method, aws_cognito_mfa_configuration, aws_cognito_mfa_types, aws_cognito_password_protection_settings, aws_cognito_verification_mechanisms, aws_cognito_signup_attributes, aws_cognito_social_providers, aws_cognito_username_attributes, aws_mandatory_sign_in, aws_mobile_analytics_app_id, aws_mobile_analytics_app_region, aws_user_files_s3_bucket, aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id, aws_user_pools_web_client_id, geo, oauth, predictions, aws_cloud_logic_custom, Notifications, } = config;
+    const amplifyConfig = {};
     // Analytics
     if (aws_mobile_analytics_app_id) {
         amplifyConfig.Analytics = {
@@ -30,13 +30,111 @@ export var parseAWSExports = function (config) {
             },
         };
     }
+    // Notifications
+    const { InAppMessaging, Push } = Notifications ?? {};
+    if (InAppMessaging?.AWSPinpoint || Push?.AWSPinpoint) {
+        amplifyConfig.Notifications = {};
+        if (InAppMessaging?.AWSPinpoint) {
+            const { appId, region } = InAppMessaging.AWSPinpoint;
+            amplifyConfig.Notifications.InAppMessaging = {
+                Pinpoint: {
+                    appId,
+                    region,
+                },
+            };
+        }
+        if (Push?.AWSPinpoint) {
+            const { appId, region } = Push.AWSPinpoint;
+            amplifyConfig.Notifications.PushNotification = {
+                Pinpoint: {
+                    appId,
+                    region,
+                },
+            };
+        }
+    }
+    // Interactions
+    if (Array.isArray(aws_bots_config)) {
+        amplifyConfig.Interactions = {
+            LexV1: Object.fromEntries(aws_bots_config.map(bot => [bot.name, bot])),
+        };
+    }
+    // API
+    if (aws_appsync_graphqlEndpoint) {
+        const defaultAuthMode = authTypeMapping[aws_appsync_authenticationType];
+        if (!defaultAuthMode) {
+            logger.debug(`Invalid authentication type ${aws_appsync_authenticationType}. Falling back to IAM.`);
+        }
+        amplifyConfig.API = {
+            GraphQL: {
+                endpoint: aws_appsync_graphqlEndpoint,
+                apiKey: aws_appsync_apiKey,
+                region: aws_appsync_region,
+                defaultAuthMode: defaultAuthMode ?? 'iam',
+            },
+        };
+    }
     // Auth
+    const mfaConfig = aws_cognito_mfa_configuration
+        ? {
+            status: aws_cognito_mfa_configuration &&
+                aws_cognito_mfa_configuration.toLowerCase(),
+            totpEnabled: aws_cognito_mfa_types?.includes('TOTP') ?? false,
+            smsEnabled: aws_cognito_mfa_types?.includes('SMS') ?? false,
+        }
+        : undefined;
+    const passwordFormatConfig = aws_cognito_password_protection_settings
+        ? {
+            minLength: aws_cognito_password_protection_settings.passwordPolicyMinLength,
+            requireLowercase: aws_cognito_password_protection_settings.passwordPolicyCharacters?.includes('REQUIRES_LOWERCASE') ?? false,
+            requireUppercase: aws_cognito_password_protection_settings.passwordPolicyCharacters?.includes('REQUIRES_UPPERCASE') ?? false,
+            requireNumbers: aws_cognito_password_protection_settings.passwordPolicyCharacters?.includes('REQUIRES_NUMBERS') ?? false,
+            requireSpecialCharacters: aws_cognito_password_protection_settings.passwordPolicyCharacters?.includes('REQUIRES_SYMBOLS') ?? false,
+        }
+        : undefined;
+    const mergedUserAttributes = Array.from(new Set([
+        ...(aws_cognito_verification_mechanisms ?? []),
+        ...(aws_cognito_signup_attributes ?? []),
+    ]));
+    const userAttributesConfig = mergedUserAttributes.map((s) => ({
+        [s.toLowerCase()]: {
+            required: true, // All user attributes generated by the CLI will be required
+        },
+    }));
+    const loginWithEmailEnabled = aws_cognito_username_attributes?.includes('EMAIL') ?? false;
+    const loginWithPhoneEnabled = aws_cognito_username_attributes?.includes('PHONE_NUMBER') ?? false;
     if (aws_cognito_identity_pool_id || aws_user_pools_id) {
         amplifyConfig.Auth = {
-            Cognito: __assign({ identityPoolId: aws_cognito_identity_pool_id, allowGuestAccess: aws_mandatory_sign_in !== 'enable', signUpVerificationMethod: aws_cognito_sign_up_verification_method, userPoolClientId: aws_user_pools_web_client_id, userPoolId: aws_user_pools_id }, (oauth &&
-                Object.keys(oauth).length > 0 && {
-                loginWith: getOAuthConfig(oauth),
-            })),
+            Cognito: {
+                identityPoolId: aws_cognito_identity_pool_id,
+                allowGuestAccess: aws_mandatory_sign_in !== 'enable',
+                signUpVerificationMethod: aws_cognito_sign_up_verification_method,
+                userAttributes: userAttributesConfig,
+                userPoolClientId: aws_user_pools_web_client_id,
+                userPoolId: aws_user_pools_id,
+                mfa: mfaConfig,
+                passwordFormat: passwordFormatConfig,
+                loginWith: {
+                    username: loginWithEmailEnabled || loginWithPhoneEnabled ? false : true,
+                    email: loginWithEmailEnabled,
+                    phone: loginWithPhoneEnabled,
+                },
+            },
+        };
+    }
+    const hasOAuthConfig = oauth ? Object.keys(oauth).length > 0 : false;
+    const hasSocialProviderConfig = aws_cognito_social_providers
+        ? aws_cognito_social_providers.length > 0
+        : false;
+    if (amplifyConfig.Auth && hasOAuthConfig) {
+        amplifyConfig.Auth.Cognito.loginWith = {
+            ...amplifyConfig.Auth.Cognito.loginWith,
+            oauth: {
+                ...getOAuthConfig(oauth),
+                ...(hasSocialProviderConfig && {
+                    providers: parseSocialProviders(aws_cognito_social_providers),
+                }),
+            },
         };
     }
     // Storage
@@ -51,25 +149,64 @@ export var parseAWSExports = function (config) {
     }
     // Geo
     if (geo) {
-        var amazon_location_service = geo.amazon_location_service;
+        const { amazon_location_service } = geo;
         amplifyConfig.Geo = amazon_location_service
-            ? { AmazonLocationService: amazon_location_service }
-            : __assign({}, geo);
+            ? {
+                LocationService: {
+                    ...amazon_location_service,
+                    searchIndices: amazon_location_service.search_indices,
+                    region: amazon_location_service.region,
+                },
+            }
+            : { ...geo };
+    }
+    // REST API
+    if (aws_cloud_logic_custom) {
+        amplifyConfig.API = {
+            ...amplifyConfig.API,
+            REST: aws_cloud_logic_custom.reduce((acc, api) => {
+                const { name, endpoint, region, service } = api;
+                return {
+                    ...acc,
+                    [name]: {
+                        endpoint,
+                        ...(service ? { service } : undefined),
+                        ...(region ? { region } : undefined),
+                    },
+                };
+            }, {}),
+        };
+    }
+    // Predictions
+    if (predictions) {
+        // map VoiceId from speechGenerator defaults to voiceId
+        const { VoiceId: voiceId } = predictions?.convert?.speechGenerator?.defaults ?? {};
+        amplifyConfig.Predictions = voiceId
+            ? {
+                ...predictions,
+                convert: {
+                    ...predictions.convert,
+                    speechGenerator: {
+                        ...predictions.convert.speechGenerator,
+                        defaults: { voiceId },
+                    },
+                },
+            }
+            : predictions;
     }
     return amplifyConfig;
 };
-var getRedirectUrl = function (redirectStr) {
-    return redirectStr.split(',');
-};
-var getOAuthConfig = function (_a) {
-    var domain = _a.domain, scope = _a.scope, redirectSignIn = _a.redirectSignIn, redirectSignOut = _a.redirectSignOut, responseType = _a.responseType;
-    return ({
-        oauth: {
-            domain: domain,
-            scopes: scope,
-            redirectSignIn: getRedirectUrl(redirectSignIn),
-            redirectSignOut: getRedirectUrl(redirectSignOut),
-            responseType: responseType,
-        },
+const getRedirectUrl = (redirectStr) => redirectStr.split(',');
+const getOAuthConfig = ({ domain, scope, redirectSignIn, redirectSignOut, responseType, }) => ({
+    domain,
+    scopes: scope,
+    redirectSignIn: getRedirectUrl(redirectSignIn),
+    redirectSignOut: getRedirectUrl(redirectSignOut),
+    responseType,
+});
+const parseSocialProviders = (aws_cognito_social_providers) => {
+    return aws_cognito_social_providers.map((provider) => {
+        const updatedProvider = provider.toLowerCase();
+        return updatedProvider.charAt(0).toUpperCase() + updatedProvider.slice(1);
     });
 };

package/lib-esm/providers/kinesis/types/index.d.ts

@@ -0,0 +1 @@
+export * from './kinesis';

package/lib-esm/providers/kinesis/types/index.js

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export * from './kinesis';

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

@@ -0,0 +1,9 @@
+export type KinesisProviderConfig = {
+    Kinesis?: {
+        region: string;
+        bufferSize?: number;
+        flushSize?: number;
+        flushInterval?: number;
+        resendLimit?: number;
+    };
+};

package/lib-esm/providers/kinesis/types/kinesis.js

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export {};

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

@@ -0,0 +1 @@
+export { KinesisFirehoseProviderConfig } from './kinesis-firehose';

package/lib-esm/providers/kinesis-firehose/types/index.js

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export {};

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

@@ -0,0 +1,9 @@
+export type KinesisFirehoseProviderConfig = {
+    KinesisFirehose?: {
+        region: string;
+        bufferSize?: number;
+        flushSize?: number;
+        flushInterval?: number;
+        resendLimit?: number;
+    };
+};

package/lib-esm/providers/kinesis-firehose/types/kinesis-firehose.js

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export {};

package/lib-esm/providers/personalize/types/index.d.ts

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

package/lib-esm/providers/personalize/types/index.js

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export {};

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

@@ -0,0 +1,8 @@
+export type PersonalizeProviderConfig = {
+    Personalize?: {
+        trackingId: string;
+        region: string;
+        flushSize?: number;
+        flushInterval?: number;
+    };
+};

package/lib-esm/providers/personalize/types/personalize.js

@@ -0,0 +1,3 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export {};

package/lib-esm/providers/pinpoint/apis/flushEvents.d.ts

@@ -0,0 +1,2 @@
+import { AWSCredentials } from '../../../libraryUtils';
+export declare const flushEvents: (appId: string, region: string, credentials: AWSCredentials, identityId?: string, userAgentValue?: string) => void;

package/lib-esm/providers/pinpoint/apis/flushEvents.js

@@ -0,0 +1,17 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { getEventBuffer } from '../utils/getEventBuffer';
+import { BUFFER_SIZE, FLUSH_INTERVAL, FLUSH_SIZE, RESEND_LIMIT, } from '../utils/constants';
+export const flushEvents = (appId, region, credentials, identityId, userAgentValue) => {
+    getEventBuffer({
+        appId,
+        bufferSize: BUFFER_SIZE,
+        credentials,
+        flushInterval: FLUSH_INTERVAL,
+        flushSize: FLUSH_SIZE,
+        identityId,
+        region,
+        resendLimit: RESEND_LIMIT,
+        userAgentValue,
+    }).flushAll();
+};

package/lib-esm/providers/pinpoint/apis/index.d.ts

@@ -1,2 +1,3 @@
 export { updateEndpoint } from './updateEndpoint';
 export { record } from './record';
+export { flushEvents } from './flushEvents';

package/lib-esm/providers/pinpoint/apis/index.js

@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 export { updateEndpoint } from './updateEndpoint';
 export { record } from './record';
+export { flushEvents } from './flushEvents';

package/lib-esm/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-esm/providers/pinpoint/apis/record.js

@@ -1,116 +1,65 @@
 // 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 };
-    }
-};
-import { v4 as uuid } from 'uuid';
-import { getEndpointId } from '../utils';
+import { amplifyUuid } from '../../../utils/amplifyUuid';
+import { resolveEndpointId } from '../utils';
+import { SESSION_START_EVENT, SESSION_STOP_EVENT, } from '../../../utils/sessionListener';
 import { BUFFER_SIZE, FLUSH_INTERVAL, FLUSH_SIZE, RESEND_LIMIT, } from '../utils/constants';
-import { updateEndpoint } from './updateEndpoint';
 import { getEventBuffer } from '../utils/getEventBuffer';
-import { AmplifyError } from '../../../libraryUtils';
-// TODO(v6) Refactor when we add support for session tracking & `autoTrack`
-var session;
+let session;
 /**
  * @internal
  */
-export 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;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var timestampISOString, eventId, endpointId, buffer, sessionId;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    timestampISOString = new Date().toISOString();
-                    eventId = uuid();
-                    return [4 /*yield*/, getEndpointId(appId, category)];
-                case 1:
-                    endpointId = _b.sent();
-                    buffer = getEventBuffer({
-                        appId: appId,
-                        bufferSize: BUFFER_SIZE,
-                        credentials: credentials,
-                        flushInterval: FLUSH_INTERVAL,
-                        flushSize: FLUSH_SIZE,
-                        identityId: identityId,
-                        region: region,
-                        resendLimit: RESEND_LIMIT,
-                        userAgentValue: userAgentValue,
-                    });
-                    if (!!endpointId) return [3 /*break*/, 4];
-                    return [4 /*yield*/, updateEndpoint({
-                            appId: appId,
-                            category: category,
-                            credentials: credentials,
-                            identityId: identityId,
-                            region: region,
-                            userAgentValue: userAgentValue,
-                        })];
-                case 2:
-                    _b.sent();
-                    return [4 /*yield*/, getEndpointId(appId, category)];
-                case 3:
-                    endpointId = _b.sent();
-                    _b.label = 4;
-                case 4:
-                    if (!endpointId) {
-                        throw new AmplifyError({
-                            name: 'ENDPOINT_NOT_CREATED',
-                            message: 'Endpoint was not created.',
-                        });
-                    }
-                    // Generate session if required
-                    if (!session) {
-                        sessionId = uuid();
-                        session = {
-                            Id: sessionId,
-                            StartTimestamp: timestampISOString,
-                        };
-                    }
-                    // Push event to buffer
-                    buffer.push({
-                        eventId: eventId,
-                        endpointId: endpointId,
-                        event: event,
-                        session: session,
-                        timestamp: timestampISOString,
-                        resendLimit: RESEND_LIMIT,
-                    });
-                    return [2 /*return*/];
-            }
-        });
+export const record = async ({ appId, category, channelType, credentials, event, identityId, region, userAgentValue, }) => {
+    let eventSession = session;
+    const currentTime = new Date();
+    const timestampISOString = currentTime.toISOString();
+    const eventId = amplifyUuid();
+    // Prepare event buffer if required
+    const buffer = getEventBuffer({
+        appId,
+        bufferSize: BUFFER_SIZE,
+        credentials,
+        flushInterval: FLUSH_INTERVAL,
+        flushSize: FLUSH_SIZE,
+        identityId,
+        region,
+        resendLimit: RESEND_LIMIT,
+        userAgentValue,
+    });
+    const endpointId = await resolveEndpointId({
+        appId,
+        category,
+        channelType,
+        credentials,
+        identityId,
+        region,
+        userAgentValue,
+    });
+    // Generate session if required
+    if (!eventSession || event.name === SESSION_START_EVENT) {
+        const sessionId = amplifyUuid();
+        session = {
+            Id: sessionId,
+            StartTimestamp: timestampISOString,
+        };
+        eventSession = session;
+    }
+    // Terminate session when required
+    if (session && event.name === SESSION_STOP_EVENT) {
+        eventSession = {
+            ...session,
+            StopTimestamp: timestampISOString,
+            Duration: currentTime.getTime() - new Date(session.StartTimestamp).getTime(),
+        };
+        session = undefined;
+    }
+    // Push event to buffer
+    buffer.push({
+        eventId,
+        endpointId,
+        event,
+        session: eventSession,
+        timestamp: timestampISOString,
+        resendLimit: RESEND_LIMIT,
     });
 };

package/lib-esm/providers/pinpoint/apis/updateEndpoint.d.ts

@@ -2,4 +2,4 @@ import { PinpointUpdateEndpointInput } from '../types';
 /**
  * @internal
  */
-export declare const updateEndpoint: ({ address, appId, category, channelType, credentials, identityId, optOut, region, userId, userProfile, userAgentValue, }: PinpointUpdateEndpointInput) => Promise<void>;
+export declare const updateEndpoint: ({ address, appId, category, channelType, credentials, identityId, optOut, region, userAttributes, userId, userProfile, userAgentValue, }: PinpointUpdateEndpointInput) => Promise<void>;