From f7b808917b9e59191b6757b8bef3f67c5b05c17d Mon Sep 17 00:00:00 2001
From: Amplifiyer <51211245+Amplifiyer@users.noreply.github.com>
Date: Tue, 14 May 2024 18:18:08 +0200
Subject: [PATCH] fix: Correctly generate Gen1 social provider config form Gen2
 (#1514)

---
 .changeset/tidy-dancers-march.md                       |  5 +++++
 .../client_config_to_legacy_converter.test.ts          |  9 +++++++--
 .../client_config_to_legacy_converter.ts               | 10 +++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/tidy-dancers-march.md

diff --git a/.changeset/tidy-dancers-march.md b/.changeset/tidy-dancers-march.md
new file mode 100644
index 0000000000..ea92c2414d
--- /dev/null
+++ b/.changeset/tidy-dancers-march.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/client-config': patch
+---
+
+Correctly generate Gen1 social provider config form Gen2
diff --git a/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.test.ts b/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.test.ts
index d935ab347a..1e958416d5 100644
--- a/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.test.ts
+++ b/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.test.ts
@@ -59,7 +59,12 @@ void describe('ClientConfigLegacyConverter', () => {
           redirect_sign_in_uri: ['http://callback.com', 'http://callback2.com'],
           redirect_sign_out_uri: ['http://logout.com', 'http://logout2.com'],
           response_type: 'code',
-          identity_providers: ['GOOGLE', 'FACEBOOK'],
+          identity_providers: [
+            'GOOGLE',
+            'FACEBOOK',
+            'LOGIN_WITH_AMAZON',
+            'SIGN_IN_WITH_APPLE',
+          ],
         },
       },
     };
@@ -91,7 +96,7 @@ void describe('ClientConfigLegacyConverter', () => {
         redirectSignOut: 'http://logout.com,http://logout2.com',
         responseType: 'code',
       },
-      aws_cognito_social_providers: ['GOOGLE', 'FACEBOOK'],
+      aws_cognito_social_providers: ['GOOGLE', 'FACEBOOK', 'AMAZON', 'APPLE'],
     };
 
     assert.deepStrictEqual(
diff --git a/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.ts b/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.ts
index 7823c3894b..edec2de439 100644
--- a/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.ts
+++ b/packages/client-config/src/client-config-writer/client_config_to_legacy_converter.ts
@@ -112,7 +112,15 @@ export class ClientConfigLegacyConverter {
       if (clientConfig.auth.oauth) {
         authClientConfig.oauth = {};
         authClientConfig.aws_cognito_social_providers =
-          clientConfig.auth.oauth.identity_providers;
+          clientConfig.auth.oauth.identity_providers.map((provider) => {
+            if (provider === 'SIGN_IN_WITH_APPLE') {
+              return 'APPLE';
+            }
+            if (provider === 'LOGIN_WITH_AMAZON') {
+              return 'AMAZON';
+            }
+            return provider;
+          });
         authClientConfig.oauth.domain = clientConfig.auth.oauth.domain;
         authClientConfig.oauth.scope = clientConfig.auth.oauth.scopes;
         authClientConfig.oauth.redirectSignIn =