@aws-amplify/core 6.0.1-console-preview.deaebd5.0 → 6.0.1-console-preview.b5a42af.0

package/lib-esm/utils/globalHelpers/index.native.d.ts

@@ -1,4 +1,3 @@
-import 'react-native-get-random-values';
 import { encode, decode } from 'base-64';
 export declare const getCrypto: () => Crypto;
 export declare const getBtoa: () => typeof encode;

package/lib-esm/utils/globalHelpers/index.native.js

@@ -1,8 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import 'react-native-get-random-values';
+import { loadGetRandomValues } from '@aws-amplify/react-native';
 import { encode, decode } from 'base-64';
 import { AmplifyError } from '../../errors';
+loadGetRandomValues();
 export var getCrypto = function () {
     if (typeof crypto !== 'undefined' &&
         typeof crypto.getRandomValues === 'function') {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-console-preview.deaebd5.0+deaebd5",
+	"version": "6.0.1-console-preview.b5a42af.0+b5a42af",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -56,7 +56,6 @@
 		"src",
 		"typings.d.ts",
 		"internals",
-		"polyfills",
 		"server"
 	],
 	"dependencies": {
@@ -69,16 +68,11 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@react-native-async-storage/async-storage": "^1.17.12",
-		"@react-native-community/netinfo": "4.7.0",
-		"@types/base-64": "1.0.0",
+		"@aws-amplify/react-native": "1.0.1-console-preview.b5a42af.0+b5a42af",
 		"@types/js-cookie": "^2.2.7",
 		"@types/uuid": "^9.0.0",
-		"base-64": "1.0.0",
 		"find": "^0.2.7",
 		"genversion": "^2.2.0",
-		"react-native": "^0.68.7",
-		"react-native-get-random-values": "1.9.0",
 		"typescript": "5.0.2"
 	},
 	"size-limit": [
@@ -185,5 +179,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "deaebd5a938733ff2b25aaec39c042843ef2289c"
+	"gitHead": "b5a42af519fb741bb8056a814addd8804c8f60ec"
 }

package/src/Cache/AsyncStorageCache.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import AsyncStorage from '@react-native-async-storage/async-storage';
+import { loadAsyncStorage } from '@aws-amplify/react-native';
 import { ConsoleLogger as Logger } from '../Logger';
 import { StorageCache } from './StorageCache';
 import { defaultConfig, getCurrTime } from './Utils';
@@ -10,6 +10,7 @@ import { getCurrSizeKey } from './Utils/CacheUtils';
 import { assert, CacheErrorCode } from './Utils/errorHelpers';
 
 const logger = new Logger('AsyncStorageCache');
+const AsyncStorage = loadAsyncStorage();
 
 /*
  * Customized cache which based on the AsyncStorage with LRU implemented

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-console-preview.deaebd5.0+deaebd5';
+export const version = '6.0.1-console-preview.b5a42af.0+b5a42af';

package/src/Reachability/Reachability.native.ts

@@ -1,14 +1,16 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { Observable } from 'rxjs';
-import type NetInfo from '@react-native-community/netinfo';
+import { loadNetInfo } from '@aws-amplify/react-native';
 import { ConsoleLogger as Logger } from '../Logger';
 import { NetworkStatus } from './types';
 
 const logger = new Logger('Reachability', 'DEBUG');
 
 export class Reachability {
-	networkMonitor(netInfo?: typeof NetInfo): Observable<NetworkStatus> {
+	networkMonitor(
+		netInfo?: ReturnType<typeof loadNetInfo>
+	): Observable<NetworkStatus> {
 		/**
 		 * Here netinfo refers to @react-native-community/netinfo
 		 * This is needed in React Native to enable network detection

package/src/clients/handlers/fetch.ts

@@ -13,7 +13,10 @@ export const fetchTransferHandler: TransferHandler<
 	HttpRequest,
 	HttpResponse,
 	HttpTransferOptions
-> = async ({ url, method, headers, body }, { abortSignal, cache }) => {
+> = async (
+	{ url, method, headers, body },
+	{ abortSignal, cache, withCrossDomainCredentials }
+) => {
 	let resp: Response;
 	try {
 		resp = await fetch(url, {
@@ -22,6 +25,7 @@ export const fetchTransferHandler: TransferHandler<
 			body: shouldSendBody(method) ? body : undefined,
 			signal: abortSignal,
 			cache,
+			credentials: withCrossDomainCredentials ? 'include' : 'same-origin',
 		});
 	} catch (e) {
 		// TODO: needs to revise error handling in v6

package/src/clients/middleware/signing/signer/signatureV4/index.native.ts

@@ -1,7 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import '@aws-amplify/core/polyfills/URL';
+import { loadUrlPolyfill } from '@aws-amplify/react-native';
+
+loadUrlPolyfill();
 
 // TODO: V6 replace Signer
 export { signRequest } from './signRequest';

package/src/clients/types/http.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Request, Response, TransferHandler } from './core';
+import type { fetchTransferHandler } from '../handlers/fetch';
 
 /**
  * Use basic Record interface to workaround fetch Header class not available in Node.js
@@ -42,6 +43,23 @@ export interface HttpTransferOptions {
 	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/cache}
 	 */
 	cache?: RequestCache;
+
+	/**
+	 * Internal-only option controls whether or not cross-site Access-Control requests should be made using credentials
+	 * such as cookies, authorization headers or TLS client certificates. It has no effect on same-origin requests.
+	 * If set to `true`, the request will include credentials such as cookies, authorization headers, TLS
+	 * client certificates, and so on. Moreover the response cookies will also be set.
+	 * If set to `false`, the cross-site request will not include credentials, and the response cookies from a different
+	 * domain will be ignored.
+	 *
+	 * This option is only conformed by {@link fetchTransferHandler | fetchTransferHandler	}
+	 *
+	 * @default 'same-origin'
+	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest/withCredentials}
+	 * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/Request/credentials}
+	 * @internal
+	 */
+	withCrossDomainCredentials?: boolean;
 }
 
 export type HttpTransferHandler = TransferHandler<

