@aws-amplify/core 6.0.1-console-preview.f63250a.0 → 6.0.1-console-preview.5dc0b68.0

package/src/OAuthHelper/GoogleOAuth.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ConsoleLogger as Logger } from '../Logger';
-import { browserOrNode } from '../JS';
+import { browserOrNode } from '../Util/JS';
 import { NonRetryableError } from '../Util';
 
 const logger = new Logger('CognitoCredentials');

package/src/Platform/version.ts

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

package/src/RNComponents/index.ts

@@ -1,12 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { browserOrNode } from '../JS';
+import { browserOrNode } from '../Util/JS';
 import { StorageHelper } from '../StorageHelper';
 
 export const Linking = {};
 export const AppState = {
 	addEventListener: (action: any, handler: any) => undefined,
+	currentState: 'active'
 };
 
 // if not in react native, just use local storage

package/src/RNComponents/isAppInForeground.ts

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

package/src/ServiceWorker/ServiceWorker.ts

@@ -13,11 +13,11 @@
  * and limitations under the License.
  */
 import { ConsoleLogger as Logger } from '../Logger';
-import { browserOrNode } from '../JS';
+import { browserOrNode } from '../Util/JS';
 import { Amplify } from '../Amplify';
 import { asserts } from '../Util/errors/AssertError';
-import { AmplifyError } from '../Errors';
-import { SERVICE_WORKER_EXCEPTION } from '../constants';
+import { AmplifyError } from '../Util/Errors';
+import { SERVICE_WORKER_EXCEPTION } from '../Util/Constants';
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.

