Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(amplify-category-auth): add auth verification mechanisms to front end config #8037

Merged
merged 1 commit into from
Sep 10, 2021
Merged

feat(amplify-category-auth): add auth verification mechanisms to front end config #8037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/amplify-category-auth/src/provider-utils/awscloudformation/import/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ export type AuthParameters = {
passwordPolicyCharacters?: string[];
mfaConfiguration?: string;
mfaTypes?: string[];
autoVerifiedAttributes?: string[];
};

// Persisted into team-provider-info
Expand Down
95 changes: 48 additions & 47 deletions ...amplify-category-auth/src/provider-utils/awscloudformation/utils/amplify-meta-updaters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
lazpavel marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down Expand Up @@ -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) => {
Expand Down Expand Up @@ -144,5 +144,6 @@ function getFrontendConfig(authParameters: AuthParameters) {
passwordProtectionSettings: passwordProtectionSettings,
mfaConfiguration: authParameters?.mfaConfiguration,
mfaTypes: mfaTypes,
verificationMechanisms: verificationMechanisms,
};
}
3 changes: 3 additions & 0 deletions packages/amplify-e2e-tests/src/__tests__/auth_6.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ describe('zero config auth ', () => {
"signupAttributes": Array [
"EMAIL",
],
"verificationMechanisms": Array [
"EMAIL",
],
}
`);
});
Expand Down
1 change: 1 addition & 0 deletions packages/amplify-frontend-javascript/lib/frontend-config-creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down