fix: headless auth required attributes must be an array (aws-amplify#…

…5467)
r0zar · Nov 19, 2020 · d17e67b · d17e67b
1 parent c9bc207
commit d17e67b
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 6 deletions.
diff --git a/...s__/provider-utils/core-questions.test.js → ...question-factories/core-questions.test.js b/...s__/provider-utils/core-questions.test.js → ...question-factories/core-questions.test.js
@@ -1,8 +1,8 @@
 /* eslint-disable max-len */
 
-const coreQuestions = require('../../provider-utils/awscloudformation/question-factories/core-questions');
-const defaults = require('../../provider-utils/awscloudformation/assets/cognito-defaults');
-const maps = require('../../provider-utils/awscloudformation/assets/string-maps');
+const coreQuestions = require('../../../../provider-utils/awscloudformation/question-factories/core-questions');
+const defaults = require('../../../../provider-utils/awscloudformation/assets/cognito-defaults');
+const maps = require('../../../../provider-utils/awscloudformation/assets/string-maps');
 
 const defaultFileName = 'cognito-defaults';
 const stringMapFileName = 'string-maps';

diff --git a/...__/provider-utils/awscloudformation/utils/__snapshots__/auth-request-adaptor.test.ts.snap b/...__/provider-utils/awscloudformation/utils/__snapshots__/auth-request-adaptor.test.ts.snap
@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`get add auth request adaptor valid translations translates request with minimal user pool config only 1`] = `
+Object {
+  "adminQueries": false,
+  "adminQueryGroup": undefined,
+  "authProviders": Array [],
+  "authSelections": "userPoolOnly",
+  "autoVerifiedAttributes": Array [],
+  "identityPoolName": undefined,
+  "mfaConfiguration": "OFF",
+  "requiredAttributes": Array [
+    "email",
+  ],
+  "resourceName": "myTestAuth",
+  "serviceName": "Cognito",
+  "thirdPartyAuth": false,
+  "updateFlow": "manual",
+  "useDefault": "manual",
+  "userPoolGroupList": Array [],
+  "userPoolGroups": false,
+  "userPoolName": undefined,
+  "usernameAttributes": Array [
+    "email",
+  ],
+  "userpoolClientReadAttributes": Array [],
+  "userpoolClientRefreshTokenValidity": undefined,
+  "userpoolClientWriteAttributes": Array [],
+}
+`;
diff --git a/...ry-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-request-adaptor.test.ts b/...ry-auth/src/__tests__/provider-utils/awscloudformation/utils/auth-request-adaptor.test.ts
@@ -0,0 +1,23 @@
+import { AddAuthRequest, CognitoUserPoolSigninMethod, CognitoUserProperty } from 'amplify-headless-interface';
+import { getAddAuthRequestAdaptor } from '../../../../provider-utils/awscloudformation/utils/auth-request-adaptors';
+
+describe('get add auth request adaptor', () => {
+  describe('valid translations', () => {
+    it('translates request with minimal user pool config only', () => {
+      const addAuthRequest: AddAuthRequest = {
+        version: 1,
+        resourceName: 'myTestAuth',
+        serviceConfiguration: {
+          serviceName: 'Cognito',
+          userPoolConfiguration: {
+            signinMethod: CognitoUserPoolSigninMethod.EMAIL,
+            requiredSignupAttributes: [CognitoUserProperty.EMAIL],
+          },
+          includeIdentityPool: false,
+        },
+      };
+
+      expect(getAddAuthRequestAdaptor('javascript')(addAuthRequest)).toMatchSnapshot();
+    });
+  });
+});
diff --git a/...er-utils/trigger-flow-auth-helper.test.js → ...on/utils/trigger-flow-auth-helper.test.js b/...er-utils/trigger-flow-auth-helper.test.js → ...on/utils/trigger-flow-auth-helper.test.js
@@ -1,4 +1,4 @@
-const { handleTriggers } = require('../../provider-utils/awscloudformation/utils/trigger-flow-auth-helper');
+const { handleTriggers } = require('../../../../provider-utils/awscloudformation/utils/trigger-flow-auth-helper');
 
 const defaults = {
   envVars: {},

diff --git a/...s/amplify-category-auth/src/provider-utils/awscloudformation/service-walkthrough-types.ts b/...s/amplify-category-auth/src/provider-utils/awscloudformation/service-walkthrough-types.ts
@@ -18,7 +18,7 @@ export interface ServiceQuestionsBaseResult {
   requiredAttributes: string[];
   authSelections: 'userPoolOnly' | 'identityPoolAndUserPool';
   userPoolName?: string;
-  usernameAttributes?: UsernameAttributes;
+  usernameAttributes?: UsernameAttributes[];
   userPoolGroups: boolean;
   userPoolGroupList?: string[];
   userpoolClientRefreshTokenValidity?: number;

diff --git a/...amplify-category-auth/src/provider-utils/awscloudformation/utils/auth-request-adaptors.ts b/...amplify-category-auth/src/provider-utils/awscloudformation/utils/auth-request-adaptors.ts
@@ -74,7 +74,7 @@ export const getUpdateAuthRequestAdaptor = (projectType: string, requiredAttribu
 const immutableAttributeAdaptor = (userPoolConfig: CognitoUserPoolConfiguration, identityPoolConfig?: CognitoIdentityPoolConfiguration) => {
   return {
     userPoolName: userPoolConfig.userPoolName,
-    usernameAttributes: signinAttributeMap[userPoolConfig.signinMethod],
+    usernameAttributes: [signinAttributeMap[userPoolConfig.signinMethod]],
     ...immutableIdentityPoolMap(identityPoolConfig),
   };
 };