Fix for custom attribute mapping

aws · Nov 3, 2024 · 24fd60f · 24fd60f
1 parent 796c6d1
commit 24fd60f
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/private/user-pool-idp-base.ts b/packages/aws-cdk-lib/aws-cognito/lib/user-pool-idps/private/user-pool-idp-base.ts
@@ -30,7 +30,7 @@ export abstract class UserPoolIdentityProviderBase extends Resource implements I
       }, mapping);
     if (this.props.attributeMapping.custom) {
       mapping = Object.entries(this.props.attributeMapping.custom).reduce((agg, [k, v]) => {
-        return { ...agg, [k]: v.attributeName };
+        return { ...agg, [k]: `custom:${v.attributeName}` };
       }, mapping);
     }
     if (Object.keys(mapping).length === 0) { return undefined; }

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/amazon.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/amazon.test.ts
@@ -92,8 +92,8 @@ describe('UserPoolIdentityProvider', () => {
         AttributeMapping: {
           given_name: 'name',
           address: 'amzn-address',
-          customAttr1: 'email',
-          customAttr2: 'amzn-custom-attr',
+          customAttr1: 'custom:email',
+          customAttr2: 'custom:amzn-custom-attr',
         },
       });
     });

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/apple.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/apple.test.ts
@@ -105,8 +105,8 @@ describe('UserPoolIdentityProvider', () => {
         AttributeMapping: {
           family_name: 'lastName',
           given_name: 'firstName',
-          customAttr1: 'email',
-          customAttr2: 'sub',
+          customAttr1: 'custom:email',
+          customAttr2: 'custom:sub',
         },
       });
     });

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/base.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/base.test.ts
@@ -67,8 +67,8 @@ describe('UserPoolIdentityProvider', () => {
 
       // THEN
       expect(idp.mapping).toStrictEqual({
-        'custom-attr-1': 'email',
-        'custom-attr-2': 'name',
+        'custom-attr-1': 'custom:email',
+        'custom-attr-2': 'custom:name',
       });
     });
 

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/facebook.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/facebook.test.ts
@@ -94,8 +94,8 @@ describe('UserPoolIdentityProvider', () => {
         AttributeMapping: {
           given_name: 'name',
           address: 'fb-address',
-          customAttr1: 'email',
-          customAttr2: 'fb-custom-attr',
+          customAttr1: 'custom:email',
+          customAttr2: 'custom:fb-custom-attr',
         },
       });
     });

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/google.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/google.test.ts
@@ -93,8 +93,8 @@ describe('UserPoolIdentityProvider', () => {
         AttributeMapping: {
           given_name: 'name',
           address: 'google-address',
-          customAttr1: 'email',
-          customAttr2: 'google-custom-attr',
+          customAttr1: 'custom:email',
+          customAttr2: 'custom:google-custom-attr',
         },
       });
     });

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/oidc.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/oidc.test.ts
@@ -132,8 +132,8 @@ describe('UserPoolIdentityProvider', () => {
         AttributeMapping: {
           family_name: 'family_name',
           given_name: 'given_name',
-          customAttr1: 'email',
-          customAttr2: 'sub',
+          customAttr1: 'custom:email',
+          customAttr2: 'custom:sub',
         },
       });
     });

diff --git a/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/saml.test.ts b/packages/aws-cdk-lib/aws-cognito/test/user-pool-idps/saml.test.ts
@@ -182,8 +182,8 @@ describe('UserPoolIdentityProvider', () => {
         AttributeMapping: {
           family_name: 'family_name',
           given_name: 'given_name',
-          customAttr1: 'email',
-          customAttr2: 'sub',
+          customAttr1: 'custom:email',
+          customAttr2: 'custom:sub',
         },
       });
     });