package/src/StorageHelper/localStorage.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { KeyValueStorageInterface } from "../types";
-import { PlatformNotSupportedError } from '../Errors';
+import { PlatformNotSupportedError } from '../Util/Errors';
 
 class LocalStorageClass implements KeyValueStorageInterface {
 	storage?: Storage;

package/src/StorageHelper/sessionStorage.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PlatformNotSupportedError } from '../Errors';
+import { PlatformNotSupportedError } from '../Util/Errors';
 import { KeyValueStorageInterface } from '../types';
 
 class SessionStorageClass implements KeyValueStorageInterface {

package/src/UniversalStorage/index.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import Cookies, { CookieSetOptions } from 'universal-cookie';
-import { browserOrNode } from '../JS';
+import { browserOrNode } from '../Util/JS';
 
 type Store = Record<string, string>;
 

package/src/Util/Constants.ts

@@ -2,23 +2,32 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // Logging constants
-const AWS_CLOUDWATCH_BASE_BUFFER_SIZE = 26;
-const AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE = 1048576;
-const AWS_CLOUDWATCH_MAX_EVENT_SIZE = 256000;
-const AWS_CLOUDWATCH_CATEGORY = 'Logging';
-const AWS_CLOUDWATCH_PROVIDER_NAME = 'AWSCloudWatch';
-const NO_CREDS_ERROR_STRING = 'No credentials';
-const RETRY_ERROR_CODES = [
+export const AWS_CLOUDWATCH_CATEGORY = 'Logging';
+export const NO_CREDS_ERROR_STRING = 'No credentials';
+export const RETRY_ERROR_CODES = [
 	'ResourceNotFoundException',
 	'InvalidSequenceTokenException',
 ];
 
-export {
-	AWS_CLOUDWATCH_BASE_BUFFER_SIZE,
-	AWS_CLOUDWATCH_CATEGORY,
-	AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE,
-	AWS_CLOUDWATCH_MAX_EVENT_SIZE,
-	AWS_CLOUDWATCH_PROVIDER_NAME,
-	NO_CREDS_ERROR_STRING,
-	RETRY_ERROR_CODES,
-};
+/**
+ * This Symbol is used to reference an internal-only PubSub provider that
+ * is used for AppSync/GraphQL subscriptions in the API category.
+ */
+const hasSymbol =
+	typeof Symbol !== 'undefined' && typeof Symbol.for === 'function';
+
+export const INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = hasSymbol
+	? Symbol.for('INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER')
+	: '@@INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER';
+
+export const USER_AGENT_HEADER = 'x-amz-user-agent';
+
+// Error exception code constants
+export const AUTH_CONFING_EXCEPTION = 'AuthConfigException';
+export const CACHE_LIST_EXCEPTION = 'CacheListException';
+export const I18N_EXCEPTION = 'I18NException';
+export const SERVICE_WORKER_EXCEPTION = 'ServiceWorkerException';
+export const STORAGE_CACHE_EXCEPTION = 'StorageCacheException';
+export const APPLICATION_ID_EXCEPTION = 'ApplicationIdException';
+export const NO_HUBCALLBACK_PROVIDED_EXCEPTION =
+	'NoHubcallbackProvidedException';

package/src/{Errors.ts → Util/Errors.ts}

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ErrorParams } from './types/types';
+import { ErrorParams } from '../types/errors';
 
 export function missingConfig(name: string) {
 	return new Error('Missing config value of ' + name);

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 { browserOrNode, isWebWorker } from './JS';
 
 type NetworkStatus = {
 	online: boolean;

package/src/Util/errors/AssertError.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { AmplifyError } from '../../Errors';
+import { AmplifyError } from '../Errors';
 import { ErrorParams } from '../../types';
 
 export function asserts(

package/src/Util/index.ts

@@ -12,11 +12,7 @@ export { default as Reachability } from './Reachability';
 export { DateUtils } from './DateUtils';
 export { urlSafeDecode, urlSafeEncode } from './StringUtils';
 export {
-	AWS_CLOUDWATCH_BASE_BUFFER_SIZE,
 	AWS_CLOUDWATCH_CATEGORY,
-	AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE,
-	AWS_CLOUDWATCH_MAX_EVENT_SIZE,
-	AWS_CLOUDWATCH_PROVIDER_NAME,
 	NO_CREDS_ERROR_STRING,
 	RETRY_ERROR_CODES,
 } from './Constants';

package/src/adapterCore/error/AmplifyServerContextError.ts

@@ -0,0 +1,23 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyError } from '../../libraryUtils';
+
+export class AmplifyServerContextError extends AmplifyError {
+	constructor({
+		message,
+		recoverySuggestion,
+		underlyingError,
+	}: {
+		message: string;
+		recoverySuggestion?: string;
+		underlyingError?: Error;
+	}) {
+		super({
+			name: 'AmplifyServerContextError',
+			message,
+			recoverySuggestion,
+			underlyingError,
+		});
+	}
+}

package/src/adapterCore/error/index.ts

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

package/src/adapterCore/index.ts

@@ -0,0 +1,11 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+	createAmplifyServerContext,
+	getAmplifyServerContext,
+	destroyAmplifyServerContext,
+	AmplifyServer,
+	CookieStorage,
+} from './serverContext';
+export { AmplifyServerContextError } from './error';

package/src/adapterCore/serverContext/index.ts

@@ -0,0 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export {
+	createAmplifyServerContext,
+	destroyAmplifyServerContext,
+	getAmplifyServerContext,
+} from './serverContext';
+
+export { AmplifyServer, CookieStorage } from './types';

package/src/adapterCore/serverContext/serverContext.ts

@@ -0,0 +1,54 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyServer } from './types';
+import { serverContextRegistry } from './serverContextRegistry';
+import { AmplifyClass } from '../../singleton';
+import { LibraryOptions, ResourcesConfig } from '../../singleton/types';
+
+/**
+ * Creates an Amplify server context.
+ * @param amplifyConfig The Amplify resource config.
+ * @param libraryOptions The Amplify library options.
+ * @returns The Amplify server context spec.
+ */
+export const createAmplifyServerContext = (
+	amplifyConfig: ResourcesConfig,
+	libraryOptions: LibraryOptions
+): AmplifyServer.ContextSpec => {
+	const amplify = new AmplifyClass();
+	amplify.configure(amplifyConfig, libraryOptions);
+
+	return serverContextRegistry.register({
+		amplify,
+	});
+};
+
+/**
+ * Returns an Amplify server context.
+ * @param contextSpec The context spec used to get the Amplify server context.
+ * @returns The Amplify server context.
+ */
+export const getAmplifyServerContext = (
+	contextSpec: AmplifyServer.ContextSpec
+): AmplifyServer.Context => {
+	const context = serverContextRegistry.get(contextSpec);
+
+	if (context) {
+		return context;
+	}
+
+	throw new Error(
+		'Attempted to get the Amplify Server Context that may have been destroyed.'
+	);
+};
+
+/**
+ * Destroys an Amplify server context.
+ * @param contextSpec The context spec used to destroy the Amplify server context.
+ */
+export const destroyAmplifyServerContext = (
+	contextSpec: AmplifyServer.ContextSpec
+): void => {
+	serverContextRegistry.deregister(contextSpec);
+};

package/src/adapterCore/serverContext/serverContextRegistry.ts

@@ -0,0 +1,31 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyServer } from './types';
+
+const storage = new WeakMap<
+	AmplifyServer.ContextToken,
+	AmplifyServer.Context
+>();
+
+function createToken(): AmplifyServer.ContextToken {
+	return {
+		value: Symbol('AmplifyServerContextToken'),
+	};
+}
+
+export const serverContextRegistry = {
+	register(context: AmplifyServer.Context): AmplifyServer.ContextSpec {
+		const token = createToken();
+		storage.set(token, context);
+		return { token };
+	},
+	deregister(contextSpec: AmplifyServer.ContextSpec): boolean {
+		return storage.delete(contextSpec.token);
+	},
+	get(
+		contextSpec: AmplifyServer.ContextSpec
+	): AmplifyServer.Context | undefined {
+		return storage.get(contextSpec.token);
+	},
+};

