fix(amplify-category-auth): update attr mapping... (#7979)

* fix(amplify-category-auth): fixes being able to update siwa w/ out private key and attr mapping Cognito SDK takes null for the private key if users want to update everything but the private key and updating to reflect the correct attribute mapping for siwa fix #7793 * fix(amplify-category-auth): enable update siwa w/ out private key Co-authored-by: David Lopez <lopezbnd@amazon.com>
aws-amplify · Sep 7, 2021 · 94d2491 · 94d2491
1 parent b524870
commit 94d2491
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 19 deletions.
diff --git a/packages/amplify-category-auth/resources/cloudformation-templates/auth-template.yml.ejs b/packages/amplify-category-auth/resources/cloudformation-templates/auth-template.yml.ejs
@@ -601,17 +601,13 @@ Resources:
             - '    AttributeMapping: providerMeta.AttributeMapping,'
             - '   };'
             - '   if (providerMeta.ProviderName === ''SignInWithApple'') {'
-            - '     if (providerCreds.client_id && providerCreds.team_id && providerCreds.key_id && providerCreds.private_key) {'
-            - '      requestParams.ProviderDetails = {'
-            - '       ''client_id'': providerCreds.client_id,'
-            - '       ''team_id'': providerCreds.team_id,'
-            - '       ''key_id'': providerCreds.key_id,'
-            - '       ''private_key'': providerCreds.private_key,'
-            - '       ''authorize_scopes'': providerMeta.authorize_scopes,'
-            - '      };'
-            - '     } else {'
-            - '       requestParams = null;'
-            - '     }'
+            - '    requestParams.ProviderDetails = {'
+            - '     ''client_id'': providerCreds.client_id,'
+            - '     ''team_id'': providerCreds.team_id,'
+            - '     ''key_id'': providerCreds.key_id,'
+            - '     ''private_key'': providerCreds.private_key ? providerCreds.private_key : null,'
+            - '     ''authorize_scopes'': providerMeta.authorize_scopes,'
+            - '    };'
             - '   } else {'
             - '    requestParams.ProviderDetails = {'
             - '     ''client_id'': providerCreds.client_id,'
@@ -623,17 +619,11 @@ Resources:
             - '  };'
             - '  let createIdentityProvider = (providerName) => {'
             - '   let requestParams = getRequestParams(providerName);'
-            - '   if (!requestParams) {'
-            - '     return Promise.resolve();'
-            - '   }'
             - '   requestParams.ProviderType = requestParams.ProviderName;'
             - '   return identity.createIdentityProvider(requestParams).promise();'
             - '  };'
             - '  let updateIdentityProvider = (providerName) => {'
             - '   let requestParams = getRequestParams(providerName);'
-            - '   if (!requestParams) {'
-            - '     return Promise.resolve();'
-            - '   }'
             - '   return identity.updateIdentityProvider(requestParams).promise();'
             - '  };'
             - '  let deleteIdentityProvider = (providerName) => {'

diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/assets/string-maps.js b/packages/amplify-category-auth/src/provider-utils/awscloudformation/assets/string-maps.js
@@ -241,7 +241,10 @@ const attributeProviderMap = {
       attr: 'name',
       scope: 'profile',
     },
-    signinwithapple: {},
+    signinwithapple: {
+      attr: 'name',
+      scope: 'name',
+    },
   },
   nickname: {
     facebook: {},

diff --git a/...category-auth/src/provider-utils/awscloudformation/service-walkthroughs/auth-questions.js b/...category-auth/src/provider-utils/awscloudformation/service-walkthroughs/auth-questions.js
@@ -425,7 +425,7 @@ function userPoolProviders(oAuthProviders, coreAnswers, prevAnswers) {
     res.hostedUIProviderMeta = JSON.stringify(
       oAuthProviders.map(el => {
         const lowerCaseEl = el.toLowerCase();
-        const delimmiter = el === 'Facebook' || el === 'SignInWithApple' ? ',' : ' ';
+        const delimmiter = el === 'Facebook' ? ',' : ' ';
         const scopes = [];
         const maps = {};
         attributesForMapping.forEach(a => {