fix(amplify-category-auth): add auth user selections to aws-exports/amplifyconfiguration files

.circleci/config.yml

@@ -1251,14 +1251,22 @@ jobs:
     environment:
       TEST_SUITE: src/__tests__/configure-project.test.ts
       CLI_REGION: eu-central-1
+  auth_6-amplify_e2e_tests:
+    working_directory: ~/repo
+    docker: *ref_1
+    resource_class: large
+    steps: *ref_5
+    environment:
+      TEST_SUITE: src/__tests__/auth_6.test.ts
+      CLI_REGION: ap-northeast-1
   api_4-amplify_e2e_tests:
     working_directory: ~/repo
     docker: *ref_1
     resource_class: large
     steps: *ref_5
     environment:
       TEST_SUITE: src/__tests__/api_4.test.ts
-      CLI_REGION: ap-northeast-1
+      CLI_REGION: ap-southeast-1
   schema-iterative-update-4-amplify_e2e_tests_pkg_linux:
     working_directory: ~/repo
     docker: *ref_1
@@ -1999,6 +2007,16 @@ jobs:
       TEST_SUITE: src/__tests__/configure-project.test.ts
       CLI_REGION: eu-central-1
     steps: *ref_6
+  auth_6-amplify_e2e_tests_pkg_linux:
+    working_directory: ~/repo
+    docker: *ref_1
+    resource_class: large
+    environment:
+      AMPLIFY_DIR: /home/circleci/repo/out
+      AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
+      TEST_SUITE: src/__tests__/auth_6.test.ts
+      CLI_REGION: ap-northeast-1
+    steps: *ref_6
   api_4-amplify_e2e_tests_pkg_linux:
     working_directory: ~/repo
     docker: *ref_1
@@ -2007,7 +2025,7 @@ jobs:
       AMPLIFY_DIR: /home/circleci/repo/out
       AMPLIFY_PATH: /home/circleci/repo/out/amplify-pkg-linux
       TEST_SUITE: src/__tests__/api_4.test.ts
-      CLI_REGION: ap-northeast-1
+      CLI_REGION: ap-southeast-1
     steps: *ref_6
 workflows:
   version: 2
@@ -2130,11 +2148,11 @@ workflows:
             - interactions-amplify_e2e_tests
             - datastore-modelgen-amplify_e2e_tests
             - layer-2-amplify_e2e_tests
-            - api_4-amplify_e2e_tests
-            - schema-iterative-update-2-amplify_e2e_tests
+            - auth_6-amplify_e2e_tests
             - schema-data-access-patterns-amplify_e2e_tests
             - init-special-case-amplify_e2e_tests
             - iam-permissions-boundary-amplify_e2e_tests
+            - api_4-amplify_e2e_tests
             - feature-flags-amplify_e2e_tests
             - schema-versioned-amplify_e2e_tests
             - plugin-amplify_e2e_tests
@@ -2160,11 +2178,11 @@ workflows:
             - interactions-amplify_e2e_tests_pkg_linux
             - datastore-modelgen-amplify_e2e_tests_pkg_linux
             - layer-2-amplify_e2e_tests_pkg_linux
-            - api_4-amplify_e2e_tests_pkg_linux
-            - schema-iterative-update-2-amplify_e2e_tests_pkg_linux
+            - auth_6-amplify_e2e_tests_pkg_linux
             - schema-data-access-patterns-amplify_e2e_tests_pkg_linux
             - init-special-case-amplify_e2e_tests_pkg_linux
             - iam-permissions-boundary-amplify_e2e_tests_pkg_linux
+            - api_4-amplify_e2e_tests_pkg_linux
             - feature-flags-amplify_e2e_tests_pkg_linux
             - schema-versioned-amplify_e2e_tests_pkg_linux
             - plugin-amplify_e2e_tests_pkg_linux
@@ -2648,7 +2666,7 @@ workflows:
           filters: *ref_10
           requires:
             - function_3-amplify_e2e_tests
-      - api_4-amplify_e2e_tests:
+      - auth_6-amplify_e2e_tests:
           context: *ref_8
           post-steps: *ref_9
           filters: *ref_10
@@ -2714,6 +2732,12 @@ workflows:
           filters: *ref_10
           requires:
             - auth_5-amplify_e2e_tests
+      - api_4-amplify_e2e_tests:
+          context: *ref_8
+          post-steps: *ref_9
+          filters: *ref_10
+          requires:
+            - schema-iterative-update-2-amplify_e2e_tests
       - schema-iterative-update-3-amplify_e2e_tests:
           context: *ref_8
           post-steps: *ref_9
@@ -3128,7 +3152,7 @@ workflows:
           filters: *ref_13
           requires:
             - function_3-amplify_e2e_tests_pkg_linux