package/src/libraryUtils.ts

@@ -34,7 +34,7 @@ export {
 	assertOAuthConfig,
 } from './singleton/Auth/utils';
 export { isTokenExpired } from './singleton/Auth';
-export { GraphQLAuthMode, GraphQLAuthModeKeys } from './singleton/API/types';
+export { APIAuthMode, DocumentType } from './singleton/API/types';
 export { Signer } from './Signer';
 
 // Logging utilities

package/src/parseAWSExports.ts

@@ -1,12 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { ConsoleLogger as Logger } from './Logger';
 import { OAuthConfig } from './singleton/Auth/types';
 import { ResourcesConfig } from './singleton/types';
 
+const logger = new Logger('parseAWSExports');
+
 const authTypeMapping: Record<any, any> = {
 	API_KEY: 'apiKey',
 	AWS_IAM: 'iam',
-	AMAZON_COGNITO_USER_POOLS: 'jwt',
+	AMAZON_COGNITO_USER_POOLS: 'userPool',
+	OPENID_CONNECT: 'oidc',
+	NONE: 'none',
+	LAMBDA: 'lambda',
 };
 
 /**
@@ -38,6 +44,7 @@ export const parseAWSExports = (
 		aws_user_pools_web_client_id,
 		geo,
 		oauth,
+		aws_cloud_logic_custom,
 	} = config;
 	const amplifyConfig: ResourcesConfig = {};
 
@@ -51,17 +58,20 @@ export const parseAWSExports = (
 		};
 	}
 
-	// TODO: Need to support all API configurations
 	// 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 = {
-			AppSync: {
-				defaultAuthMode: {
-					type: authTypeMapping[aws_appsync_authenticationType],
-					apiKey: aws_appsync_apiKey,
-				},
+			GraphQL: {
 				endpoint: aws_appsync_graphqlEndpoint,
+				apiKey: aws_appsync_apiKey,
 				region: aws_appsync_region,
+				defaultAuthMode: defaultAuthMode ?? 'iam',
 			},
 		};
 	}
@@ -109,6 +119,27 @@ export const parseAWSExports = (
 			: { ...geo };
 	}
 
+	// REST API
+	if (aws_cloud_logic_custom) {
+		amplifyConfig.API = {
+			...amplifyConfig.API,
+			REST: (aws_cloud_logic_custom as any[]).reduce(
+				(acc, api: Record<string, any>) => {
+					const { name, endpoint, region, service } = api;
+					return {
+						...acc,
+						[name]: {
+							endpoint,
+							...(service ? { service } : undefined),
+							...(region ? { region } : undefined),
+						},
+					};
+				},
+				{}
+			),
+		};
+	}
+
 	return amplifyConfig;
 };
 

package/src/providers/pinpoint/index.ts

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

package/src/singleton/API/types.ts

@@ -1,38 +1,89 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { Headers } from '../../clients';
+
 export type LibraryAPIOptions = {
-	AppSync: {
-		query: string;
-		variables?: object;
-		authMode?: any;
-		authToken?: string;
-		/**
-		 * @deprecated This property should not be used
-		 */
-		userAgentSuffix?: string;
+	GraphQL?: {
+		// custom headers for given GraphQL service. Will be applied to all operations.
+		headers?: (options: {
+			query: string;
+			variables: Record<string, DocumentType>;
+		}) => Promise<Headers>;
+	};
+	REST?: {
+		// custom headers for given REST service. Will be applied to all operations.
+		headers?: (options: { apiName: string }) => Promise<Headers>;
 	};
-	customHeaders: Function;
 };
 
