@aws-amplify/core 6.0.1-api-v6-models.9351bcf.0 → 6.0.1-api-v6-models.58f2536.0

package/src/parseAWSExports.ts

@@ -3,10 +3,9 @@
 import { ConsoleLogger as Logger } from './Logger';
 import {
 	OAuthConfig,
-	AuthStandardAttributeKey,
 	AuthConfigUserAttributes,
+	OAuthProvider,
 } from './singleton/Auth/types';
-
 import { ResourcesConfig } from './singleton/types';
 
 const logger = new Logger('parseAWSExports');
@@ -46,6 +45,7 @@ export const parseAWSExports = (
 		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,
@@ -57,6 +57,7 @@ export const parseAWSExports = (
 		aws_user_pools_web_client_id,
 		geo,
 		oauth,
+		predictions,
 		aws_cloud_logic_custom,
 		Notifications,
 		modelIntrospection,
@@ -188,15 +189,27 @@ export const parseAWSExports = (
 						loginWithEmailEnabled || loginWithPhoneEnabled ? false : true,
 					email: loginWithEmailEnabled,
 					phone: loginWithPhoneEnabled,
-					...(oauth &&
-						Object.keys(oauth).length > 0 && {
-							oauth: getOAuthConfig(oauth),
-						}),
 				},
 			},
 		};
 	}
 
+	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
 	if (aws_user_files_s3_bucket) {
 		amplifyConfig.Storage = {
@@ -244,6 +257,25 @@ export const parseAWSExports = (
 		};
 	}
 
+	// 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;
 };
 
@@ -263,3 +295,10 @@ const getOAuthConfig = ({
 	redirectSignOut: getRedirectUrl(redirectSignOut),
 	responseType,
 });
+
+const parseSocialProviders = (aws_cognito_social_providers: string[]) => {
+	return aws_cognito_social_providers.map((provider: string) => {
+		const updatedProvider = provider.toLowerCase();
+		return updatedProvider.charAt(0).toUpperCase() + updatedProvider.slice(1);
+	}) as OAuthProvider[];
+};

