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

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { asserts } from '../../../Util/errors/AssertError';
+import { AuthConfigurationErrorCode, assert } from './errorHelpers';
 
 import {
 	AuthConfig,
@@ -30,11 +30,10 @@ export function assertTokenProviderConfig(
 			!!cognitoConfig.userPoolClientId && !!cognitoConfig.userPoolClientId;
 	}
 
-	return asserts(assertionValid, {
-		name: 'AuthTokenConfigException',
-		message: 'Auth Token Provider not configured',
-		recoverySuggestion: 'Make sure to call Amplify.configure in your app',
-	});
+	return assert(
+		assertionValid,
+		AuthConfigurationErrorCode.AuthTokenConfigException
+	);
 }
 
 export function assertOAuthConfig(
@@ -46,15 +45,13 @@ export function assertOAuthConfig(
 		!!cognitoConfig?.loginWith?.oauth?.redirectSignIn &&
 		!!cognitoConfig?.loginWith?.oauth?.responseType;
 
-	return asserts(validOAuthConfig, {
-		name: 'OAuthNotConfigureException',
-		message: 'oauth param not configured',
-		recoverySuggestion:
-			'Make sure to call Amplify.configure with oauth parameter in your app',
-	});
+	return assert(
+		validOAuthConfig,
+		AuthConfigurationErrorCode.OAuthNotConfigureException
+	);
 }
 
-export function assertIdentityPooIdConfig(
+export function assertIdentityPoolIdConfig(
 	cognitoConfig?: StrictUnion<
 		| CognitoUserPoolConfig
 		| CognitoUserPoolAndIdentityPoolConfig
@@ -62,25 +59,21 @@ export function assertIdentityPooIdConfig(
 	>
 ): asserts cognitoConfig is CognitoIdentityPoolConfig {
 	const validConfig = !!cognitoConfig?.identityPoolId;
-	return asserts(validConfig, {
-		name: 'InvalidIdentityPoolIdException',
-		message: 'Invalid identity pool id provided.',
-		recoverySuggestion:
-			'Make sure a valid identityPoolId is given in the config.',
-	});
+	return assert(
+		validConfig,
+		AuthConfigurationErrorCode.InvalidIdentityPoolIdException
+	);
 }
 
-function assertUserPoolAndIdentityPooConfig(
+function assertUserPoolAndIdentityPoolConfig(
 	authConfig: AuthConfig
 ): asserts authConfig is AuthUserPoolAndIdentityPoolConfig {
 	const validConfig =
 		!!authConfig?.Cognito.identityPoolId && !!authConfig?.Cognito.userPoolId;
-	return asserts(validConfig, {
-		name: 'AuthUserPoolAndIdentityPoolException',
-		message: 'Auth UserPool and IdentityPool not configured',
-		recoverySuggestion:
-			'Make sure to call Amplify.configure in your app with UserPoolId and IdentityPoolId',
-	});
+	return assert(
+		validConfig,
+		AuthConfigurationErrorCode.AuthUserPoolAndIdentityPoolException
+	);
 }
 
 export function decodeJWT(token: string): JWT {

package/src/singleton/Geo/types.ts

@@ -0,0 +1,20 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+export interface GeoConfig {
+	LocationService?: {
+		region: string;
+		maps?: {
+			items: {};
+			default: string;
+		};
+		searchIndices?: {
+			items: string[];
+			default: string;
+		};
+		geofenceCollections?: {
+			items: string[];
+			default: string;
+		};
+	};
+}

package/src/singleton/types.ts

@@ -12,6 +12,7 @@ import {
 	GetCredentialsOptions,
 	CognitoIdentityPoolConfig,
 } from './Auth/types';
+import { GeoConfig } from './Geo/types';
 import {
 	LibraryStorageOptions,
 	StorageAccessLevel,
@@ -36,6 +37,7 @@ export type ResourcesConfig = {
 	// Notifications?: {};
 	// Predictions?: {};
 	Storage?: StorageConfig;
+	Geo?: GeoConfig;
 };
 
 export type LibraryOptions = {
@@ -56,4 +58,5 @@ export {
 	StorageConfig,
 	AnalyticsConfig,
 	CognitoIdentityPoolConfig,
+	GeoConfig,
 };

package/src/storage/DefaultStorage.native.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { AsyncStorageStatic } from '@react-native-async-storage/async-storage';
-import { AmplifyError } from '../libraryUtils';
+import { AmplifyError } from '../errors';
 import { KeyValueStorageInterface } from '../types';
 
 const ASYNC_STORAGE_MODULE = '@react-native-async-storage/async-storage';

package/src/storage/KeyValueStorage.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { PlatformNotSupportedError } from '../Util/Errors';
+import { PlatformNotSupportedError } from '../errors';
 import { KeyValueStorageInterface } from '../types';
 
 /**
@@ -21,7 +21,7 @@ export class KeyValueStorage implements KeyValueStorageInterface {
 	 * @returns {string} value that was set
 	 */
 	async setItem(key: string, value: string) {
-		if (!this.storage) throw PlatformNotSupportedError;
+		if (!this.storage) throw new PlatformNotSupportedError();
 		this.storage.setItem(key, value);
 	}
 
@@ -32,7 +32,7 @@ export class KeyValueStorage implements KeyValueStorageInterface {
 	 * @returns {string} the data item
 	 */
 	async getItem(key: string) {
-		if (!this.storage) throw PlatformNotSupportedError;
+		if (!this.storage) throw new PlatformNotSupportedError();
 		return this.storage.getItem(key);
 	}
 
@@ -42,7 +42,7 @@ export class KeyValueStorage implements KeyValueStorageInterface {
 	 * @returns {string} value - value that was deleted
 	 */
 	async removeItem(key: string) {
-		if (!this.storage) throw PlatformNotSupportedError;
+		if (!this.storage) throw new PlatformNotSupportedError();
 		this.storage.removeItem(key);
 	}
 
@@ -51,7 +51,7 @@ export class KeyValueStorage implements KeyValueStorageInterface {
 	 * @returns {string} nothing
 	 */
 	async clear() {
-		if (!this.storage) throw PlatformNotSupportedError;
+		if (!this.storage) throw new PlatformNotSupportedError();
 		this.storage.clear();
 	}
 }

package/src/types/errors.ts

@@ -1,14 +1,19 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export type ErrorParams = {
+export enum AmplifyErrorCode {
+	PlatformNotSupported = 'PlatformNotSupported',
+	Unknown = 'Unknown',
+}
+
+export type AmplifyErrorParams<ErrorCode extends string = string> = {
 	message: string;
-	name: string;
+	name: ErrorCode;
 	recoverySuggestion?: string;
 	underlyingError?: Error | unknown;
 };
 
-export type AmplifyErrorMap<ErrorCode extends string> = {
+export type AmplifyErrorMap<ErrorCode extends string = string> = {
 	[name in ErrorCode]: {
 		message: string;
 		recoverySuggestion?: string;
@@ -19,3 +24,9 @@ export type ServiceError = {
 	name: string;
 	message: string;
 };
+
+export type AssertionFunction<ErrorCode extends string = string> = (
+	assertion: boolean,
+	name: ErrorCode,
+	additionalContext?: string
+) => asserts assertion;

package/lib/Util/errors/AssertError.d.ts

@@ -1,2 +0,0 @@
-import { ErrorParams } from '../../types';
-export declare function asserts(assertion: boolean, errorParams: ErrorParams): asserts assertion;

package/lib/Util/errors/AssertError.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.asserts = void 0;
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-var Errors_1 = require("../Errors");
-function asserts(assertion, errorParams) {
-    if (!assertion)
-        throw new Errors_1.AmplifyError(errorParams);
-}
-exports.asserts = asserts;

package/lib-esm/Util/errors/AssertError.d.ts

@@ -1,2 +0,0 @@
-import { ErrorParams } from '../../types';
-export declare function asserts(assertion: boolean, errorParams: ErrorParams): asserts assertion;

package/lib-esm/Util/errors/AssertError.js

@@ -1,7 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { AmplifyError } from '../Errors';
-export function asserts(assertion, errorParams) {
-    if (!assertion)
-        throw new AmplifyError(errorParams);
-}

package/src/Util/errors/AssertError.ts

@@ -1,11 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { AmplifyError } from '../Errors';
-import { ErrorParams } from '../../types';
-
-export function asserts(
-	assertion: boolean,
-	errorParams: ErrorParams
-): asserts assertion {
-	if (!assertion) throw new AmplifyError(errorParams);
-}