Revert "feat(amplify-category-auth): add auth verification mechanisms…

… to frontend config (aws-amplify#8037) (aws-amplify#8093)"

This reverts commit b8949b2.

packages/amplify-category-auth/src/index.js

@@ -21,10 +21,8 @@ const { getAddAuthRequestAdaptor, getUpdateAuthRequestAdaptor } = require('./pro
 const { getAddAuthHandler, getUpdateAuthHandler } = require('./provider-utils/awscloudformation/handlers/resource-handlers');
 const { projectHasAuth } = require('./provider-utils/awscloudformation/utils/project-has-auth');
 const { attachPrevParamsToContext } = require('./provider-utils/awscloudformation/utils/attach-prev-params-to-context');
-const { getFrontendConfig } = require('./provider-utils/awscloudformation/utils/amplify-meta-updaters');
 const { stateManager } = require('amplify-cli-core');
 const { headlessImport } = require('./provider-utils/awscloudformation/import');
-const { AuthParameters } = require('./provider-utils/awscloudformation/import/types');
 
 const {
   doesConfigurationIncludeSMS,
@@ -252,8 +250,13 @@ async function checkRequirements(requirements, context, category, targetResource
 
 async function initEnv(context) {
   const { amplify } = context;
-  const { resourcesToBeCreated, resourcesToBeUpdated, resourcesToBeSynced, resourcesToBeDeleted, allResources } =
-    await amplify.getResourceStatus('auth');
+  const {
+    resourcesToBeCreated,
+    resourcesToBeUpdated,
+    resourcesToBeSynced,
+    resourcesToBeDeleted,
+    allResources,
+  } = await amplify.getResourceStatus('auth');
   const isPulling = context.input.command === 'pull' || (context.input.command === 'env' && context.input.subCommands[0] === 'pull');
   let toBeCreated = [];
   let toBeUpdated = [];
@@ -407,7 +410,12 @@ const executeAmplifyHeadlessCommand = async (context, headlessPayload) => {
       const cognito = await providerPlugin.createCognitoUserPoolService(context);
       const identity = await providerPlugin.createIdentityPoolService(context);
       const { JSONUtilities } = require('amplify-cli-core/lib/jsonUtilities');
-      const { userPoolId, identityPoolId, nativeClientId, webClientId } = JSONUtilities.parse(headlessPayload);
+      const {
+        userPoolId,
+        identityPoolId,
+        nativeClientId,
+        webClientId,
+      } = JSONUtilities.parse(headlessPayload);
       const projectConfig = context.amplify.getProjectConfig();
       const resourceName = projectConfig.projectName.toLowerCase().replace(/[^A-Za-z0-9_]+/g, '_');
       const resourceParams = {
@@ -479,6 +487,4 @@ module.exports = {
   category,
   importAuth,
   isSMSWorkflowEnabled,
-  AuthParameters,
-  getFrontendConfig,
 };

packages/amplify-category-auth/src/provider-utils/awscloudformation/import/types.ts

@@ -55,7 +55,6 @@ export type AuthParameters = {
   triggers?: string;
   identityPoolName?: string;
   aliasAttributes?: string[];
-  usernameAttributes?: string[];
   authProviders?: string[];
   requiredAttributes?: string[];
   passwordPolicyMinLength?: string;

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

@@ -106,30 +106,20 @@ export const getPostUpdateAuthMetaUpdater = (context: any) => async (resourceNam
   return resourceName;
 };
 
-export function getFrontendConfig(authParameters: AuthParameters) {
+function getFrontendConfig(authParameters: AuthParameters) {
+  const loginMechanisms = (authParameters?.aliasAttributes || []).map((att: string) => att.toUpperCase());
   const verificationMechanisms = (authParameters?.autoVerifiedAttributes || []).map((att: string) => att.toUpperCase());
-  const loginMechanisms: Set<string> = new Set<string>();
-  (authParameters?.aliasAttributes ?? []).forEach(it => loginMechanisms.add(it.toUpperCase()));
-
-  // backwards compatibility
-  if (authParameters?.usernameAttributes && authParameters?.usernameAttributes.length > 0) {
-    authParameters.usernameAttributes[0].split(',').forEach(it => loginMechanisms.add(it.trim().toUpperCase()));
-  }
 
   if (authParameters.authProviders) {
     authParameters.authProviders.forEach((provider: string) => {
       let name = authProviderList.find(it => it.value === provider)?.name;
 
       if (name) {
-        loginMechanisms.add(name.toUpperCase());
+        loginMechanisms.push(name.toUpperCase());
       }
     });
   }
 
-  if (loginMechanisms.size == 0) {
-    loginMechanisms.add('PREFERRED_USERNAME');
-  }
-
   const signupAttributes = (authParameters?.requiredAttributes || []).map((att: string) => att.toUpperCase());
 
   const passwordProtectionSettings = {
@@ -149,7 +139,7 @@ export function getFrontendConfig(authParameters: AuthParameters) {
   }
 
   return {
-    loginMechanisms: Array.from(loginMechanisms),
+    loginMechanisms: loginMechanisms,
     signupAttributes: signupAttributes,
     passwordProtectionSettings: passwordProtectionSettings,
     mfaConfiguration: authParameters?.mfaConfiguration,

packages/amplify-cli/src/extensions/amplify-helpers/on-category-outputs-change.ts

@@ -2,9 +2,7 @@ import * as fs from 'fs-extra';
 import * as path from 'path';
 import { getResourceOutputs } from './get-resource-outputs';
 import sequential from 'promise-sequential';
-import { JSONUtilities, stateManager } from 'amplify-cli-core';
-import { AuthParameters } from 'amplify-category-auth';
-import { getFrontendConfig } from 'amplify-category-auth';
+import { stateManager } from 'amplify-cli-core';
 
 export async function onCategoryOutputsChange(context, cloudAmplifyMeta?, localMeta?) {
   if (!cloudAmplifyMeta) {
@@ -15,8 +13,8 @@ export async function onCategoryOutputsChange(context, cloudAmplifyMeta?, localM
   }
 
   const projectConfig = stateManager.getProjectConfig();
+
   if (projectConfig.frontend) {
-    ensureAmplifyMetaFrontendConfig(context, localMeta);
     const frontendPlugins = context.amplify.getFrontendPlugins(context);
     const frontendHandlerModule = require(frontendPlugins[projectConfig.frontend]);
     await frontendHandlerModule.createFrontendConfigs(context, getResourceOutputs(localMeta), getResourceOutputs(cloudAmplifyMeta));
@@ -65,33 +63,3 @@ function attachContextExtensions(context, packageLocation) {
     }
   }
 }
-
-// projects created before 5.2.0 didn't populate frontend config in amplify-meta.json
-// this method ensures frontend config settings are added to amplify meta on pull as they exist in parameters.json
-// https://app.asana.com/0/1200585422384147/1200740448709567/f
-export function ensureAmplifyMetaFrontendConfig(context, amplifyMeta?) {
-  if (!amplifyMeta) {
-    amplifyMeta = stateManager.getMeta();
-  }
-
-  if (!amplifyMeta.auth) return;
-
-  const authResourceName = Object.keys(amplifyMeta.auth).find((key: any) => {
-    return amplifyMeta.auth[key].service === 'Cognito';
-  });
-
-  if (!authResourceName) return;
-
-  const authParameters: AuthParameters = stateManager.getResourceParametersJson(undefined, 'auth', authResourceName);
-  const frontendAuthConfig = getFrontendConfig(authParameters);
-
-  amplifyMeta.auth[authResourceName].frontendAuthConfig = amplifyMeta.auth[authResourceName].frontendAuthConfig ?? {};
-  const metaFrontendAuthConfig = amplifyMeta.auth[authResourceName].frontendAuthConfig;
-  Object.keys(frontendAuthConfig).forEach(key => {
-    if (!metaFrontendAuthConfig.hasOwnProperty(key)) {
-      metaFrontendAuthConfig[key] = frontendAuthConfig[key];
-    }
-  });
-
-  JSONUtilities.writeJson(context.amplify.pathManager.getAmplifyMetaFilePath(), amplifyMeta);
-}