@aws-amplify/core 6.0.1-console-preview.b278dcb.0 → 6.0.1-console-preview.be08038.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/core",
-	"version": "6.0.1-console-preview.b278dcb.0+b278dcb",
+	"version": "6.0.1-console-preview.be08038.0+be08038",
 	"description": "Core category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -64,7 +64,7 @@
 		"uuid": "^9.0.0"
 	},
 	"devDependencies": {
-		"@aws-amplify/react-native": "1.0.1-console-preview.b278dcb.0+b278dcb",
+		"@aws-amplify/react-native": "1.0.1-console-preview.be08038.0+be08038",
 		"@types/js-cookie": "3.0.2",
 		"@types/uuid": "^9.0.0",
 		"find": "^0.2.7",
@@ -169,5 +169,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "b278dcb6dd7334e53d92d22386a22fba3c4a6089"
+	"gitHead": "be08038c5b37a510243f077c6d3209e5383f8866"
 }

package/src/Platform/version.ts

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

package/src/parseAWSExports.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 { OAuthConfig, AuthConfigUserAttributes } from './singleton/Auth/types';
+import { OAuthConfig, AuthConfigUserAttributes, OAuthProvider } from './singleton/Auth/types';
 import { ResourcesConfig } from './singleton/types';
 
 const logger = new Logger('parseAWSExports');
@@ -41,6 +41,7 @@ export const parseAWSExports = (
 		aws_cognito_password_protection_settings,
 		aws_cognito_verification_mechanisms,
 		aws_cognito_signup_attributes,
+		aws_cognito_social_providers,
 		aws_cognito_username_attributes,
 		aws_mandatory_sign_in,
 		aws_mobile_analytics_app_id,
@@ -178,16 +179,26 @@ export const parseAWSExports = (
 					username:
 						loginWithEmailEnabled || loginWithPhoneEnabled ? false : true,
 					email: loginWithEmailEnabled,
-					phone: loginWithPhoneEnabled,
-					...(oauth &&
-						Object.keys(oauth).length > 0 && {
-							oauth: getOAuthConfig(oauth),
-						}),
+					phone: loginWithPhoneEnabled
 				},
 			},
 		};
 	}
 
+	const hasOAuthConfig = oauth ? Object.keys(oauth).length > 0 : false;
+	const hasSocialProviderConfig = aws_cognito_social_providers ? aws_cognito_social_providers.length > 0 : false;
+	if (amplifyConfig.Auth && hasOAuthConfig) {
+		amplifyConfig.Auth.Cognito.loginWith = {
+			...amplifyConfig.Auth.Cognito.loginWith,
+			oauth: {
+				...(getOAuthConfig(oauth)),
+				...(hasSocialProviderConfig && {
+					providers: parseSocialProviders(aws_cognito_social_providers)
+				})
+			},
+		};
+	}
+
 	// Storage
 	if (aws_user_files_s3_bucket) {
 		amplifyConfig.Storage = {
@@ -252,5 +263,12 @@ const getOAuthConfig = ({
 	scopes: scope,
 	redirectSignIn: getRedirectUrl(redirectSignIn),
 	redirectSignOut: getRedirectUrl(redirectSignOut),
-	responseType,
+	responseType
 });
+
+const parseSocialProviders = (aws_cognito_social_providers: string[]) => {
+	return aws_cognito_social_providers.map((provider: string) => {
+		const updatedProvider = provider.toLowerCase();
+		return updatedProvider.charAt(0).toUpperCase() + updatedProvider.slice(1);
+	}) as OAuthProvider[];
+};

package/src/singleton/Auth/types.ts

@@ -166,10 +166,10 @@ export type OAuthConfig = {
 	redirectSignIn: Array<string>;
 	redirectSignOut: Array<string>;
 	responseType: 'code' | 'token';
-	providers?: Array<OAuthProviders | CustomProvider>;
+	providers?: Array<OAuthProvider | CustomProvider>;
 };
 
-type OAuthProviders = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
+export type OAuthProvider = 'Google' | 'Facebook' | 'Amazon' | 'Apple';
 type CustomProvider = { custom: string };
 
 type CustomScope = string & {};