package/src/adapterCore/serverContext/types/amplifyServer.ts

@@ -0,0 +1,29 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyClass } from '../../../singleton';
+import { LibraryOptions, ResourcesConfig } from '../../../singleton/types';
+
+export namespace AmplifyServer {
+	export type ContextToken = {
+		readonly value: Symbol;
+	};
+
+	export type ContextSpec = {
+		readonly token: ContextToken;
+	};
+
+	export type Context = {
+		amplify: AmplifyClass;
+	};
+
+	export interface RunOperationWithContext {
+		<Result>(
+			amplifyConfig: ResourcesConfig,
+			libraryOptions: LibraryOptions,
+			operation: (
+				contextSpec: AmplifyServer.ContextSpec
+			) => Result | Promise<Result>
+		): Promise<Result>;
+	}
+}

package/src/adapterCore/serverContext/types/cookieStorage.ts

@@ -0,0 +1,43 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { CookieSerializeOptions } from 'cookie';
+
+export namespace CookieStorage {
+	export type SetCookieOptions = Pick<
+		CookieSerializeOptions,
+		'domain' | 'expires' | 'httpOnly' | 'maxAge' | 'sameSite' | 'secure'
+	>;
+
+	export type Cookie = {
+		name: string;
+		value?: string;
+	} & SetCookieOptions;
+
+	export interface Adapter {
+		/**
+		 * Get all cookies from the storage.
+		 */
+		getAll(): Cookie[];
+
+		/**
+		 * Get a cookie from the storage.
+		 * @param name The name of the cookie.
+		 */
+		get(name: string): Cookie | undefined;
+
+		/**
+		 * Set a cookie in the storage.
+		 * @param name The name of the cookie.
+		 * @param value The value of the cookie.
+		 * @param [options] The cookie's options.
+		 */
+		set(name: string, value: string, options?: SetCookieOptions): void;
+
+		/**
+		 * Delete a cookie from the storage.
+		 * @param name The name of the cookie.
+		 */
+		delete(name: string): void;
+	}
+}

package/src/adapterCore/serverContext/types/index.ts

@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyServer } from './amplifyServer';
+
+type AmplifyServerContextSpec = AmplifyServer.ContextSpec;
+
+export { AmplifyServerContextSpec, AmplifyServer };
+export { CookieStorage } from './cookieStorage';

package/src/clients/handlers/fetch.ts