package/src/providers/kinesis/types/kinesis.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export type KinesisProviderConfig = {
-	Kinesis?: {
+	Kinesis: {
 		region: string;
 		bufferSize?: number;
 		flushSize?: number;

package/src/providers/kinesis-firehose/types/kinesis-firehose.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export type KinesisFirehoseProviderConfig = {
-	KinesisFirehose?: {
+	KinesisFirehose: {
 		region: string;
 		bufferSize?: number;
 		flushSize?: number;

package/src/providers/personalize/types/personalize.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export type PersonalizeProviderConfig = {
-	Personalize?: {
+	Personalize: {
 		trackingId: string;
 		region: string;
 		flushSize?: number;

package/src/providers/pinpoint/apis/record.ts

@@ -4,6 +4,10 @@
 import { amplifyUuid } from '../../../utils/amplifyUuid';
 import { PinpointRecordInput, PinpointSession } from '../types';
 import { resolveEndpointId } from '../utils';
+import {
+	SESSION_START_EVENT,
+	SESSION_STOP_EVENT,
+} from '../../../utils/sessionListener';
 import {
 	BUFFER_SIZE,
 	FLUSH_INTERVAL,
@@ -12,8 +16,7 @@ import {
 } from '../utils/constants';
 import { getEventBuffer } from '../utils/getEventBuffer';
 
-// TODO(v6) Refactor when we add support for session tracking & `autoTrack`
-let session: PinpointSession;
+let session: PinpointSession | undefined;
 
 /**
  * @internal
@@ -28,7 +31,9 @@ export const record = async ({
 	region,
 	userAgentValue,
 }: PinpointRecordInput): Promise<void> => {
-	const timestampISOString = new Date().toISOString();
+	let eventSession = session;
+	const currentTime = new Date();
+	const timestampISOString = currentTime.toISOString();
 	const eventId = amplifyUuid();
 
 	// Prepare event buffer if required
@@ -55,13 +60,25 @@ export const record = async ({
 	});
 
 	// Generate session if required
-	if (!session) {
+	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
@@ -69,7 +86,7 @@ export const record = async ({
 		eventId,
 		endpointId,
 		event,
-		session,
+		session: eventSession!,
 		timestamp: timestampISOString,
 		resendLimit: RESEND_LIMIT,
 	});

package/src/providers/pinpoint/types/pinpoint.ts

@@ -13,7 +13,7 @@ export type SupportedCategory =
 type SupportedChannelType = 'APNS' | 'APNS_SANDBOX' | 'GCM' | 'IN_APP';
 
 export type PinpointProviderConfig = {
-	Pinpoint?: {
+	Pinpoint: {
 		appId: string;
 		region: string;
 	};
@@ -27,7 +27,9 @@ export type PinpointServiceOptions = {
 
 export type PinpointSession = {
 	Id: string;
+	Duration?: number;
 	StartTimestamp: string;
+	StopTimestamp?: string;
 };
 
 export type PinpointAnalyticsEvent = {

package/src/singleton/Amplify.ts

@@ -27,6 +27,10 @@ export 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.
@@ -34,7 +38,7 @@ export class AmplifyClass {
 	 */
 	configure(
 		resourcesConfig: ResourcesConfig | LegacyConfig,
-		libraryOptions: LibraryOptions = {}
+		libraryOptions?: LibraryOptions
 	): void {
 		let resolvedResourceConfig: ResourcesConfig;
 
@@ -44,15 +48,11 @@ export class AmplifyClass {
 			resolvedResourceConfig = resourcesConfig as ResourcesConfig;
 		}
 
-		this.resourcesConfig = mergeResourceConfig(
-			this.resourcesConfig,
-			resolvedResourceConfig
-		);
+		this.resourcesConfig = resolvedResourceConfig;
 
-		this.libraryOptions = mergeLibraryOptions(
-			this.libraryOptions,
-			libraryOptions
-		);
+		if (libraryOptions) {
+			this.libraryOptions = libraryOptions;
+		}
 
 		// Make resource config immutable
 		this.resourcesConfig = deepFreeze(this.resourcesConfig);
@@ -87,46 +87,3 @@ export class AmplifyClass {
  * `Amplify` is responsible for orchestrating cross-category communication within the library.
  */
 export const Amplify = new AmplifyClass();
-
-// TODO(v6): validate until which level this will nested, during Amplify.configure API review.
-function mergeResourceConfig(
-	existingConfig: ResourcesConfig,
-	newConfig: ResourcesConfig
-): ResourcesConfig {
-	const resultConfig: Record<string, any> = {};
-
-	for (const category of Object.keys(existingConfig)) {
-		resultConfig[category] = existingConfig[category as keyof ResourcesConfig];
-	}
-
-	for (const key of Object.keys(newConfig)) {
-		resultConfig[key] = {
-			...resultConfig[key],
-			...newConfig[key as keyof ResourcesConfig],
-		};
-	}
-
-	return resultConfig;
-}
-
-function mergeLibraryOptions(
-	existingConfig: LibraryOptions,
-	newConfig: LibraryOptions
-): LibraryOptions {
-	const resultConfig: Record<string, any> = {};
-
-	for (const category of Object.keys(existingConfig)) {
-		resultConfig[category] = existingConfig[category as keyof LibraryOptions];
-	}
-
-	for (const key of Object.keys(newConfig).filter(key => key !== 'ssr')) {
-		resultConfig[key] = {
-			...resultConfig[key],
-			...newConfig[key as Exclude<keyof LibraryOptions, 'ssr'>],
-		};
-	}
-
-	resultConfig.ssr = newConfig.ssr;
-
-	return resultConfig;
-}

package/src/singleton/Analytics/types.ts

@@ -6,7 +6,12 @@ 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
+>;

package/src/singleton/Auth/types.ts

@@ -166,10 +166,10 @@ export type OAuthConfig = {
 	redirectSignIn: Array<string>;
 	redirectSignOut: Array<string>;
 	responseType: 'code' | 'token';
-	providers?: Array<OAuthProviders | CustomProvider>;
+	providers?: Array<OAuthProvider | CustomProvider>;
 };
 
-type OAuthProviders = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
+export type OAuthProvider = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
 type CustomProvider = { custom: string };
 
 type CustomScope = string & {};

package/src/singleton/Predictions/types.ts

@@ -0,0 +1,61 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// Defaults for ConvertConfig
+type SpeechGeneratorDefaults = {
+	voiceId?: string;
+};
+type TranscriptionDefaults = {
+	language?: string;
+};
+type TranslateTextDefaults = {
+	sourceLanguage?: string;
+	targetLanguage?: string;
+};
+
+// Defaults for IdentifyConfig
+type IdentifyEntitiesDefaults = {
+	collectionId?: string;
+	maxEntities?: number;
+};
+type IdentityLabelsDefaults = {
+	type?: string;
+};
+type IdentifyTextDefaults = {
+	format?: string;
+};
+
+// Defaults for InterpretConfig
+type InterpretTextDefaults = {
+	type?: string;
+};
+
+type ConvertConfig = {
+	speechGenerator?: PredictionsProviderConfig<SpeechGeneratorDefaults>;
+	transcription?: PredictionsProviderConfig<TranscriptionDefaults>;
+	translateText?: PredictionsProviderConfig<TranslateTextDefaults>;
+};
+
+type IdentifyConfig = {
+	identifyEntities?: PredictionsProviderConfig<IdentifyEntitiesDefaults> & {
+		celebrityDetectionEnabled?: boolean;
+	};
+	identifyLabels?: PredictionsProviderConfig<IdentityLabelsDefaults>;
+	identifyText?: PredictionsProviderConfig<IdentifyTextDefaults>;
+};
+
+type InterpretConfig = {
+	interpretText?: PredictionsProviderConfig<InterpretTextDefaults>;
+};
+
+export type PredictionsProviderConfig<T> = {
+	region?: string;
+	proxy?: boolean;
+	defaults?: T;
+};
+
+export type PredictionsConfig = {
+	convert?: ConvertConfig;
+	identify?: IdentifyConfig;
+	interpret?: InterpretConfig;
+};

package/src/singleton/types.ts

@@ -13,6 +13,7 @@ import {
 	CognitoIdentityPoolConfig,
 } from './Auth/types';
 import { GeoConfig } from './Geo/types';
+import { PredictionsConfig } from './Predictions/types';
 import {
 	LibraryStorageOptions,
 	StorageAccessLevel,
@@ -34,7 +35,7 @@ export type ResourcesConfig = {
 	Auth?: AuthConfig;
 	Interactions?: InteractionsConfig;
 	Notifications?: NotificationsConfig;
-	// Predictions?: {};
+	Predictions?: PredictionsConfig;
 	Storage?: StorageConfig;
 	Geo?: GeoConfig;
 };
@@ -54,6 +55,7 @@ export {
 	AuthUserPoolAndIdentityPoolConfig,
 	GetCredentialsOptions,
 	InteractionsConfig,
+	PredictionsConfig,
 	StorageAccessLevel,
 	StorageConfig,
 	AnalyticsConfig,

package/src/utils/WordArray.ts

@@ -0,0 +1,57 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { cryptoSecureRandomInt } from './cryptoSecureRandomInt';
+
+/**
+ * Hex encoding strategy.
+ * Converts a word array to a hex string.
+ * @param {WordArray} wordArray The word array.
+ * @return {string} The hex string.
+ * @static
+ */
+function hexStringify(wordArray: WordArray): string {
+	// Shortcuts
+	const words = wordArray.words;
+	const sigBytes = wordArray.sigBytes;
+
+	// Convert
+	const hexChars: string[] = [];
+	for (let i = 0; i < sigBytes; i++) {
+		const bite = (words[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
+		hexChars.push((bite >>> 4).toString(16));
+		hexChars.push((bite & 0x0f).toString(16));
+	}
+
+	return hexChars.join('');
+}
+
+export default class WordArray {
+	words: number[] = [];
+	sigBytes: number;
+
+	constructor(words?: number[], sigBytes?: number) {
+		let Words = words;
+		Words = this.words = Words || [];
+
+		if (sigBytes !== undefined) {
+			this.sigBytes = sigBytes;
+		} else {
+			this.sigBytes = Words.length * 4;
+		}
+	}
+
+	random(nBytes: number): WordArray {
+		const words: number[] = [];
+
+		for (let i = 0; i < nBytes; i += 4) {
+			words.push(cryptoSecureRandomInt());
+		}
+
+		return new WordArray(words, nBytes);
+	}
+
+	toString(): string {
+		return hexStringify(this);
+	}
+}

package/src/utils/amplifyUuid/index.ts

@@ -4,6 +4,6 @@
 import './polyfill';
 import { v4 } from 'uuid';
 
-const amplifyUuid = v4;
+const amplifyUuid: () => string = v4;
 
 export { amplifyUuid };

package/src/utils/cryptoSecureRandomInt.ts

@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { getCrypto } from './globalHelpers';
+
+/*
+ * Cryptographically secure pseudorandom number generator
+ * As Math.random() is cryptographically not safe to use
+ */
+export function cryptoSecureRandomInt() {
+	const crypto = getCrypto();
+	const randomResult = crypto.getRandomValues(new Uint32Array(1))[0];
+	return randomResult;
+}

package/src/utils/sessionListener/constants.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// Standard session start & stop event names
+export const SESSION_START_EVENT = '_session.start';
+export const SESSION_STOP_EVENT = '_session.stop';

package/src/utils/sessionListener/index.ts

@@ -2,5 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { SessionListener } from './SessionListener';
+export { SESSION_START_EVENT, SESSION_STOP_EVENT } from './constants';
 
 export const sessionListener = new SessionListener();