@aws-amplify/core 6.0.1-console-preview.814dea6.0 → 6.0.1-console-preview.047a1dd.0

package/src/Cache/Utils/CacheUtils.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { CacheConfig } from '../types';
-import { StorageHelper } from '../../StorageHelper';
+import { getDefaultStorageWithFallback } from '../../storage/utils';
 /**
  * Default cache config
  */
@@ -13,9 +13,7 @@ export const defaultConfig: CacheConfig = {
 	defaultTTL: 259200000, // about 3 days
 	defaultPriority: 5,
 	warningThreshold: 0.8,
-	// the storage helper will check if localStorage exists,
-	// if not, will use a in-memory object instead
-	storage: new StorageHelper().getStorage(),
+	storage: getDefaultStorageWithFallback(),
 };
 
 /**

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-console-preview.814dea6.0+814dea6';
+export const version = '6.0.1-console-preview.047a1dd.0+047a1dd';

package/src/ServiceWorker/ServiceWorker.ts

@@ -13,7 +13,7 @@
  * and limitations under the License.
  */
 import { ConsoleLogger as Logger } from '../Logger';
-import { browserOrNode } from '../Util/JS';
+import { isBrowser } from '../Util/JS';
 import { Amplify } from '../Amplify';
 import { asserts } from '../Util/errors/AssertError';
 import { AmplifyError } from '../Util/Errors';