-      - api_4-amplify_e2e_tests_pkg_linux:
+      - auth_6-amplify_e2e_tests_pkg_linux:
           context: *ref_11
           post-steps: *ref_12
           filters: *ref_13
@@ -3198,6 +3222,12 @@ workflows:
           filters: *ref_13
           requires:
             - auth_5-amplify_e2e_tests_pkg_linux
+      - api_4-amplify_e2e_tests_pkg_linux:
+          context: *ref_11
+          post-steps: *ref_12
+          filters: *ref_13
+          requires:
+            - schema-iterative-update-2-amplify_e2e_tests_pkg_linux
       - schema-iterative-update-3-amplify_e2e_tests_pkg_linux:
           context: *ref_11
           post-steps: *ref_12

packages/amplify-category-auth/src/provider-utils/awscloudformation/utils/amplify-meta-updaters.ts

@@ -1,6 +1,8 @@
 import * as path from 'path';
 import { JSONUtilities, $TSAny, pathManager } from 'amplify-cli-core';
 import { transformUserPoolGroupSchema } from './transform-user-pool-group';
+import { authProviders as authProviderList } from '../assets/string-maps';
+
 /**
  * Factory function that returns a function that updates Amplify meta files after adding auth resource assets
  *
@@ -16,7 +18,7 @@ export const getPostAddAuthMetaUpdater = (context: any, resultMetadata: { servic
     providerPlugin: resultMetadata.providerName,
   };
   const parametersJSONPath = path.join(context.amplify.pathManager.getBackendDirPath(), 'auth', resourceName, 'parameters.json');
-  const authParameters = JSONUtilities.readJson<{ dependsOn: any[]; triggers: string; identityPoolName: string }>(parametersJSONPath)!;
+  const authParameters = JSONUtilities.readJson<$TSAny>(parametersJSONPath)!;
 
   if (authParameters.dependsOn) {
     options.dependsOn = authParameters.dependsOn;
@@ -36,6 +38,7 @@ export const getPostAddAuthMetaUpdater = (context: any, resultMetadata: { servic
   }
 
   options.customAuth = customAuthConfigured;
+  options.frontEndConfig = getFrontEndConfig(authParameters);
 
   context.amplify.updateamplifyMetaAfterResourceAdd('auth', resourceName, options);
 
@@ -79,6 +82,7 @@ export const getPostUpdateAuthMetaUpdater = (context: any) => async (resourceNam
       triggers.VerifyAuthChallengeResponse.length > 0;
   }
   context.amplify.updateamplifyMetaAfterResourceUpdate('auth', resourceName, 'customAuth', customAuthConfigured);
+  context.amplify.updateamplifyMetaAfterResourceUpdate('auth', resourceName, 'frontEndConfig', getFrontEndConfig(authParameters));
 
   // Update Identity Pool dependency attributes on userpool groups
   const allResources = context.amplify.getProjectMeta();
@@ -100,3 +104,66 @@ export const getPostUpdateAuthMetaUpdater = (context: any) => async (resourceNam
   }
   return resourceName;
 };
+
+function getFrontEndConfig(authParameters: any) {
+  const frontEndConfig: any = {};
+
+  let loginMechanism: string[] = [];
+
+  if (authParameters.aliasAttributes) {
+    let aliasAttributes = authParameters.aliasAttributes.map((att: string) => att.toUpperCase());
+    loginMechanism = [...aliasAttributes];
+  }
+
+  if (authParameters.authProviders) {
+    authParameters.authProviders.forEach((provider: string) => {
+      let name = authProviderList.find(it => it.value === provider)?.name;
+
+      if (name) {
+        loginMechanism.push(name.toUpperCase());
+      }
+    });
+  }
+
+  if (loginMechanism.length) {
+    frontEndConfig.loginMechanism = loginMechanism;
+  }
+
+  if (authParameters.requiredAttributes) {
+    let requiredAttributes = authParameters.requiredAttributes.map((att: string) => att.toUpperCase());
+    frontEndConfig.signupAttributes = [...requiredAttributes];
+  }
+
+  if (authParameters.mfaConfiguration) {
+    frontEndConfig.mfaConfiguration = authParameters.mfaConfiguration;
+  }
+
+  if (authParameters.mfaTypes) {
+    frontEndConfig.mfaTypes = [];
+
+    if (authParameters.mfaTypes.includes('SMS Text Message')) {
+      frontEndConfig.mfaTypes.push('SMS');
+    }
+
+    if (authParameters.mfaTypes.includes('TOTP')) {
+      frontEndConfig.mfaTypes.push('TOTP');
+    }
+  }
+
+  if (authParameters.passwordPolicyMinLength || authParameters.passwordPolicyCharacters) {
+    let passwordProtectionSettings: any = {};
+
+    if (authParameters.passwordPolicyMinLength) {
+      passwordProtectionSettings.passwordPolicyMinLength = authParameters.passwordPolicyMinLength;
+    }
+
+    if (authParameters.passwordPolicyCharacters) {
+      let passwordPolicyCharacters = authParameters.passwordPolicyCharacters.map((i: string) => i.replace(/ /g, '_').toUpperCase());
+      passwordProtectionSettings.passwordPolicyCharacters = passwordPolicyCharacters;
+    }
+
+    frontEndConfig.passwordProtectionSettings = passwordProtectionSettings;
+  }
+
+  return frontEndConfig;
+}

packages/amplify-e2e-tests/src/__tests__/auth_6.test.ts

@@ -0,0 +1,43 @@
+import {
+  initJSProjectWithProfile,
+  getProjectMeta,
+  deleteProject,
+  amplifyPushAuth,
+  createNewProjectDir,
+  deleteProjectDir,
+  addAuthWithMaxOptions,
+} from 'amplify-e2e-core';
+import _ from 'lodash';
+
+const PROJECT_NAME = 'authTest';
+const defaultsSettings = {
+  name: PROJECT_NAME,
+};
+describe('zero config auth ', () => {
+  let projRoot: string;
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('zero-config-auth');
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('...should init a javascript project and add auth with a all uptions and update front end config', async () => {
+    await initJSProjectWithProfile(projRoot, defaultsSettings);
+    await addAuthWithMaxOptions(projRoot, { useInclusiveTerminology: false });
+    await amplifyPushAuth(projRoot);
+    let meta = getProjectMeta(projRoot);
+
+    let id = Object.keys(meta.auth)[0];
+    let authMeta = meta.auth[id];
+
+    expect(authMeta.frontEndConfig).toBeDefined();
+    expect(authMeta.frontEndConfig.loginMechanism).toBeDefined();
+    expect(authMeta.frontEndConfig.signupAttributes).toBeDefined();
+    expect(authMeta.frontEndConfig.mfaConfiguration).toBeDefined();
+    expect(authMeta.frontEndConfig.mfaTypes).toBeDefined();
+    expect(authMeta.frontEndConfig.passwordProtectionSettings).toBeDefined();
+  });
+});

packages/amplify-frontend-android/lib/frontend-config-creator.js

@@ -264,6 +264,8 @@ function getCognitoConfig(cognitoResources, projectRegion) {
     };
   }
 
+  Object.assign(cognitoConfig.Auth.Default, cognitoResource.frontEndConfig);
+
   return cognitoConfig;
 }
 

packages/amplify-frontend-flutter/lib/frontend-config-creator.js

@@ -241,6 +241,8 @@ function getCognitoConfig(cognitoResources, projectRegion) {
     };
   }
 
+  Object.assign(cognitoConfig.Auth.Default, cognitoResource.frontEndConfig);
+
   return cognitoConfig;
 }
 

packages/amplify-frontend-ios/lib/frontend-config-creator.js

@@ -246,6 +246,8 @@ function getCognitoConfig(cognitoResources, projectRegion) {
     };
   }
 
+  Object.assign(cognitoConfig.Auth.Default, cognitoResource.frontEndConfig);
+
   return cognitoConfig;
 }
 

packages/amplify-frontend-javascript/lib/frontend-config-creator.js

@@ -289,13 +289,38 @@ function getCognitoConfig(cognitoResources, projectRegion) {
     federationTarget = 'COGNITO_IDENTITY_POOLS';
   }
 
+  let authData = {};
+
+  if (cognitoResource.frontEndConfig) {
+    if (cognitoResource.frontEndConfig.loginMechanism) {
+      authData.aws_cognito_login_mechanism = cognitoResource.frontEndConfig.loginMechanism;
+    }
+
+    if (cognitoResource.frontEndConfig.signupAttributes) {
+      authData.aws_cognito_signup_attributes = cognitoResource.frontEndConfig.signupAttributes;
+    }
+
+    if (cognitoResource.frontEndConfig.mfaConfiguration) {
+      authData.aws_cognito_mfa_configuration = cognitoResource.frontEndConfig.mfaConfiguration;
+    }
+
+    if (cognitoResource.frontEndConfig.mfaTypes) {
+      authData.aws_cognito_mfa_types = cognitoResource.frontEndConfig.mfaTypes;
+    }
+
+    if (cognitoResource.frontEndConfig.passwordProtectionSettings) {
+      authData.aws_cognito_password_protection_settings = cognitoResource.frontEndConfig.passwordProtectionSettings;
+    }
+  }
+
   return {
     aws_cognito_identity_pool_id: cognitoResource.output.IdentityPoolId,
     aws_cognito_region: projectRegion,
     aws_user_pools_id: cognitoResource.output.UserPoolId,
     aws_user_pools_web_client_id: cognitoResource.output.AppClientIDWeb,
     oauth,
     federationTarget,
+    ...authData,
   };
 }