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

package/lib/Platform/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.0.1-console-preview.b278dcb.0+b278dcb";
+export declare const version = "6.0.1-console-preview.be08038.0+be08038";

package/lib/Platform/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // generated by genversion
-exports.version = '6.0.1-console-preview.b278dcb.0+b278dcb';
+exports.version = '6.0.1-console-preview.be08038.0+be08038';

package/lib/parseAWSExports.js

@@ -60,7 +60,7 @@ var authTypeMapping = {
 var parseAWSExports = function (config) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     if (config === void 0) { config = {}; }
-    var aws_appsync_apiKey = config.aws_appsync_apiKey, aws_appsync_authenticationType = config.aws_appsync_authenticationType, aws_appsync_graphqlEndpoint = config.aws_appsync_graphqlEndpoint, aws_appsync_region = config.aws_appsync_region, aws_bots = config.aws_bots, aws_bots_config = config.aws_bots_config, aws_cognito_identity_pool_id = config.aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method = config.aws_cognito_sign_up_verification_method, aws_cognito_mfa_configuration = config.aws_cognito_mfa_configuration, aws_cognito_mfa_types = config.aws_cognito_mfa_types, aws_cognito_password_protection_settings = config.aws_cognito_password_protection_settings, aws_cognito_verification_mechanisms = config.aws_cognito_verification_mechanisms, aws_cognito_signup_attributes = config.aws_cognito_signup_attributes, aws_cognito_username_attributes = config.aws_cognito_username_attributes, aws_mandatory_sign_in = config.aws_mandatory_sign_in, aws_mobile_analytics_app_id = config.aws_mobile_analytics_app_id, aws_mobile_analytics_app_region = config.aws_mobile_analytics_app_region, aws_user_files_s3_bucket = config.aws_user_files_s3_bucket, aws_user_files_s3_bucket_region = config.aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing = config.aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id = config.aws_user_pools_id, aws_user_pools_web_client_id = config.aws_user_pools_web_client_id, geo = config.geo, oauth = config.oauth, aws_cloud_logic_custom = config.aws_cloud_logic_custom, Notifications = config.Notifications;
+    var aws_appsync_apiKey = config.aws_appsync_apiKey, aws_appsync_authenticationType = config.aws_appsync_authenticationType, aws_appsync_graphqlEndpoint = config.aws_appsync_graphqlEndpoint, aws_appsync_region = config.aws_appsync_region, aws_bots = config.aws_bots, aws_bots_config = config.aws_bots_config, aws_cognito_identity_pool_id = config.aws_cognito_identity_pool_id, aws_cognito_sign_up_verification_method = config.aws_cognito_sign_up_verification_method, aws_cognito_mfa_configuration = config.aws_cognito_mfa_configuration, aws_cognito_mfa_types = config.aws_cognito_mfa_types, aws_cognito_password_protection_settings = config.aws_cognito_password_protection_settings, aws_cognito_verification_mechanisms = config.aws_cognito_verification_mechanisms, aws_cognito_signup_attributes = config.aws_cognito_signup_attributes, aws_cognito_social_providers = config.aws_cognito_social_providers, aws_cognito_username_attributes = config.aws_cognito_username_attributes, aws_mandatory_sign_in = config.aws_mandatory_sign_in, aws_mobile_analytics_app_id = config.aws_mobile_analytics_app_id, aws_mobile_analytics_app_region = config.aws_mobile_analytics_app_region, aws_user_files_s3_bucket = config.aws_user_files_s3_bucket, aws_user_files_s3_bucket_region = config.aws_user_files_s3_bucket_region, aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing = config.aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing, aws_user_pools_id = config.aws_user_pools_id, aws_user_pools_web_client_id = config.aws_user_pools_web_client_id, geo = config.geo, oauth = config.oauth, aws_cloud_logic_custom = config.aws_cloud_logic_custom, Notifications = config.Notifications;
     var amplifyConfig = {};
     // Analytics
     if (aws_mobile_analytics_app_id) {
@@ -155,13 +155,21 @@ var parseAWSExports = function (config) {
                 userPoolId: aws_user_pools_id,
                 mfa: mfaConfig,
                 passwordFormat: passwordFormatConfig,
-                loginWith: __assign({ username: loginWithEmailEnabled || loginWithPhoneEnabled ? false : true, email: loginWithEmailEnabled, phone: loginWithPhoneEnabled }, (oauth &&
-                    Object.keys(oauth).length > 0 && {
-                    oauth: getOAuthConfig(oauth),
-                })),
+                loginWith: {
+                    username: loginWithEmailEnabled || loginWithPhoneEnabled ? false : true,
+                    email: loginWithEmailEnabled,
+                    phone: loginWithPhoneEnabled
+                },
             },
         };
     }
+    var hasOAuthConfig = oauth ? Object.keys(oauth).length > 0 : false;
+    var hasSocialProviderConfig = aws_cognito_social_providers ? aws_cognito_social_providers.length > 0 : false;
+    if (amplifyConfig.Auth && hasOAuthConfig) {
+        amplifyConfig.Auth.Cognito.loginWith = __assign(__assign({}, amplifyConfig.Auth.Cognito.loginWith), { oauth: __assign(__assign({}, (getOAuthConfig(oauth))), (hasSocialProviderConfig && {
+                providers: parseSocialProviders(aws_cognito_social_providers)
+            })) });
+    }
     // Storage
     if (aws_user_files_s3_bucket) {
         amplifyConfig.Storage = {
@@ -202,6 +210,12 @@ var getOAuthConfig = function (_a) {
         scopes: scope,
         redirectSignIn: getRedirectUrl(redirectSignIn),
         redirectSignOut: getRedirectUrl(redirectSignOut),
-        responseType: responseType,
+        responseType: responseType
+    });
+};
+var parseSocialProviders = function (aws_cognito_social_providers) {
+    return aws_cognito_social_providers.map(function (provider) {
+        var updatedProvider = provider.toLowerCase();
+        return updatedProvider.charAt(0).toUpperCase() + updatedProvider.slice(1);
     });
 };

package/lib/singleton/Auth/types.d.ts

@@ -112,9 +112,9 @@ 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;
 };