feat(amplify-category-auth): add auth verification mechanisms to fron…

…tend config (#8037)
aws-amplify · Sep 10, 2021 · 88494b3 · 88494b3
1 parent c032a88
commit 88494b3
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 47 deletions.
diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/import/types.ts b/packages/amplify-category-auth/src/provider-utils/awscloudformation/import/types.ts
@@ -61,6 +61,7 @@ export type AuthParameters = {
   passwordPolicyCharacters?: string[];
   mfaConfiguration?: string;
   mfaTypes?: string[];
+  autoVerifiedAttributes?: string[];
 };
 
 // Persisted into team-provider-info

diff --git a/...amplify-category-auth/src/provider-utils/awscloudformation/utils/amplify-meta-updaters.ts b/...amplify-category-auth/src/provider-utils/awscloudformation/utils/amplify-meta-updaters.ts
@@ -11,54 +11,54 @@ import { AuthParameters } from '../import/types';
  * @param context The amplify context
  * @param resultMetadata The metadata from the service selection prompt
  */
-export const getPostAddAuthMetaUpdater = (context: any, resultMetadata: { service: string; providerName: string }) => (
-  resourceName: string,
-): string => {
-  const options: any = {
-    service: resultMetadata.service,
-    providerPlugin: resultMetadata.providerName,
-  };
-  const parametersJSONPath = path.join(context.amplify.pathManager.getBackendDirPath(), 'auth', resourceName, 'parameters.json');
-  const authParameters = JSONUtilities.readJson<AuthParameters>(parametersJSONPath)!;
-
-  if (authParameters.dependsOn) {
-    options.dependsOn = authParameters.dependsOn;
-  }
-
-  let customAuthConfigured = false;
-  if (authParameters.triggers) {
-    const triggers = JSONUtilities.parse<any>(authParameters.triggers);
-
-    customAuthConfigured =
-      !!triggers.DefineAuthChallenge &&
-      triggers.DefineAuthChallenge.length > 0 &&
-      !!triggers.CreateAuthChallenge &&
-      triggers.CreateAuthChallenge.length > 0 &&
-      !!triggers.VerifyAuthChallengeResponse &&
-      triggers.VerifyAuthChallengeResponse.length > 0;
-  }
-
-  options.customAuth = customAuthConfigured;
-  options.frontendAuthConfig = getFrontendConfig(authParameters);
+export const getPostAddAuthMetaUpdater =
+  (context: any, resultMetadata: { service: string; providerName: string }) =>
+  (resourceName: string): string => {
+    const options: any = {
+      service: resultMetadata.service,
+      providerPlugin: resultMetadata.providerName,
+    };
+    const parametersJSONPath = path.join(context.amplify.pathManager.getBackendDirPath(), 'auth', resourceName, 'parameters.json');
+    const authParameters = JSONUtilities.readJson<AuthParameters>(parametersJSONPath)!;
+
+    if (authParameters.dependsOn) {
+      options.dependsOn = authParameters.dependsOn;
+    }
 
-  context.amplify.updateamplifyMetaAfterResourceAdd('auth', resourceName, options);
+    let customAuthConfigured = false;
+    if (authParameters.triggers) {
+      const triggers = JSONUtilities.parse<any>(authParameters.triggers);
+
+      customAuthConfigured =
+        !!triggers.DefineAuthChallenge &&
+        triggers.DefineAuthChallenge.length > 0 &&
+        !!triggers.CreateAuthChallenge &&
+        triggers.CreateAuthChallenge.length > 0 &&
+        !!triggers.VerifyAuthChallengeResponse &&
+        triggers.VerifyAuthChallengeResponse.length > 0;
+    }
 
-  // Remove Identity Pool dependency attributes on userpool groups if Identity Pool not enabled
-  const allResources = context.amplify.getProjectMeta();
-  if (allResources.auth && allResources.auth.userPoolGroups) {
-    if (!authParameters.identityPoolName) {
-      const userPoolGroupDependsOn = [
-        {
-          category: 'auth',
-          resourceName,
-          attributes: ['UserPoolId', 'AppClientIDWeb', 'AppClientID'],
-        },
-      ];
-      context.amplify.updateamplifyMetaAfterResourceUpdate('auth', 'userPoolGroups', 'dependsOn', userPoolGroupDependsOn);
+    options.customAuth = customAuthConfigured;
+    options.frontendAuthConfig = getFrontendConfig(authParameters);
+
+    context.amplify.updateamplifyMetaAfterResourceAdd('auth', resourceName, options);
+
+    // Remove Identity Pool dependency attributes on userpool groups if Identity Pool not enabled
+    const allResources = context.amplify.getProjectMeta();
+    if (allResources.auth && allResources.auth.userPoolGroups) {
+      if (!authParameters.identityPoolName) {
+        const userPoolGroupDependsOn = [
+          {
+            category: 'auth',
+            resourceName,
+            attributes: ['UserPoolId', 'AppClientIDWeb', 'AppClientID'],
+          },
+        ];
+        context.amplify.updateamplifyMetaAfterResourceUpdate('auth', 'userPoolGroups', 'dependsOn', userPoolGroupDependsOn);
+      }
     }
-  }
-  return resourceName;
-};
+    return resourceName;
+  };
 
 /**
  * Factory function that returns a function that updates Amplify meta files after updating auth resource assets
@@ -107,8 +107,8 @@ export const getPostUpdateAuthMetaUpdater = (context: any) => async (resourceNam
 };
 
 function getFrontendConfig(authParameters: AuthParameters) {
-  const loginMechanisms: string[] = [];
-  loginMechanisms.push(...(authParameters?.aliasAttributes || []).map((att: string) => att.toUpperCase()));
+  const loginMechanisms = (authParameters?.aliasAttributes || []).map((att: string) => att.toUpperCase());
+  const verificationMechanisms = (authParameters?.autoVerifiedAttributes || []).map((att: string) => att.toUpperCase());
 
   if (authParameters.authProviders) {
     authParameters.authProviders.forEach((provider: string) => {
@@ -144,5 +144,6 @@ function getFrontendConfig(authParameters: AuthParameters) {
     passwordProtectionSettings: passwordProtectionSettings,
     mfaConfiguration: authParameters?.mfaConfiguration,
     mfaTypes: mfaTypes,
+    verificationMechanisms: verificationMechanisms,
   };
 }
diff --git a/packages/amplify-e2e-tests/src/__tests__/auth_6.test.ts b/packages/amplify-e2e-tests/src/__tests__/auth_6.test.ts
@@ -58,6 +58,9 @@ describe('zero config auth ', () => {
         "signupAttributes": Array [
           "EMAIL",
         ],
+        "verificationMechanisms": Array [
+          "EMAIL",
+        ],
       }
     `);
   });

diff --git a/packages/amplify-frontend-javascript/lib/frontend-config-creator.js b/packages/amplify-frontend-javascript/lib/frontend-config-creator.js
@@ -296,6 +296,7 @@ function getCognitoConfig(cognitoResources, projectRegion) {
     frontendAuthConfig.aws_cognito_mfa_configuration = cognitoResource.frontendAuthConfig.mfaConfiguration;
     frontendAuthConfig.aws_cognito_mfa_types = cognitoResource.frontendAuthConfig.mfaTypes;
     frontendAuthConfig.aws_cognito_password_protection_settings = cognitoResource.frontendAuthConfig.passwordProtectionSettings;
+    frontendAuthConfig.aws_cognito_verification_mechanisms = cognitoResource.frontendAuthConfig.verificationMechanisms;
   }
 
   return {