@@ -9,6 +9,7 @@ import { withMemoization } from '../utils/memoization';
 const shouldSendBody = (method: string) =>
 	!['HEAD', 'GET', 'DELETE'].includes(method.toUpperCase());
 
+// TODO[AllanZhengYP]: we need to provide isCanceledError utility
 export const fetchTransferHandler: TransferHandler<
 	HttpRequest,
 	HttpResponse,

package/src/clients/internal/composeServiceApi.ts

@@ -9,7 +9,7 @@ export const composeServiceApi = <
 	TransferHandlerOptions,
 	Input,
 	Output,
-	DefaultConfig extends Partial<TransferHandlerOptions & ServiceClientOptions>
+	DefaultConfig
 >(
 	transferHandler: TransferHandler<
 		HttpRequest,
@@ -21,11 +21,14 @@ export const composeServiceApi = <
 		endpoint: Endpoint
 	) => Promise<HttpRequest> | HttpRequest,
 	deserializer: (output: HttpResponse) => Promise<Output>,
-	defaultConfig: DefaultConfig
+	defaultConfig: Partial<DefaultConfig>
 ) => {
 	return async (
 		config: OptionalizeKey<
-			TransferHandlerOptions & ServiceClientOptions & DefaultConfig,
+			TransferHandlerOptions &
+				ServiceClientOptions &
+				Partial<DefaultConfig> &
+				InferEndpointResolverOptionType<DefaultConfig>,
 			keyof DefaultConfig
 		>,
 		input: Input
@@ -51,6 +54,12 @@ export const composeServiceApi = <
 	};
 };
 
