@aws-amplify/core 6.0.1-console-preview.2f5ba46.0 → 6.0.1-console-preview.9e7dd78.0

package/src/Platform/types.ts

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import type { UserAgent as AWSUserAgent } from '@aws-sdk/types';
 
 export enum Framework {
 	// < 100 - Web frameworks
@@ -54,63 +53,50 @@ export enum ApiAction {
 	Head = '7',
 }
 export enum AuthAction {
-	SignUp = '1',
-	ConfirmSignUp = '2',
-	ResendSignUp = '3',
-	SignIn = '4',
-	GetMFAOptions = '5',
-	GetPreferredMFA = '6',
-	SetPreferredMFA = '7',
-	DisableSMS = '8',
-	EnableSMS = '9',
-	SetupTOTP = '10',
-	VerifyTotpToken = '11',
-	ConfirmSignIn = '12',
-	CompleteNewPassword = '13',
-	SendCustomChallengeAnswer = '14',
-	DeleteUserAttributes = '15',
-	DeleteUser = '16',
-	UpdateUserAttributes = '17',
-	UserAttributes = '18',
-	CurrentUserPoolUser = '19',
-	CurrentAuthenticatedUser = '20',
-	CurrentSession = '21',
-	VerifyUserAttribute = '22',
-	VerifyUserAttributeSubmit = '23',
-	VerifyCurrentUserAttribute = '24',
-	VerifyCurrentUserAttributeSubmit = '25',
-	SignOut = '26',
-	ChangePassword = '27',
-	ForgotPassword = '28',
-	ForgotPasswordSubmit = '29',
+	// SignUp = '1',
+	// ConfirmSignUp = '2',
+	// ResendSignUp = '3',
+	// SignIn = '4',
+	// GetMFAOptions = '5',
+	// GetPreferredMFA = '6',
+	// SetPreferredMFA = '7',
+	// DisableSMS = '8',
+	// EnableSMS = '9',
+	// SetupTOTP = '10',
+	// VerifyTotpToken = '11',
+	// ConfirmSignIn = '12',
+	// CompleteNewPassword = '13',
+	// SendCustomChallengeAnswer = '14',
+	// DeleteUserAttributes = '15',
+	// DeleteUser = '16',
+	// UpdateUserAttributes = '17',
+	// UserAttributes = '18',
+	// CurrentUserPoolUser = '19',
+	// CurrentAuthenticatedUser = '20',
+	// CurrentSession = '21',
+	// VerifyUserAttribute = '22',
+	// VerifyUserAttributeSubmit = '23',
+	// VerifyCurrentUserAttribute = '24',
+	// VerifyCurrentUserAttributeSubmit = '25',
+	// SignOut = '26',
+	// ChangePassword = '27',
+	// ForgotPassword = '28',
+	// ForgotPasswordSubmit = '29',
 	FederatedSignIn = '30',
-	VerifiedContact = '31',
-	UserSession = '32',
-	CurrentUserCredentials = '33',
-	CurrentCredentials = '34',
-	CurrentUserInfo = '35',
-	RememberDevice = '36',
-	ForgetDevice = '37',
-	FetchDevices = '38',
+	// CurrentUserInfo = '31',
+	// RememberDevice = '32',
+	// ForgetDevice = '33',
+	// FetchDevices = '34',
 }
 export enum DataStoreAction {
 	Subscribe = '1',
 	GraphQl = '2',
 }
 export enum GeoAction {
-	SearchByText = '1',
-	SearchForSuggestions = '2',
-	SearchByPlaceId = '3',
-	SearchByCoordinates = '4',
-	SaveGeofences = '5',
-	GetGeofence = '6',
-	ListGeofences = '7',
-	DeleteGeofences = '8',
+	None = '0',
 }
 export enum InAppMessagingAction {
 	None = '0',
-	SyncMessages = '1',
-	IdentifyUser = '2',
 }
 export enum InteractionsAction {
 	None = '0',
@@ -133,7 +119,6 @@ export enum StorageAction {
 	Copy = '4',
 	Remove = '5',
 	GetProperties = '6',
-	Cancel = '7',
 }
 
 type ActionMap = {
@@ -158,15 +143,8 @@ type UserAgentDetailsWithCategory<T extends Category> =
 
 type CustomUserAgentDetailsBase = {
 	framework?: Framework;
-	// DO NOT REMOVE:
-	// Used by other Amplify teams to pass information to the custom user agent
-	/** Accepts an array of arrays with exactly 1 or 2 values and translates 
-	those arrays to "item" or "item1/item2" strings on the custom user agent */
-	additionalInfo?: AWSUserAgent;
 };
 
-// DO NOT MAKE ANY PROP REQUIRED on CustomUserAgentDetails
-// This object is used by other Amplify teams to pass information to the user agent
 export type CustomUserAgentDetails =
 	| (CustomUserAgentDetailsBase & { category?: never; action?: never })
 	| UserAgentDetailsWithCategory<Category.API>

package/src/Platform/version.ts

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

package/src/index.ts

@@ -4,15 +4,9 @@
 /*
 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';
+// Hub exports
 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 { ICredentials } from './types';
 
 // Singleton exports
 export {

package/src/parseAWSExports.ts

@@ -1,91 +1,97 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { AmplifyConfig } from './types';
-import { ConsoleLogger as Logger } from './Logger';
-
-const logger = new Logger('Parser');
+import { OAuthConfig } from './singleton/Auth/types';
+import { ResourcesConfig } from './singleton/types';
 
 /**
- * This utility generates an `AmplifyConfig` object from an `aws-exports.js` file generated by the Amplify CLI.
- * 
+ * This utility converts the `aws-exports.js` file generated by the Amplify CLI into a {@link ResourcesConfig} object
+ * consumable by Amplify.
+ *
  * @param config A configuration object from `aws-exports.js`.
- * 
- * @returns An AmplifyConfig object.
+ *
+ * @returns A {@link ResourcesConfig} object.
  */
-export const parseAWSExports = (config:Record<string,any>): AmplifyConfig => {
-	const amplifyConfig: AmplifyConfig = {};
+export const parseAWSExports = (
+	config: Record<string, any> = {}
+): ResourcesConfig => {
+	const {
+		aws_cognito_identity_pool_id,
+		aws_cognito_sign_up_verification_method,
+		aws_mandatory_sign_in,
+		aws_mobile_analytics_app_id,
+		aws_mobile_analytics_app_region,
+		aws_user_files_s3_bucket,
+		aws_user_files_s3_bucket_region,
+		aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing,
+		aws_user_pools_id,
+		aws_user_pools_web_client_id,
+		geo,
+		oauth,
+	} = config;
+	const amplifyConfig: ResourcesConfig = {};
+
 	// Analytics
-	if (config['aws_mobile_analytics_app_id']) {
-		const Analytics = {
+	if (aws_mobile_analytics_app_id) {
+		amplifyConfig.Analytics = {
 			Pinpoint: {
-				appId: config['aws_mobile_analytics_app_id'],
-				region: config['aws_mobile_analytics_app_region'],
+				appId: aws_mobile_analytics_app_id,
+				region: aws_mobile_analytics_app_region,
 			},
 		};
-		amplifyConfig.Analytics = Analytics;
 	}
 
 	// Auth
-	if (config['aws_cognito_identity_pool_id'] || config['aws_user_pools_id']) {
+	if (aws_cognito_identity_pool_id || aws_user_pools_id) {
 		amplifyConfig.Auth = {
-			userPoolId: config['aws_user_pools_id'],
-			userPoolWebClientId: config['aws_user_pools_web_client_id'],
-			region: config['aws_cognito_region'],
-			identityPoolId: config['aws_cognito_identity_pool_id'],
-			identityPoolRegion: config['aws_cognito_region'],
-			mandatorySignIn: config['aws_mandatory_sign_in'] === 'enable',
-			signUpVerificationMethod:
-				config['aws_cognito_sign_up_verification_method'] || 'code',
+			Cognito: {
+				identityPoolId: aws_cognito_identity_pool_id,
+				allowGuestAccess: aws_mandatory_sign_in !== 'enable',
+				signUpVerificationMethod: aws_cognito_sign_up_verification_method,
+				userPoolClientId: aws_user_pools_web_client_id,
+				userPoolId: aws_user_pools_id,
+				...(oauth && { loginWith: getOAuthConfig(oauth) }),
+			},
 		};
 	}
 
 	// Storage
-	let storageConfig;
-	if (config['aws_user_files_s3_bucket']) {
-		storageConfig = {
-			AWSS3: {
-				bucket: config['aws_user_files_s3_bucket'],
-				region: config['aws_user_files_s3_bucket_region'],
+	if (aws_user_files_s3_bucket) {
+		amplifyConfig.Storage = {
+			S3: {
+				bucket: aws_user_files_s3_bucket,
+				region: aws_user_files_s3_bucket_region,
 				dangerouslyConnectToHttpEndpointForTesting:
-					config[
-						'aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing'
-					],
+					aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing,
 			},
 		};
-	} else {
-		storageConfig = config ? config.Storage || config : {};
-	}
-
-	// Logging
-	if (config['Logging']) {
-		amplifyConfig.Logging = {
-			...config['Logging'],
-			region: config['aws_project_region'],
-		};
 	}
 
 	// Geo
-	if (config['geo']) {
-		amplifyConfig.Geo = Object.assign({}, config.geo);
-		if (config.geo['amazon_location_service']) {
-			amplifyConfig.Geo = {
-				AmazonLocationService: config.geo['amazon_location_service'],
-			};
-		}
+	if (geo) {
+		const { amazon_location_service } = geo;
+		(amplifyConfig as any).Geo = amazon_location_service
+			? { AmazonLocationService: amazon_location_service }
+			: { ...geo };
 	}
 
-	amplifyConfig.Analytics = Object.assign(
-		{},
-		amplifyConfig.Analytics,
-		config.Analytics
-	);
-	amplifyConfig.Auth = Object.assign({}, amplifyConfig.Auth, config.Auth);
-	amplifyConfig.Storage = Object.assign({}, storageConfig);
-	amplifyConfig.Logging = Object.assign(
-		{},
-		amplifyConfig.Logging,
-		config.Logging
-	);
-	logger.debug('parse config', config, 'to amplifyconfig', amplifyConfig);
 	return amplifyConfig;
 };
+
+const getRedirectUrl = (redirectStr: string): string[] =>
+	redirectStr.split(',');
+
+const getOAuthConfig = ({
+	domain,
+	scope,
+	redirectSignIn,
+	redirectSignOut,
+	responseType,
+}: Record<string, any>): { oauth: OAuthConfig } => ({
+	oauth: {
+		domain,
+		scopes: scope,
+		redirectSignIn: getRedirectUrl(redirectSignIn),
+		redirectSignOut: getRedirectUrl(redirectSignOut),
+		responseType,
+	},
+});

package/src/singleton/Auth/types.ts

@@ -49,7 +49,7 @@ export type Identity = {
 export interface AWSCredentialsAndIdentityIdProvider {
 	getCredentialsAndIdentityId: (
 		getCredentialsOptions: GetCredentialsOptions
-	) => Promise<AWSCredentialsAndIdentityId>;
+	) => Promise<AWSCredentialsAndIdentityId | undefined>;
 	clearCredentialsAndIdentityId: () => void;
 }
 

package/src/types/core.ts

@@ -38,16 +38,6 @@ export type UserProfile = {
 	metrics?: Record<string, number>;
 };
 
-export interface ICredentials {
-	accessKeyId: string;
-	sessionToken: string;
-	secretAccessKey: string;
-	identityId: string;
-	authenticated: boolean;
-	// Long term creds do not provide an expiration date
-	expiration?: Date;
-}
-
 /**
  * @internal
  */

package/lib/Credentials.d.ts

@@ -1,47 +0,0 @@
-import { ICredentials } from './types';
-export declare class CredentialsClass {
-    private _config;
-    private _credentials;
-    private _credentials_source;
-    private _gettingCredPromise;
-    private _refreshHandlers;
-    private _storage;
-    private _storageSync;
-    private _identityId;
-    private _nextCredentialsRefresh;
-    Auth: undefined;
-    constructor(config: any);
-    getModuleName(): string;
-    getCredSource(): any;
-    configure(config: any): any;
-    get(): any;
-    private _getCognitoIdentityIdStorageKey;
-    private _pickupCredentials;
-    private _keepAlive;
-    refreshFederatedToken(federatedInfo: any): Promise<ICredentials>;
-    private _providerRefreshWithRetry;
-    private _isExpired;
-    private _isPastTTL;
-    private _setCredentialsForGuest;
-    private _setCredentialsFromFederation;
-    private _setCredentialsFromSession;
-    private _loadCredentials;
-    set(params: any, source: any): Promise<ICredentials>;
-    clear(): Promise<void>;
-    private _getGuestIdentityId;
-    private _setGuestIdentityId;
-    private _removeGuestIdentityId;
-    /**
-     * Compact version of credentials
-     * @param {Object} credentials
-     * @return {Object} - Credentials
-     */
-    shear(credentials: any): {
-        accessKeyId: any;
-        sessionToken: any;
-        secretAccessKey: any;
-        identityId: any;
-        authenticated: any;
-    };
-}
-export declare const Credentials: CredentialsClass;