@@ -136,7 +136,7 @@ export class ServiceWorkerClass {
 		});
 		this._publicKey = publicKey;
 		return new Promise((resolve, reject) => {
-			if (browserOrNode().isBrowser) {
+			if (isBrowser()) {
 				asserts(this._registration !== undefined, {
 					name: SERVICE_WORKER_EXCEPTION,
 					message: 'Service Worker registration is undefined',

package/src/Util/JS.ts

@@ -170,19 +170,8 @@ export const isWebWorker = () => {
 	);
 };
 
-export const browserOrNode = () => {
-	const isBrowser =
-		typeof window !== 'undefined' && typeof window.document !== 'undefined';
-	const isNode =
-		typeof process !== 'undefined' &&
-		process.versions != null &&
-		process.versions.node != null;
-
-	return {
-		isBrowser,
-		isNode,
-	};
-};
+export const isBrowser = () =>
+	typeof window !== 'undefined' && typeof window.document !== 'undefined';
 
 /**
  * transfer the first letter of the keys to lowercase

package/src/Util/Reachability.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import Observable, { ZenObservable } from 'zen-observable-ts';
-import { browserOrNode, isWebWorker } from './JS';
+import { isWebWorker } from './JS';
 
 type NetworkStatus = {
 	online: boolean;
@@ -13,10 +13,6 @@ export default class ReachabilityNavigator implements Reachability {
 	> = [];
 
 	networkMonitor(netInfo?: any): Observable<NetworkStatus> {
-		if (browserOrNode().isNode) {
-			return Observable.from([{ online: true }]);
-		}
-
 		const globalObj = isWebWorker() ? self : window;
 
 		return new Observable(observer => {

package/src/clients/handlers/authenticated.ts

@@ -11,7 +11,8 @@ import { HttpRequest, HttpResponse } from '../types';
 export const authenticatedHandler = composeTransferHandler<
 	[UserAgentOptions, RetryOptions<HttpResponse>, SigningOptions],
 	HttpRequest,
-	HttpResponse
+	HttpResponse,
+	typeof fetchTransferHandler
 >(fetchTransferHandler, [
 	userAgentMiddleware,
 	retryMiddleware,

package/src/clients/handlers/fetch.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import 'isomorphic-unfetch'; // TODO: remove this dependency in v6
 import { HttpRequest, HttpResponse, HttpTransferOptions } from '../types/http';
 import { TransferHandler } from '../types/core';
 import { withMemoization } from '../utils/memoization';
@@ -14,7 +13,7 @@ export const fetchTransferHandler: TransferHandler<
 	HttpRequest,
 	HttpResponse,
 	HttpTransferOptions
-> = async ({ url, method, headers, body }, { abortSignal }) => {
+> = async ({ url, method, headers, body }, { abortSignal, cache }) => {
 	let resp: Response;
 	try {
 		resp = await fetch(url, {
@@ -22,6 +21,7 @@ export const fetchTransferHandler: TransferHandler<
 			headers,
 			body: shouldSendBody(method) ? body : undefined,
 			signal: abortSignal,
+			cache,
 		});
 	} catch (e) {
 		// TODO: needs to revise error handling in v6

package/src/clients/handlers/unauthenticated.ts

@@ -10,5 +10,6 @@ import { HttpRequest, HttpResponse } from '../types';
 export const unauthenticatedHandler = composeTransferHandler<
 	[UserAgentOptions, RetryOptions<HttpResponse>],
 	HttpRequest,
-	HttpResponse
+	HttpResponse,
+	typeof fetchTransferHandler
 >(fetchTransferHandler, [userAgentMiddleware, retryMiddleware]);

package/src/clients/internal/composeServiceApi.ts

@@ -29,7 +29,7 @@ export const composeServiceApi = <
 				ServiceClientOptions &
 				Partial<DefaultConfig> &
 				InferEndpointResolverOptionType<DefaultConfig>,
-			keyof DefaultConfig
+			DefaultConfig
 		>,
 		input: Input
 	) => {
@@ -54,8 +54,15 @@ export const composeServiceApi = <
 	};
 };
 
-type OptionalizeKey<T, K extends keyof T> = Omit<T, K> & {
-	[P in K & keyof T]?: T[P];
+type OptionalizeKey<InputType, InputDefaultsType> = {
+	[KeyWithDefaultValue in keyof InputDefaultsType]?: KeyWithDefaultValue extends keyof InputType
+		? InputType[KeyWithDefaultValue]
+		: never;
+} & {
+	[KeyWithoutDefaultValue in keyof Omit<
+		InputType,
+		keyof InputDefaultsType
+	>]: InputType[KeyWithoutDefaultValue];
 };
 
 type InferEndpointResolverOptionType<T> = T extends {

package/src/clients/types/aws.ts

@@ -5,7 +5,10 @@ import { MetadataBearer } from '@aws-sdk/types';
 import { Endpoint } from './core';
 import { HttpResponse } from './http';
 
-export type { Credentials, MetadataBearer } from '@aws-sdk/types';
+export type {
+	AwsCredentialIdentity as Credentials,
+	MetadataBearer,
+} from '@aws-sdk/types';
 
 export type SourceData = string | ArrayBuffer | ArrayBufferView;
 
@@ -26,13 +29,3 @@ export interface ServiceClientOptions {
 export type ErrorParser = (
 	response?: HttpResponse
 ) => Promise<(Error & MetadataBearer) | undefined>;
-
-/**
- *  Default config options for the `composeServiceApi`.
- */
-export type DefaultConfigOptions<
-	TransferHandlerOptions extends Record<string, unknown> = Record<
-		string,
-		unknown
-	>
-> = Partial<TransferHandlerOptions & ServiceClientOptions>;

package/src/clients/types/http.ts

@@ -34,6 +34,14 @@ export interface HttpResponse extends Response {
 
 export interface HttpTransferOptions {
 	abortSignal?: AbortSignal;
+	/**
+	 * Cache mode for the request. Note that this is only effective when the underlying HTTP handler is fetch.
+	 * For XHR handler, or Node.js `"http(s)"` module or running on React Native, this option is ignored.
+	 * Instead, you can configure the `Cache-Control` headers to achieve similar effects.
+	 * @default 'default'
+	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/cache}
+	 */
+	cache?: RequestCache;
 }
 
 export type HttpTransferHandler = TransferHandler<

package/src/clients/types/index.ts

@@ -22,5 +22,4 @@ export {
 	EndpointResolverOptions,
 	ErrorParser,
 	ServiceClientOptions,
-	DefaultConfigOptions,
 } from './aws';

package/src/index.ts

@@ -50,13 +50,11 @@ export { UserProfile } from './types';
 
 // Storage helpers
 export {
-	StorageHelper,
-	MemoryStorage,
-	LocalStorage,
 	CookieStorage,
-	SessionStorage,
-	MemoryKeyValueStorage,
-} from './StorageHelper';
+	defaultStorage,
+	sessionStorage,
+	sharedInMemoryStorage,
+} from './storage';
 export { KeyValueStorageInterface } from './types';
 
 // Cache exports
@@ -67,5 +65,3 @@ export { BrowserStorageCache as Cache }; // Maintain interoperability with React
 
 // Internationalization utilities
 export { I18n } from './I18n';
-
-export { parseAWSExports } from './parseAWSExports';

package/src/libraryUtils.ts

@@ -7,7 +7,7 @@ utils for use throughout the library.
 */
 // JS utilities
 export {
-	browserOrNode,
+	isBrowser,
 	filenameToContentType,
 	generateRandomString,
 	isEmpty,
@@ -20,7 +20,8 @@ export {
 	transferKeyToLowerCase,
 	transferKeyToUpperCase,
 } from './Util/JS';
-
+export { parseAWSExports } from './parseAWSExports';
+export { LegacyConfig } from './singleton/types';
 export {
 	JWT,
 	StrictUnion,
@@ -96,8 +97,6 @@ export {
 	AmplifyError,
 	AmplifyErrorString,
 } from './Util/Errors';
-export { FacebookOAuth, GoogleOAuth } from './OAuthHelper';
-export { AppState, AsyncStorage, Linking } from './RNComponents';
 export { ErrorParams, AmplifyErrorMap, ServiceError } from './types';
 export {
 	INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,

package/src/parseAWSExports.ts

@@ -3,6 +3,12 @@
 import { OAuthConfig } from './singleton/Auth/types';
 import { ResourcesConfig } from './singleton/types';
 
+const authTypeMapping: Record<any, any> = {
+	API_KEY: 'apiKey',
+	AWS_IAM: 'iam',
+	AMAZON_COGNITO_USER_POOLS: 'jwt',
+};
+
 /**
  * This utility converts the `aws-exports.js` file generated by the Amplify CLI into a {@link ResourcesConfig} object
  * consumable by Amplify.
@@ -11,10 +17,15 @@ import { ResourcesConfig } from './singleton/types';
  *
  * @returns A {@link ResourcesConfig} object.
  */
+
 export const parseAWSExports = (
 	config: Record<string, any> = {}
 ): ResourcesConfig => {
 	const {
+		aws_appsync_apiKey,
+		aws_appsync_authenticationType,
+		aws_appsync_graphqlEndpoint,
+		aws_appsync_region,
 		aws_cognito_identity_pool_id,
 		aws_cognito_sign_up_verification_method,
 		aws_mandatory_sign_in,
@@ -40,6 +51,21 @@ export const parseAWSExports = (
 		};
 	}
 
+	// TODO: Need to support all API configurations
+	// API
+	if (aws_appsync_graphqlEndpoint) {
+		amplifyConfig.API = {
+			AppSync: {
+				defaultAuthMode: {
+					type: authTypeMapping[aws_appsync_authenticationType],
+					apiKey: aws_appsync_apiKey,
+				},
+				endpoint: aws_appsync_graphqlEndpoint,
+				region: aws_appsync_region,
+			},
+		};
+	}
+
 	// Auth
 	if (aws_cognito_identity_pool_id || aws_user_pools_id) {
 		amplifyConfig.Auth = {

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

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { v4 as uuid } from 'uuid';
-import { PinpointRecordParameters, PinpointSession } from '../types';
+import { PinpointRecordInput, PinpointSession } from '../types';
 import { getEndpointId } from '../utils';
-import { 
+import {
 	BUFFER_SIZE,
 	FLUSH_INTERVAL,
 	FLUSH_SIZE,
@@ -28,11 +28,11 @@ export const record = async ({
 	identityId,
 	region,
 	userAgentValue,
-}: PinpointRecordParameters): Promise<void> => {
+}: PinpointRecordInput): Promise<void> => {
 	const timestampISOString = new Date().toISOString();
 	const eventId = uuid();
 	let endpointId = await getEndpointId(appId, category);
-  
+
 	// Prepare event buffer if required
 	const buffer = getEventBuffer({
 		appId,
@@ -43,7 +43,7 @@ export const record = async ({
 		identityId,
 		region,
 		resendLimit: RESEND_LIMIT,
-		userAgentValue
+		userAgentValue,
 	});
 
 	// Prepare a Pinpoint endpoint via updateEndpoint if one does not already exist, which will generate and cache an
@@ -64,7 +64,7 @@ export const record = async ({
 	if (!endpointId) {
 		throw new AmplifyError({
 			name: 'ENDPOINT_NOT_CREATED',
-			message: 'Endpoint was not created.'
+			message: 'Endpoint was not created.',
 		});
 	}
 
@@ -77,7 +77,7 @@ export const record = async ({
 			StartTimestamp: timestampISOString,
 		};
 	}
-  
+
 	// Push event to buffer
 	buffer.push({
 		eventId,
@@ -85,6 +85,6 @@ export const record = async ({
 		event,
 		session,
 		timestamp: timestampISOString,
-		resendLimit: RESEND_LIMIT
+		resendLimit: RESEND_LIMIT,
 	});
 };

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

@@ -7,7 +7,7 @@ import {
 	updateEndpoint as clientUpdateEndpoint,
 	UpdateEndpointInput,
 } from '../../../AwsClients/Pinpoint';
-import { PinpointUpdateEndpointParameters } from '../types';
+import { PinpointUpdateEndpointInput } from '../types';
 import { cacheEndpointId, getEndpointId } from '../utils';
 
 /**
@@ -25,7 +25,7 @@ export const updateEndpoint = async ({
 	userId,
 	userProfile,
 	userAgentValue,
-}: PinpointUpdateEndpointParameters): Promise<void> => {
+}: PinpointUpdateEndpointInput): Promise<void> => {
 	const endpointId = await getEndpointId(appId, category);
 	// only generate a new endpoint id if one was not found in cache
 	const createdEndpointId = !endpointId ? uuidv4() : undefined;

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

@@ -7,7 +7,7 @@ import { PinpointAnalyticsEvent, PinpointSession } from './pinpoint';
 export type EventBufferConfig = {
 	appId: string;
 	bufferSize: number;
-	credentials: AuthSession['credentials'];
+	credentials: Required<AuthSession>['credentials'];
 	identityId: AuthSession['identityId'];
 	flushInterval: number;
 	flushSize: number;

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

@@ -38,18 +38,19 @@ export type PinpointAnalyticsEvent = {
 type PinpointCommonParameters = {
 	appId: string;
 	category: SupportedCategory;
-	credentials: AuthSession['credentials'];
+	credentials: Required<AuthSession>['credentials'];
 	identityId?: AuthSession['identityId'];
 	region: string;
 	userAgentValue?: string;
 };
 
-export type PinpointUpdateEndpointParameters = PinpointCommonParameters & PinpointServiceOptions & {
-	channelType?: SupportedChannelType;
-	userId?: string;
-	userProfile?: UserProfile;
-};
+export type PinpointUpdateEndpointInput = PinpointCommonParameters &
+	PinpointServiceOptions & {
+		channelType?: SupportedChannelType;
+		userId?: string;
+		userProfile?: UserProfile;
+	};
 
-export type PinpointRecordParameters = PinpointCommonParameters & {
+export type PinpointRecordInput = PinpointCommonParameters & {
 	event: PinpointAnalyticsEvent;
 };

package/src/providers/pinpoint/utils/PinpointEventBuffer.ts

@@ -8,14 +8,14 @@ import {
 	PutEventsInput,
 	PutEventsOutput,
 } from '../../../AwsClients/Pinpoint';
-import { 
+import {
 	EventBufferConfig,
 	BufferedEvent,
 	BufferedEventMap,
-	EventBuffer
+	EventBuffer,
 } from '../types/buffer';
 import { AuthSession } from '../../../singleton/Auth/types';
-import { isAppInForeground } from '../../../RNComponents/isAppInForeground';
+import { isAppInForeground } from './isAppInForeground';
 
 const logger = new Logger('PinpointEventBuffer');
 const RETRYABLE_CODES = [429, 500];
@@ -39,7 +39,9 @@ export class PinpointEventBuffer {
 
 	public push(event: BufferedEvent) {
 		if (this._buffer.length >= this._config.bufferSize) {
-			logger.debug('Exceeded Pinpoint event buffer limits, event dropped.', { eventId: event.eventId });
+			logger.debug('Exceeded Pinpoint event buffer limits, event dropped.', {
+				eventId: event.eventId,
+			});
 
 			return;
 		}
@@ -112,16 +114,18 @@ export class PinpointEventBuffer {
 		}
 	}
 
-	private _generateBatchEventParams(eventMap: BufferedEventMap): PutEventsInput {
+	private _generateBatchEventParams(
+		eventMap: BufferedEventMap
+	): PutEventsInput {
 		const batchItem: Record<string, EventsBatch> = {};
 
 		Object.values(eventMap).forEach(item => {
 			const { event, timestamp, endpointId, eventId, session } = item;
 			const { name, attributes, metrics } = event;
-	
+
 			batchItem[endpointId] = {
 				Endpoint: {
-					...batchItem[endpointId]?.Endpoint
+					...batchItem[endpointId]?.Endpoint,
 				},
 				Events: {
 					...batchItem[endpointId]?.Events,
@@ -131,11 +135,11 @@ export class PinpointEventBuffer {
 						Attributes: attributes,
 						Metrics: metrics,
 						Session: session,
-					}
+					},
 				},
 			};
 		});
-	
+
 		return {
 			ApplicationId: this._config.appId,
 			EventsRequest: {
@@ -200,7 +204,7 @@ export class PinpointEventBuffer {
 				logger.warn('Pinpoint event failed to send.', {
 					eventId,
 					name,
-					message: Message
+					message: Message,
 				});
 			});
 		});
@@ -222,7 +226,7 @@ export class PinpointEventBuffer {
 				logger.debug('Resending event.', {
 					eventId,
 					name,
-					remainingAttempts: bufferedEvent.resendLimit
+					remainingAttempts: bufferedEvent.resendLimit,
 				});
 				eligibleEvents.push({ [eventId!]: bufferedEvent });
 				return;
@@ -230,7 +234,7 @@ export class PinpointEventBuffer {
 
 			logger.debug('No retry attempts remaining for event.', {
 				eventId,
-				name
+				name,
 			});
 		});
 

package/src/providers/pinpoint/utils/isAppInForeground.native.ts

@@ -0,0 +1,7 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+// @ts-ignore: missing type definition
+import { AppState } from 'react-native';
+
+export const isAppInForeground = () => AppState.currentState === 'active';

package/src/providers/pinpoint/utils/isAppInForeground.ts

@@ -0,0 +1,4 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export const isAppInForeground = () => true;

package/src/singleton/API/types.ts

@@ -0,0 +1,31 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+export type LibraryAPIOptions = {
+	AppSync: {
+		query: string;
+		variables?: object;
+		authMode?: any;
+		authToken?: string;
+		/**
+		 * @deprecated This property should not be used
+		 */
+		userAgentSuffix?: string;
+	};
+	customHeaders: Function;
+};
+
+export type APIConfig = {
+	AppSync?: {
+		defaultAuthMode?: GraphQLAuthMode;
+		region?: string;
+		endpoint?: string;
+		modelIntrospectionSchema?: any;
+	};
+};
+
+export type GraphQLAuthMode =
+	| { type: 'apiKey'; apiKey: string }
+	| { type: 'jwt'; token: 'id' | 'access' }
+	| { type: 'iam' }
+	| { type: 'lambda' }
+	| { type: 'custom' };

package/src/singleton/Amplify.ts

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 import { AuthClass } from './Auth';
 import { Hub, AMPLIFY_SYMBOL } from '../Hub';
-import { LibraryOptions, ResourcesConfig } from './types';
+import { LegacyConfig, LibraryOptions, ResourcesConfig } from './types';
+import { parseAWSExports } from '../parseAWSExports';
 
 // TODO(v6): add default AuthTokenStore for each platform
 
@@ -33,12 +34,20 @@ export class AmplifyClass {
 	 * @param libraryOptions - Additional options for customizing the behavior of the library.
 	 */
 	configure(
-		resourcesConfig: ResourcesConfig,
+		resourcesConfig: ResourcesConfig | LegacyConfig,
 		libraryOptions: LibraryOptions = {}
 	): void {
+		let resolvedResourceConfig: ResourcesConfig;
+
+		if (Object.keys(resourcesConfig).some(key => key.startsWith('aws_'))) {
+			resolvedResourceConfig = parseAWSExports(resourcesConfig);
+		} else {
+			resolvedResourceConfig = resourcesConfig as ResourcesConfig;
+		}
+
 		this.resourcesConfig = mergeResourceConfig(
 			this.resourcesConfig,
-			resourcesConfig
+			resolvedResourceConfig
 		);
 
 		this.libraryOptions = mergeLibraryOptions(

package/src/singleton/Auth/index.ts

@@ -52,8 +52,7 @@ export class AuthClass {
 		let userSub: string | undefined;
 
 		// Get tokens will throw if session cannot be refreshed (network or service error) or return null if not available
-		tokens =
-			(await this.authOptions?.tokenProvider?.getTokens(options)) ?? undefined;
+		tokens = await this.getTokens(options);
 
 		if (tokens) {
 			userSub = tokens.accessToken?.payload?.sub;
@@ -93,4 +92,12 @@ export class AuthClass {
 			return await this.authOptions.credentialsProvider.clearCredentialsAndIdentityId();
 		}
 	}
+
+	async getTokens(
+		options: FetchAuthSessionOptions
+	): Promise<AuthTokens | undefined> {
+		return (
+			(await this.authOptions?.tokenProvider?.getTokens(options)) ?? undefined
+		);
+	}
 }

package/src/singleton/Auth/utils/index.ts

@@ -63,10 +63,10 @@ export function assertIdentityPooIdConfig(
 ): asserts cognitoConfig is CognitoIdentityPoolConfig {
 	const validConfig = !!cognitoConfig?.identityPoolId;
 	return asserts(validConfig, {
-		name: 'AuthIdentityPoolIdException',
-		message: 'Auth IdentityPoolId not configured',
+		name: 'InvalidIdentityPoolIdException',
+		message: 'Invalid identity pool id provided.',
 		recoverySuggestion:
-			'Make sure to call Amplify.configure in your app with a valid IdentityPoolId',
+			'Make sure a valid identityPoolId is given in the config.',
 	});
 }
 

package/src/singleton/Storage/types.ts

@@ -7,8 +7,13 @@ export interface StorageConfig {
 	S3: {
 		bucket?: string;
 		region?: string;
+		/**
+		 * Internal-only configuration for testing purpose. You should not use this.
+		 *
+		 * @internal
+		 */
 		dangerouslyConnectToHttpEndpointForTesting?: string;
-	}
+	};
 }
 
 type StoragePrefixResolver = (params: {
@@ -16,7 +21,6 @@ type StoragePrefixResolver = (params: {
 	targetIdentityId?: string;
 }) => Promise<string>;
 
-// TODO[AllanZhengYP]: need to finalize the decision whether to move defaultAccessLevel to StorageConfig
 export interface LibraryStorageOptions {
 	S3: {
 		prefixResolver?: StoragePrefixResolver;