-type OptionalizeKey<T, K> = Omit<T, K & keyof T> & {
+type OptionalizeKey<T, K extends keyof T> = Omit<T, K> & {
 	[P in K & keyof T]?: T[P];
 };
+
+type InferEndpointResolverOptionType<T> = T extends {
+	endpointResolver: (options: infer EndpointOptions) => any;
+}
+	? EndpointOptions
+	: never;

package/src/index.ts

@@ -1,127 +1,20 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { Amplify } from './Amplify';
-import { Platform } from './Platform';
-
-export { Amplify };
-export { AmplifyClass } from './Amplify';
+/*
+This file maps top-level exports from `@aws-amplify/core`. These are intended to be potentially customer-facing exports.
+*/
+// TODO Remove these
 export { ClientDevice } from './ClientDevice';
 export { ConsoleLogger, ConsoleLogger as Logger } from './Logger';
-export {
-	invalidParameter,
-	missingConfig,
-	AmplifyError,
-	AmplifyErrorString,
-} from './Errors';
-export { Hub, HubCapsule, HubCallback, HubPayload } from './Hub';
-export { I18n } from './I18n';
-export {
-	browserOrNode,
-	filenameToContentType,
-	generateRandomString,
-	isEmpty,
-	isStrictObject,
-	isTextFile,
-	isWebWorker,
-	makeQuerablePromise,
-	objectLessAttributes,
-	sortByField,
-	transferKeyToLowerCase,
-	transferKeyToUpperCase,
-} from './JS';
-export { Signer } from './Signer';
-export { parseAWSExports } from './parseAWSExports';
-export { AWSCloudWatchProvider } from './Providers';
+export { Hub } from './Hub';
+export { HubCapsule, HubCallback, HubPayload } from './Hub/types';
 export { FacebookOAuth, GoogleOAuth } from './OAuthHelper';
 export { AppState, AsyncStorage, Linking } from './RNComponents';
 export { Credentials, CredentialsClass } from './Credentials';
-export { ServiceWorker } from './ServiceWorker';
-export {
-	ICredentials,
-	ErrorParams,
-	AmplifyErrorMap,
-	ServiceError,
-	KeyValueStorageInterface,
-} from './types';
-export {
-	StorageHelper,
-	MemoryStorage,
-	LocalStorage,
-	CookieStorage,
-	SessionStorage,
-	MemoryKeyValueStorage,
-} from './StorageHelper';
-export { UniversalStorage } from './UniversalStorage';
-export {
-	Platform,
-	getAmplifyUserAgentObject,
-	getAmplifyUserAgent,
-} from './Platform';
-export {
-	ApiAction,
-	AuthAction,
-	AnalyticsAction,
-	Category,
-	CustomUserAgentDetails,
-	DataStoreAction,
-	Framework,
-	GeoAction,
-	InteractionsAction,
-	InAppMessagingAction,
-	PredictionsAction,
-	PubSubAction,
-	PushNotificationAction,
-	StorageAction,
-} from './Platform/types';
-export {
-	INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,
-	USER_AGENT_HEADER,
-} from './constants';
-
-export const Constants = {
-	userAgent: Platform.userAgent,
-};
-
-export {
-	AWS_CLOUDWATCH_BASE_BUFFER_SIZE,
-	AWS_CLOUDWATCH_CATEGORY,
-	AWS_CLOUDWATCH_MAX_BATCH_EVENT_SIZE,
-	AWS_CLOUDWATCH_MAX_EVENT_SIZE,
-	AWS_CLOUDWATCH_PROVIDER_NAME,
-	BackgroundManagerNotOpenError,
-	BackgroundProcessManager,
-	BackgroundProcessManagerState,
-	DateUtils,
-	Mutex,
-	NO_CREDS_ERROR_STRING,
-	NonRetryableError,
-	RETRY_ERROR_CODES,
-	Reachability,
-	isNonRetryableError,
-	jitteredBackoff,
-	jitteredExponentialRetry,
-	retry,
-	urlSafeDecode,
-	urlSafeEncode,
-} from './Util';
-
-// Cache exports
-import { BrowserStorageCache } from './Cache/BrowserStorageCache';
-export { asserts } from './Util/errors/AssertError';
-export { isTokenExpired } from './singleton/Auth';
-export { InMemoryCache } from './Cache/InMemoryCache';
-export { CacheConfig } from './Cache/types';
-export { ICache } from './Cache/types';
-export { BrowserStorageCache };
-export { BrowserStorageCache as Cache }; // Maintain interoperability with React Native
+export { ICredentials } from './types';
 
 // Singleton exports
-export {
-	decodeJWT,
-	assertTokenProviderConfig,
-	assertIdentityPooIdConfig,
-} from './singleton/Auth/utils';
 export {
 	TokenProvider,
 	AuthTokens,
@@ -129,6 +22,7 @@ export {
 	AWSCredentialsAndIdentityIdProvider,
 	AWSCredentialsAndIdentityId,
 	Identity,
+	OAuthConfig,
 } from './singleton/Auth/types';
 export {
 	AuthConfig,
@@ -137,7 +31,14 @@ export {
 	StorageAccessLevel,
 	StorageConfig,
 	GetCredentialsOptions,
+	ResourcesConfig,
+	LibraryOptions,
 } from './singleton/types';
+export {
+	Amplify,
+	fetchAuthSession,
+	AmplifyClass as AmplifyClassV6,
+} from './singleton';
 
 // AWSClients exports
 export {
@@ -147,10 +48,29 @@ export {
 	GetCredentialsForIdentityOutput,
 } from './AwsClients/CognitoIdentity';
 
-export { AmplifyV6, fetchAuthSession } from './singleton';
-export { LibraryOptions, ResourcesConfig } from './singleton/types';
+// Amplify-wide constructs
+export { UserProfile } from './types';
 
-/**
- * @deprecated use named import
- */
-export default Amplify;
+// Storage helpers
+export {
+	StorageHelper,
+	MemoryStorage,
+	LocalStorage,
+	CookieStorage,
+	SessionStorage,
+	MemoryKeyValueStorage,
+} from './StorageHelper';
+export { KeyValueStorageInterface } from './types';
+export { UniversalStorage } from './UniversalStorage';
+
+// Cache exports
+import { BrowserStorageCache } from './Cache/BrowserStorageCache';
+export { InMemoryCache } from './Cache/InMemoryCache';
+export { CacheConfig } from './Cache/types';
+export { BrowserStorageCache };
+export { BrowserStorageCache as Cache }; // Maintain interoperability with React Native
+
+// Internationalization utilities
+export { I18n } from './I18n';
+
+export { parseAWSExports } from './parseAWSExports';