@aws-amplify/core 6.0.1-console-preview.4432977.0 → 6.0.1-console-preview.67f944e.0

package/src/Cache/BrowserStorageCache.ts

@@ -5,9 +5,8 @@ import { ConsoleLogger as Logger } from '../Logger';
 import { defaultConfig, getCurrTime } from './Utils';
 import { StorageCache } from './StorageCache';
 import { ICache, CacheConfig, CacheItem, CacheItemOptions } from './types';
-import { asserts } from '../Util/errors/AssertError';
-import { STORAGE_CACHE_EXCEPTION } from '../Util/Constants';
 import { getCurrSizeKey } from './Utils/CacheUtils';
+import { assert, CacheErrorCode } from './Utils/errorHelpers';
 
 const logger = new Logger('Cache');
 
@@ -22,20 +21,14 @@ export class BrowserStorageCacheClass extends StorageCache implements ICache {
 	constructor(config?: CacheConfig) {
 		super(config);
 
-		asserts(!!this.cacheConfig.storage, {
-			name: STORAGE_CACHE_EXCEPTION,
-			message: 'Storage is not defined in the cache config',
-		});
+		assert(!!this.cacheConfig.storage, CacheErrorCode.NoCacheStorage);
 		this.cacheConfig.storage = this.cacheConfig.storage;
 		this.getItem = this.getItem.bind(this);
 		this.setItem = this.setItem.bind(this);
 		this.removeItem = this.removeItem.bind(this);
 	}
 	private getStorage(): Storage {
-		asserts(!!this.cacheConfig.storage, {
-			name: STORAGE_CACHE_EXCEPTION,
-			message: 'Storage is not defined in the cache config',
-		});
+		assert(!!this.cacheConfig.storage, CacheErrorCode.NoCacheStorage);
 		return this.cacheConfig.storage;
 	}
 	/**
@@ -91,10 +84,7 @@ export class BrowserStorageCacheClass extends StorageCache implements ICache {
 	 */
 	private _isExpired(key: string): boolean {
 		const text: string | null = this.getStorage().getItem(key);
-		asserts(text !== null, {
-			name: STORAGE_CACHE_EXCEPTION,
-			message: `Item not found in the storage by the key: ${key}.`,
-		});
+		assert(text !== null, CacheErrorCode.NoCacheItem, `Key: ${key}`);
 		const item: CacheItem = JSON.parse(text);
 		if (getCurrTime() >= item.expires) {
 			return true;
@@ -111,10 +101,7 @@ export class BrowserStorageCacheClass extends StorageCache implements ICache {
 	 */
 	private _removeItem(prefixedKey: string, size?: number): void {
 		const item = this.getStorage().getItem(prefixedKey);
-		asserts(item !== null, {
-			name: STORAGE_CACHE_EXCEPTION,
-			message: `Item not found in the storage by the key: ${prefixedKey}.`,
-		});
+		assert(item !== null, CacheErrorCode.NoCacheItem, `Key: ${prefixedKey}`);
 		const itemSize: number = size ?? JSON.parse(item).byteSize;
 		this._decreaseCurSizeInBytes(itemSize);
 		// remove the cache item

package/src/Cache/InMemoryCache.ts

@@ -1,14 +1,13 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { CacheList, defaultConfig, getCurrTime, CacheObject } from './Utils';
+import { CacheList, getCurrTime, CacheObject } from './Utils';
 
 import { StorageCache } from './StorageCache';
 import { ICache, CacheConfig, CacheItem, CacheItemOptions } from './types';
 import { ConsoleLogger as Logger } from '../Logger';
-import { asserts } from '../Util/errors/AssertError';
-import { STORAGE_CACHE_EXCEPTION } from '../Util/Constants';
 import { getCurrSizeKey } from './Utils/CacheUtils';
+import { assert, CacheErrorCode } from './Utils/errorHelpers';
 
 const logger = new Logger('InMemoryCache');
 
@@ -74,10 +73,7 @@ export class InMemoryCacheClass extends StorageCache implements ICache {
 	private _isExpired(key: string): boolean {
 		const text: string | null = CacheObject.getItem(key);
 
-		asserts(text !== null, {
-			name: STORAGE_CACHE_EXCEPTION,
-			message: 'item from storage is null',
-		});
+		assert(text !== null, CacheErrorCode.NoCacheItem, `Key: ${key}`);
 		const item: CacheItem = JSON.parse(text);
 		if (getCurrTime() >= item.expires) {
 			return true;
@@ -96,10 +92,7 @@ export class InMemoryCacheClass extends StorageCache implements ICache {
 		this.cacheList[listIdx].removeItem(prefixedKey);
 		// decrease the current size of the cache
 		const item = CacheObject.getItem(prefixedKey);
-		asserts(item !== null, {
-			name: STORAGE_CACHE_EXCEPTION,
-			message: 'item from storage is null',
-		});
+		assert(item !== null, CacheErrorCode.NoCacheItem, `Key: ${prefixedKey}`);
 		this._decreaseCurSizeInBytes(JSON.parse(item).byteSize);
 		// finally remove the item from memory
 		CacheObject.removeItem(prefixedKey);

package/src/Cache/Utils/CacheList.ts

@@ -1,8 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { asserts } from '../../Util/errors/AssertError';
-import { CACHE_LIST_EXCEPTION } from '../../Util/Constants';
+import { assert, CacheErrorCode } from './errorHelpers';
 
 class DoubleLinkedNode {
 	key: string;
@@ -56,10 +55,7 @@ export default class CacheList {
 		this.head.nextNode = node;
 		node.nextNode = tmp;
 		node.prevNode = this.head;
-		asserts(tmp !== null, {
-			name: CACHE_LIST_EXCEPTION,
-			message: 'previous node is null',
-		});
+		assert(tmp !== null, CacheErrorCode.NullPreviousNode);
 		tmp.prevNode = node;
 
 		this.length = this.length + 1;
@@ -71,14 +67,8 @@ export default class CacheList {
 	 * @param node
 	 */
 	private removeNode(node: DoubleLinkedNode): void {
-		asserts(node.prevNode !== null, {
-			name: CACHE_LIST_EXCEPTION,
-			message: 'previous node is null',
-		});
-		asserts(node.nextNode !== null, {
-			name: CACHE_LIST_EXCEPTION,
-			message: 'nextNode node is null',
-		});
+		assert(node.prevNode !== null, CacheErrorCode.NullPreviousNode);
+		assert(node.nextNode !== null, CacheErrorCode.NullNextNode);
 		node.prevNode.nextNode = node.nextNode;
 		node.nextNode.prevNode = node.prevNode;
 
@@ -121,10 +111,7 @@ export default class CacheList {
 	 * @return the LAST Recently Visited key
 	 */
 	public getLastItem(): string {
-		asserts(this.tail.prevNode !== null, {
-			name: CACHE_LIST_EXCEPTION,
-			message: 'previous node is null',
-		});
+		assert(this.tail.prevNode !== null, CacheErrorCode.NullPreviousNode);
 		return this.tail.prevNode.key;
 	}
 

package/src/Cache/Utils/errorHelpers.ts

@@ -0,0 +1,30 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from '../../errors';
+import { AmplifyErrorMap, AssertionFunction } from '../../types';
+
+export enum CacheErrorCode {
+	NoCacheItem = 'NoCacheItem',
+	NoCacheStorage = 'NoCacheStorage',
+	NullNextNode = 'NullNextNode',
+	NullPreviousNode = 'NullPreviousNode',
+}
+
+const cacheErrorMap: AmplifyErrorMap<CacheErrorCode> = {
+	[CacheErrorCode.NoCacheItem]: {
+		message: 'Item not found in the cache storage.',
+	},
+	[CacheErrorCode.NoCacheStorage]: {
+		message: 'Storage is not defined in the cache config.',
+	},
+	[CacheErrorCode.NullNextNode]: {
+		message: 'Next node is null.',
+	},
+	[CacheErrorCode.NullPreviousNode]: {
+		message: 'Previous node is null.',
+	},
+};
+
+export const assert: AssertionFunction<CacheErrorCode> =
+	createAssertionFunction(cacheErrorMap);

package/src/Hub/index.ts

@@ -3,7 +3,7 @@
 
 import { ConsoleLogger as Logger } from '../Logger';
 import { NO_HUBCALLBACK_PROVIDED_EXCEPTION } from '../Util/Constants';
-import { AmplifyError } from '../Util/Errors';
+import { AmplifyError } from '../errors';
 import {
 	AmplifyChannel,
 	AmplifyEventData,

package/src/Hub/types/AuthTypes.ts

@@ -9,4 +9,6 @@ export type AuthHubEventData =
 	/** Dispatched when auth tokens are successfully refreshed.*/
 	| { event: 'tokenRefresh' }
 	/** Dispatched when there is an error in the refresh of tokens.*/
-	| { event: 'tokenRefresh_failure' };
+	| { event: 'tokenRefresh_failure' }
+	/** Dispatched when there is a customState passed in the options of the `signInWithRedirect` API.*/
+	| { event: 'customOAuthState'; data: string };

package/src/I18n/errorHelpers.ts

@@ -0,0 +1,18 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from '../errors';
+import { AmplifyErrorMap, AssertionFunction } from '../types';
+
+export enum I18nErrorCode {
+	NotConfigured = 'NotConfigured',
+}
+
+const i18nErrorMap: AmplifyErrorMap<I18nErrorCode> = {
+	[I18nErrorCode.NotConfigured]: {
+		message: 'i18n is not configured.',
+	},
+};
+
+export const assert: AssertionFunction<I18nErrorCode> =
+	createAssertionFunction(i18nErrorMap);

package/src/I18n/index.ts

@@ -5,8 +5,7 @@ import { I18n as I18nClass } from './I18n';
 
 import { ConsoleLogger as Logger } from '../Logger';
 import { I18nOptions } from './types';
-import { asserts } from '../Util/errors/AssertError';
-import { I18N_EXCEPTION } from '../Util/Constants';
+import { assert, I18nErrorCode } from './errorHelpers';
 
 const logger = new Logger('I18n');
 
@@ -15,7 +14,7 @@ let _i18n: I18nClass | null = null;
 
 /**
  * Export I18n APIs
- * 
+ *
  * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
  */
 export class I18n {
@@ -46,7 +45,7 @@ export class I18n {
 	 * @static
 	 * @method
 	 * Create an instance of I18n for the library
-	 * 
+	 *
 	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static createInstance() {
@@ -61,15 +60,13 @@ export class I18n {
 	 * @static @method
 	 * Explicitly setting language
 	 * @param {String} lang
-	 * 
+	 *
 	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static setLanguage(lang: string) {
 		I18n.checkConfig();
-		asserts(!!_i18n, {
-			name: I18N_EXCEPTION,
-			message: 'I18N is not configured',
-		});
+		assert(!!_i18n, I18nErrorCode.NotConfigured);
+
 		return _i18n.setLanguage(lang);
 	}
 
@@ -78,17 +75,14 @@ export class I18n {
 	 * Get value
 	 * @param {String} key
 	 * @param {String} defVal - Default value
-	 * 
+	 *
 	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static get(key: string, defVal?: string) {
 		if (!I18n.checkConfig()) {
 			return typeof defVal === 'undefined' ? key : defVal;
 		}
-		asserts(!!_i18n, {
-			name: I18N_EXCEPTION,
-			message: 'I18N is not configured',
-		});
+		assert(!!_i18n, I18nErrorCode.NotConfigured);
 
 		return _i18n.get(key, defVal);
 	}
@@ -99,7 +93,7 @@ export class I18n {
 	 * Add vocabularies for one language
 	 * @param {String} langurage - Language of the dictionary
 	 * @param {Object} vocabularies - Object that has key-value as dictionary entry
-	 * 
+	 *
 	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static putVocabulariesForLanguage(
@@ -107,10 +101,7 @@ export class I18n {
 		vocabularies: Record<string, string>
 	) {
 		I18n.checkConfig();
-		asserts(!!_i18n, {
-			name: I18N_EXCEPTION,
-			message: 'I18N is not configured',
-		});
+		assert(!!_i18n, I18nErrorCode.NotConfigured);
 
 		return _i18n.putVocabulariesForLanguage(language, vocabularies);
 	}
@@ -121,15 +112,12 @@ export class I18n {
 	 * Add vocabularies for one language
 	 * @param {Object} vocabularies - Object that has language as key,
 	 *                                vocabularies of each language as value
-	 * 
+	 *
 	 * @deprecated The I18n utility is on a deprecation path and will be removed in a future version of Amplify.
 	 */
 	static putVocabularies(vocabularies: Record<string, string>) {
 		I18n.checkConfig();
-		asserts(!!_i18n, {
-			name: I18N_EXCEPTION,
-			message: 'I18N is not configured',
-		});
+		assert(!!_i18n, I18nErrorCode.NotConfigured);
 
 		return _i18n.putVocabularies(vocabularies);
 	}

package/src/Platform/version.ts

@@ -1,2 +1,2 @@
 // generated by genversion
-export const version = '6.0.1-console-preview.4432977.0+4432977';
+export const version = '6.0.1-console-preview.67f944e.0+67f944e';

package/src/ServiceWorker/ServiceWorker.ts

@@ -1,23 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-/**
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with
- * the License. A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
- * and limitations under the License.
- */
+
 import { ConsoleLogger as Logger } from '../Logger';
 import { isBrowser } from '../Util/JS';
 import { Amplify } from '../Amplify';
-import { asserts } from '../Util/errors/AssertError';
-import { AmplifyError } from '../Util/Errors';
-import { SERVICE_WORKER_EXCEPTION } from '../Util/Constants';
+import { AmplifyError } from '../errors';
+import { assert, ServiceWorkerErrorCode } from './errorHelpers';
 /**
  * Provides a means to registering a service worker in the browser
  * and communicating with it via postMessage events.
@@ -53,10 +41,10 @@ export class ServiceWorkerClass {
 	 * Get the currently active service worker
 	 */
 	get serviceWorker(): ServiceWorker {
-		asserts(this._serviceWorker !== undefined, {
-			name: SERVICE_WORKER_EXCEPTION,
-			message: 'Service Worker instance is undefined',
-		});
+		assert(
+			this._serviceWorker !== undefined,
+			ServiceWorkerErrorCode.UndefinedInstance
+		);
 
 		return this._serviceWorker;
 	}
@@ -101,7 +89,7 @@ export class ServiceWorkerClass {
 						this._logger.debug(`Service Worker Registration Failed ${error}`);
 						return reject(
 							new AmplifyError({
-								name: SERVICE_WORKER_EXCEPTION,
+								name: ServiceWorkerErrorCode.Unavailable,
 								message: 'Service Worker not available',
 								underlyingError: error,
 							})
@@ -110,7 +98,7 @@ export class ServiceWorkerClass {
 			} else {
 				return reject(
 					new AmplifyError({
-						name: SERVICE_WORKER_EXCEPTION,
+						name: ServiceWorkerErrorCode.Unavailable,
 						message: 'Service Worker not available',
 					})
 				);
@@ -130,17 +118,17 @@ export class ServiceWorkerClass {
 	 *  - reject(Error)
 	 */
 	enablePush(publicKey: string) {
-		asserts(this._registration !== undefined, {
-			name: SERVICE_WORKER_EXCEPTION,
-			message: 'Service Worker registration is undefined',
-		});
+		assert(
+			this._registration !== undefined,
+			ServiceWorkerErrorCode.UndefinedRegistration
+		);
 		this._publicKey = publicKey;
 		return new Promise((resolve, reject) => {
 			if (isBrowser()) {
-				asserts(this._registration !== undefined, {
-					name: SERVICE_WORKER_EXCEPTION,
-					message: 'Service Worker registration is undefined',
-				});
+				assert(
+					this._registration !== undefined,
+					ServiceWorkerErrorCode.UndefinedRegistration
+				);
 				this._registration.pushManager.getSubscription().then(subscription => {
 					if (subscription) {
 						this._subscription = subscription;
@@ -169,7 +157,7 @@ export class ServiceWorkerClass {
 			} else {
 				return reject(
 					new AmplifyError({
-						name: SERVICE_WORKER_EXCEPTION,
+						name: ServiceWorkerErrorCode.Unavailable,
 						message: 'Service Worker not available',
 					})
 				);

package/src/ServiceWorker/errorHelpers.ts

@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from '../errors';
+import { AmplifyErrorMap, AssertionFunction } from '../types';
+
+export enum ServiceWorkerErrorCode {
+	UndefinedInstance = 'UndefinedInstance',
+	UndefinedRegistration = 'UndefinedRegistration',
+	Unavailable = 'Unavailable',
+}
+
+const serviceWorkerErrorMap: AmplifyErrorMap<ServiceWorkerErrorCode> = {
+	[ServiceWorkerErrorCode.UndefinedInstance]: {
+		message: 'Service Worker instance is undefined.',
+	},
+	[ServiceWorkerErrorCode.UndefinedRegistration]: {
+		message: 'Service Worker registration is undefined.',
+	},
+	[ServiceWorkerErrorCode.Unavailable]: {
+		message: 'Service Worker not available.',
+	},
+};
+
+export const assert: AssertionFunction<ServiceWorkerErrorCode> =
+	createAssertionFunction(serviceWorkerErrorMap);

package/src/Util/Constants.ts

@@ -23,11 +23,5 @@ export const INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER = hasSymbol
 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/adapterCore/error/AmplifyServerContextError.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { AmplifyError } from '../../libraryUtils';
+import { AmplifyError } from '../../errors';
 
 export class AmplifyServerContextError extends AmplifyError {
 	constructor({

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

@@ -1,19 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { ErrorParams } from '../types/errors';
+import { AmplifyErrorParams } from '../types/errors';
 
-export function missingConfig(name: string) {
-	return new Error('Missing config value of ' + name);
-}
-export function invalidParameter(name: string) {
-	return new Error('Invalid parameter value of ' + name);
-}
-
-export enum AmplifyErrorString {
-	UNKNOWN = 'UnknownError',
-	PLATFORM_NOT_SUPPORTED_ERROR = 'PlatformNotSupportedError',
-}
 export class AmplifyError extends Error {
 	underlyingError?: Error | unknown;
 	recoverySuggestion?: string;
@@ -30,7 +19,7 @@ export class AmplifyError extends Error {
 		name,
 		recoverySuggestion,
 		underlyingError,
-	}: ErrorParams) {
+	}: AmplifyErrorParams) {
 		super(message);
 
 		this.name = name;
@@ -43,8 +32,3 @@ export class AmplifyError extends Error {
 		Object.setPrototypeOf(this, AmplifyError.prototype);
 	}
 }
-
-export const PlatformNotSupportedError = new AmplifyError({
-	name: AmplifyErrorString.PLATFORM_NOT_SUPPORTED_ERROR,
-	message: 'Function not supported on current platform',
-});

package/src/errors/PlatformNotSupportedError.ts

@@ -0,0 +1,14 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyErrorCode } from '../types';
+import { AmplifyError } from './AmplifyError';
+
+export class PlatformNotSupportedError extends AmplifyError {
+	constructor() {
+		super({
+			name: AmplifyErrorCode.PlatformNotSupported,
+			message: 'Function not supported on current platform',
+		});
+	}
+}

package/src/errors/createAssertionFunction.ts

@@ -0,0 +1,23 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { AmplifyErrorMap, AssertionFunction } from '../types';
+import { AmplifyError } from './AmplifyError';
+
+export const createAssertionFunction =
+	(
+		errorMap: AmplifyErrorMap,
+		AssertionError = AmplifyError
+	): AssertionFunction =>
+	(assertion, name, additionalContext) => {
+		const { message, recoverySuggestion } = errorMap[name];
+		if (!assertion) {
+			throw new AssertionError({
+				name,
+				message: additionalContext
+					? `${message} ${additionalContext}`
+					: message,
+				recoverySuggestion,
+			});
+		}
+	};

package/src/errors/index.ts

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

package/src/index.ts

@@ -29,6 +29,7 @@ export {
 	ResourcesConfig,
 	LibraryOptions,
 	AnalyticsConfig,
+	GeoConfig,
 } from './singleton/types';
 export {
 	Amplify,

package/src/libraryUtils.ts

@@ -32,7 +32,7 @@ export {
 export {
 	decodeJWT,
 	assertTokenProviderConfig,
-	assertIdentityPooIdConfig,
+	assertIdentityPoolIdConfig,
 	assertOAuthConfig,
 } from './singleton/Auth/utils';
 export { isTokenExpired } from './singleton/Auth';
@@ -92,14 +92,18 @@ export {
 	urlSafeDecode,
 	urlSafeEncode,
 } from './Util';
-export { asserts } from './Util/errors/AssertError';
 export {
-	invalidParameter,
-	missingConfig,
 	AmplifyError,
-	AmplifyErrorString,
-} from './Util/Errors';
-export { ErrorParams, AmplifyErrorMap, ServiceError } from './types';
+	PlatformNotSupportedError,
+	createAssertionFunction,
+} from './errors';
+export {
+	AmplifyErrorCode,
+	AmplifyErrorMap,
+	AmplifyErrorParams,
+	AssertionFunction,
+	ServiceError,
+} from './types';
 export {
 	INTERNAL_AWS_APPSYNC_REALTIME_PUBSUB_PROVIDER,
 	USER_AGENT_HEADER,

package/src/parseAWSExports.ts

@@ -99,7 +99,13 @@ export const parseAWSExports = (
 	if (geo) {
 		const { amazon_location_service } = geo;
 		(amplifyConfig as any).Geo = amazon_location_service
-			? { AmazonLocationService: amazon_location_service }
+			? {
+					LocationService: {
+						...amazon_location_service,
+						searchIndices: amazon_location_service.search_indices,
+						region: amazon_location_service.region,
+					},
+			  }
 			: { ...geo };
 	}
 

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

@@ -12,7 +12,7 @@ import {
 } from '../utils/constants';
 import { updateEndpoint } from './updateEndpoint';
 import { getEventBuffer } from '../utils/getEventBuffer';
-import { AmplifyError } from '../../../libraryUtils';
+import { AmplifyError } from '../../../errors';
 
 // TODO(v6) Refactor when we add support for session tracking & `autoTrack`
 let session: PinpointSession;

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

@@ -0,0 +1,37 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { createAssertionFunction } from '../../../errors';
+import { AmplifyErrorMap, AssertionFunction } from '../../../types';
+
+export enum AuthConfigurationErrorCode {
+	AuthTokenConfigException = 'AuthTokenConfigException',
+	AuthUserPoolAndIdentityPoolException = 'AuthUserPoolAndIdentityPoolException',
+	InvalidIdentityPoolIdException = 'InvalidIdentityPoolIdException',
+	OAuthNotConfigureException = 'OAuthNotConfigureException',
+}
+
+const authConfigurationErrorMap: AmplifyErrorMap<AuthConfigurationErrorCode> = {
+	[AuthConfigurationErrorCode.AuthTokenConfigException]: {
+		message: 'Auth Token Provider not configured.',
+		recoverySuggestion: 'Make sure to call Amplify.configure in your app.',
+	},
+	[AuthConfigurationErrorCode.AuthUserPoolAndIdentityPoolException]: {
+		message: 'Auth UserPool or IdentityPool not configured.',
+		recoverySuggestion:
+			'Make sure to call Amplify.configure in your app with UserPoolId and IdentityPoolId.',
+	},
+	[AuthConfigurationErrorCode.InvalidIdentityPoolIdException]: {
+		message: 'Invalid identity pool id provided.',
+		recoverySuggestion:
+			'Make sure a valid identityPoolId is given in the config.',
+	},
+	[AuthConfigurationErrorCode.OAuthNotConfigureException]: {
+		message: 'oauth param not configured.',
+		recoverySuggestion:
+			'Make sure to call Amplify.configure with oauth parameter in your app.',
+	},
+};
+
+export const assert: AssertionFunction<AuthConfigurationErrorCode> =
+	createAssertionFunction(authConfigurationErrorMap);