-export type APIConfig = {
-	AppSync?: {
-		defaultAuthMode: GraphQLAuthMode;
-		region: string;
-		endpoint: string;
-		modelIntrospectionSchema?: any;
-	};
+type APIGraphQLConfig = {
+	/**
+	 * Required GraphQL endpoint, must be a valid URL string.
+	 */
+	endpoint: string;
+	/**
+	 * Optional region string used to sign the request. Required only if the auth mode is 'iam'.
+	 */
+	region?: string;
+	/**
+	 * Optional API key string. Required only if the auth mode is 'apiKey'.
+	 */
+	apiKey?: string;
+	/**
+	 * Custom domain endpoint for GraphQL API.
+	 */
+	customEndpoint?: string;
+	/**
+	 * Optional region string used to sign the request to `customEndpoint`. Effective only if `customEndpoint` is
+	 * specified, and the auth mode is 'iam'.
+	 */
+	customEndpointRegion?: string;
+	/**
+	 * Default auth mode for all the API calls to given service.
+	 */
+	defaultAuthMode: APIAuthMode;
 };
 
-export type GraphQLAuthMode =
-	| { type: 'apiKey'; apiKey: string }
-	| { type: 'jwt'; token?: 'id' | 'access' }
-	| { type: 'iam' }
-	| { type: 'lambda' }
-	| { type: 'custom' };
+type APIRestConfig = {
+	/**
+	 * Required REST endpoint, must be a valid URL string.
+	 */
+	endpoint: string;
+	/**
+	 * Optional region string used to sign the request with IAM credentials. If Omitted, region will be extracted from
+	 * the endpoint.
+	 *
+	 * @default 'us-east-1'
+	 */
+	region?: string;
+	/**
+	 * Optional service name string to sign the request with IAM credentials.
+	 *
+	 * @default 'execute-api'
+	 */
+	service?: string;
+};
 
-export type GraphQLAuthModeKeys =
+export type APIConfig = {
+	REST?: Record<string, APIRestConfig>;
+	GraphQL?: APIGraphQLConfig;
+};
+
+export type APIAuthMode =
 	| 'apiKey'
-	| 'jwt'
+	| 'oidc'
+	| 'userPool'
 	| 'iam'
 	| 'lambda'
-	| 'custom';
+	| 'none';
+
+/**
+ * Type representing a plain JavaScript object that can be serialized to JSON.
+ */
+export type DocumentType =
+	| null
+	| boolean
+	| number
+	| string
+	| DocumentType[]
+	| { [prop: string]: DocumentType };

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

@@ -28,7 +28,7 @@ export function assertTokenProviderConfig(
 		assertionValid = false;
 	} else {
 		assertionValid =
-			!!cognitoConfig.userPoolClientId && !!cognitoConfig.userPoolClientId;
+			!!cognitoConfig.userPoolId && !!cognitoConfig.userPoolClientId;
 	}
 
 	return assert(

package/src/singleton/Notifications/InAppMessaging/types.ts

@@ -0,0 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { PinpointProviderConfig } from '../../../providers/pinpoint/types';
+
+export type InAppMessagingConfig = PinpointProviderConfig;

package/src/singleton/Notifications/types.ts

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { InAppMessagingConfig } from './InAppMessaging/types';
+
+export type NotificationsConfig = {
+	InAppMessaging: InAppMessagingConfig;
+};

package/src/singleton/types.ts

@@ -19,6 +19,7 @@ import {
 	StorageConfig,
 } from './Storage/types';
 import { I18nConfig } from '../I18n/types';
+import { NotificationsConfig } from './Notifications/types';
 
 export type LegacyConfig = {
 	/**
@@ -35,7 +36,7 @@ export type ResourcesConfig = {
 	// DataStore?: {};
 	I18n?: I18nConfig;
 	// Interactions?: {};
-	// Notifications?: {};
+	Notifications?: NotificationsConfig;
 	// Predictions?: {};
 	Storage?: StorageConfig;
 	Geo?: GeoConfig;

package/src/storage/DefaultStorage.native.ts

@@ -1,18 +1,20 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import type { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { AmplifyError } from '../errors';
+import { loadAsyncStorage } from '@aws-amplify/react-native';
 import { KeyValueStorageInterface } from '../types';
 
-const ASYNC_STORAGE_MODULE = '@react-native-async-storage/async-storage';
 const MEMORY_KEY_PREFIX = '@MemoryStorage:';
 
 /**
  * @internal
  */
 export class DefaultStorage implements KeyValueStorageInterface {
-	private asyncStorage?: AsyncStorageStatic;
+	private asyncStorage: ReturnType<typeof loadAsyncStorage>;
+
+	constructor() {
+		this.asyncStorage = loadAsyncStorage();
+	}
 
 	/**
 	 * This is used to set a specific item in storage
@@ -21,7 +23,6 @@ export class DefaultStorage implements KeyValueStorageInterface {
 	 * @returns {string} value that was set
 	 */
 	setItem(key: string, value: string) {
-		this.assertModule(this.asyncStorage);
 		return this.asyncStorage.setItem(`${MEMORY_KEY_PREFIX}${key}`, value);
 	}
 
@@ -32,7 +33,6 @@ export class DefaultStorage implements KeyValueStorageInterface {
 	 * @returns {string} the data item
 	 */
 	getItem(key: string) {
-		this.assertModule(this.asyncStorage);
 		return this.asyncStorage.getItem(`${MEMORY_KEY_PREFIX}${key}`);
 	}
 
@@ -42,7 +42,6 @@ export class DefaultStorage implements KeyValueStorageInterface {
 	 * @returns {string} value - value that was deleted
 	 */
 	removeItem(key: string): Promise<void> {
-		this.assertModule(this.asyncStorage);
 		return this.asyncStorage.removeItem(`${MEMORY_KEY_PREFIX}${key}`);
 	}
 
@@ -51,28 +50,9 @@ export class DefaultStorage implements KeyValueStorageInterface {
 	 * @returns {string} nothing
 	 */
 	async clear(): Promise<void> {
-		this.assertModule(this.asyncStorage);
 		const allKeys = await this.asyncStorage.getAllKeys();
 		return this.asyncStorage.multiRemove(
 			allKeys.filter(key => key.startsWith(MEMORY_KEY_PREFIX))
 		);
 	}
-
-	private assertModule(
-		asyncStorage?: AsyncStorageStatic
-	): asserts asyncStorage {
-		if (!!asyncStorage) {
-			return;
-		}
-		try {
-			this.asyncStorage = require(ASYNC_STORAGE_MODULE)
-				.default as AsyncStorageStatic;
-		} catch (err) {
-			throw new AmplifyError({
-				name: 'NativeModuleException',
-				message: `Unable to find ${ASYNC_STORAGE_MODULE}`,
-				recoverySuggestion: `Make sure to install ${ASYNC_STORAGE_MODULE}`,
-			});
-		}
-	}
 }

package/src/utils/globalHelpers/index.native.ts

@@ -1,10 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import 'react-native-get-random-values';
+import { loadGetRandomValues } from '@aws-amplify/react-native';
 import { encode, decode } from 'base-64';
 import { AmplifyError } from '../../errors';
 
+loadGetRandomValues();
+
 export const getCrypto = () => {
 	if (
 		typeof crypto !== 'undefined' &&

package/polyfills/URL/index.ts

@@ -1,14 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-/**
- * TODO: [v6] remove this polyfill.
- *
- * The `react-native-url-polyfill` package needs to be bundled because it's
- * a commonjs package that would break the users' Jest unit tests, where MJS
- * is not supported by default.
- */
-/*if (process?.env?.NODE_ENV !== 'test') {
-	// Loading this polyfill in customers' unit tests will cause undefined
-	// variable error in un-mocked react-native package.
-	require('react-native-url-polyfill/auto');
-}*/

package/polyfills/URL/tsconfig.json

@@ -1,10 +0,0 @@
-{
-	"compilerOptions": {
-		"allowSyntheticDefaultImports": true,
-		"noImplicitAny": true,
-		"module": "es6",
-		"target": "es5",
-		"allowJs": true
-	},
-	"files": ["index.ts"]
-}

package/polyfills/URL/webpack.config.js

@@ -1,43 +0,0 @@
-const path = require('path');
-
-const rnUrlPolyfillPath = require.resolve('react-native-url-polyfill');
-const rnUrlPolyfillMeta = require(path.join(
-	path.dirname(rnUrlPolyfillPath),
-	'package.json'
-));
-const rnUrlPolyfillDeps = Object.keys({
-	...rnUrlPolyfillMeta.dependencies,
-	...rnUrlPolyfillMeta.peerDependencies,
-});
-const rnUrlPolyfillDepsRegex = rnUrlPolyfillDeps.map(
-	name => new RegExp(`^${name}\/?`) // match name with optional trailing slash
-);
-
-module.exports = {
-	name: 'index',
-	context: path.resolve(__dirname),
-	entry: {
-		index: path.join(__dirname, 'index.ts'),
-	},
-	output: {
-		path: path.resolve(__dirname),
-		filename: '[name].js',
-		library: {
-			type: 'commonjs',
-		},
-	},
-	module: {
-		rules: [
-			{
-				test: /\.(ts|tsx)$/i,
-				loader: 'ts-loader',
-				exclude: ['/node_modules/'],
-			},
-		],
-	},
-	resolve: {
-		extensions: ['.tsx', '.ts', '.jsx', '.js'],
-	},
-	externals: rnUrlPolyfillDepsRegex,
-	mode: 'production',
-};