feat: cognito + s3 + dyanmodb lambda trigger support (#1783)

Author: kaustavghosh06

packages/amplify-category-auth/commands/auth/enable.js

@@ -31,6 +31,9 @@ module.exports = {
         return providerController.addResource(context, category, result.service);
       })
       .then((resourceName) => {
+        if (context.amplify.auth && context.amplify.auth.dependsOn) {
+          options.dependsOn = context.amplify.auth.dependsOn;
+        }
         amplify.updateamplifyMetaAfterResourceAdd(category, resourceName, options);
         const { print } = context;
         print.success(`Successfully added resource ${resourceName} locally`);

packages/amplify-category-auth/commands/auth/push.js

@@ -1,5 +1,6 @@
 const subcommand = 'push';
 const category = 'auth';
+const { uploadFiles } = require('../../provider-utils/awscloudformation/utils/trigger-file-uploader');
 
 module.exports = {
   name: subcommand,
@@ -8,6 +9,9 @@ module.exports = {
     const resourceName = parameters.first;
     context.amplify.constructExeInfo(context);
     return amplify.pushResources(context, category, resourceName)
+      .then(async () => {
+        await uploadFiles(context);
+      })
       .catch((err) => {
         context.print.info(err.stack);
         context.print.error('There was an error pushing the auth resource');

packages/amplify-category-auth/commands/auth/update.js

@@ -49,7 +49,9 @@ module.exports = {
         return providerController.updateResource(context, category, options);
       })
       .then((resourceName) => { // eslint-disable-line no-shadow
-        amplify.updateamplifyMetaAfterResourceUpdate(category, resourceName, options);
+        if (context.amplify.auth && context.amplify.auth.dependsOn) {
+          amplify.updateamplifyMetaAfterResourceUpdate(category, resourceName, 'dependsOn', context.amplify.auth.dependsOn);
+        }
         const { print } = context;
         print.success(`Successfully updated resource ${resourceName} locally`);
         print.info('');

packages/amplify-category-auth/index.js

@@ -188,12 +188,25 @@ async function checkRequirements(requirements, context) {
 async function initEnv(context) {
   const { amplify } = context;
   const { resourcesToBeCreated, resourcesToBeDeleted, resourcesToBeUpdated } = await amplify.getResourceStatus('auth');
+  let toBeCreated = [];
+  let toBeDeleted = [];
+  let toBeUpdated = [];
 
-  resourcesToBeDeleted.forEach((authResource) => {
+  if (resourcesToBeCreated && resourcesToBeCreated.length > 0) {
+    toBeCreated = resourcesToBeCreated.filter(a => a.category === 'auth');
+  }
+  if (resourcesToBeDeleted && resourcesToBeDeleted.length > 0) {
+    toBeDeleted = resourcesToBeDeleted.filter(b => b.category === 'auth');
+  }
+  if (resourcesToBeUpdated && resourcesToBeUpdated.length > 0) {
+    toBeUpdated = resourcesToBeUpdated.filter(c => c.category === 'auth');
+  }
+
+  toBeDeleted.forEach((authResource) => {
     amplify.removeResourceParameters(context, 'auth', authResource.resourceName);
   });
 
-  const tasks = resourcesToBeCreated.concat(resourcesToBeUpdated);
+  const tasks = toBeCreated.concat(toBeUpdated);
 
   const authTasks = tasks.map((authResource) => {
     const { resourceName } = authResource;

packages/amplify-category-auth/package.json

@@ -13,14 +13,18 @@
     "test-ci": "jest --ci -i"
   },
   "dependencies": {
+    "amplify-category-function": "^1.4.1",
+    "aws-sdk": "^2.475.0",
     "chalk": "^2.4.1",
-    "chalk-pipe": "^1.2.0",
+    "chalk-pipe": "^2.0.0",
     "eslint": "^4.19.1",
     "fs-extra": "^7.0.0",
     "inquirer": "6.3.1",
     "jest": "^23.5.0",
     "lodash": "^4.17.10",
+    "mime-types": "^2.1.24",
     "opn": "^5.3.0",
+    "ora": "^3.4.0",
     "promise-sequential": "^1.1.1",
     "uuid": "^2.0.3"
   },

packages/amplify-category-auth/provider-utils/awscloudformation/assets/cognito-defaults.js

@@ -29,20 +29,19 @@ const roles = {
 
 const generalDefaults = projectName => ({
   resourceName: `${projectName}${sharedId}`,
+  resourceNameTruncated: `${projectName.substring(0, 6)}${sharedId}`,
   authSelections: 'identityPoolAndUserPool',
   ...roles,
 });
 
 const userPoolDefaults = (projectName) => {
   const projectNameTruncated = `${projectName.substring(0, 6)}${sharedId}`;
   return ({
+    resourceNameTruncated: `${projectName.substring(0, 6)}${sharedId}`,
     userPoolName: `${projectName}_userpool_${sharedId}`,
     autoVerifiedAttributes: ['email'],
     mfaConfiguration: 'OFF',
     mfaTypes: ['SMS Text Message'],
-    roleName: `${projectNameTruncated}_sns-role`,
-    roleExternalId: `${projectNameTruncated}_role_external_id`,
-    policyName: `${projectNameTruncated}-sns-policy`,
     smsAuthenticationMessage: 'Your authentication code is {####}',
     smsVerificationMessage: 'Your verification code is {####}',
     emailVerificationSubject: 'Your verification code',
@@ -58,12 +57,7 @@ const userPoolDefaults = (projectName) => {
     userpoolClientWriteAttributes: ['email'],
     userpoolClientReadAttributes: ['email'],
     mfaLambdaRole: `${projectNameTruncated}_totp_lambda_role`,
-    mfaLambdaLogPolicy: `${projectNameTruncated}_totp_lambda_log_policy`,
-    mfaPassRolePolicy: `${projectNameTruncated}_totp_pass_role_policy`,
-    mfaLambdaIAMPolicy: `${projectNameTruncated}_totp_lambda_iam_policy`,
     userpoolClientLambdaRole: `${projectNameTruncated}_userpoolclient_lambda_role`,
-    userpoolClientLogPolicy: `${projectNameTruncated}_userpoolclient_lambda_log_policy`,
-    userpoolClientLambdaPolicy: `${projectNameTruncated}_userpoolclient_lambda_iam_policy`,
     userpoolClientSetAttributes: false,
   });
 };
@@ -76,15 +70,11 @@ const withSocialDefaults = projectName => ({
 });
 
 const identityPoolDefaults = (projectName) => {
-  const projectNameTruncated = `${projectName.substring(0, 6)}_${sharedId}`;
+  const projectNameTruncated = `${projectName.substring(0, 6)}${sharedId}`;
   return ({
     identityPoolName: `${projectName}_identitypool_${sharedId}`,
     allowUnauthenticatedIdentities: booleanOptions.find(b => b.value === false).value,
-    lambdaLogPolicy: `${projectNameTruncated}_lambda_log_policy`,
     openIdLambdaRoleName: `${projectNameTruncated}_openid_lambda_role`,
-    openIdRolePolicy: `${projectNameTruncated}_openid_pass_role_policy`,
-    openIdLambdaIAMPolicy: `${projectNameTruncated}_openid_lambda_iam_policy`,
-    openIdLogPolicy: `${projectNameTruncated}_openid_lambda_log_policy`,
   });
 };
 

packages/amplify-category-auth/provider-utils/awscloudformation/assets/string-maps.js

@@ -461,6 +461,66 @@ const oAuthScopes = [
   },
 ];
 
+const capabilities = [
+  {
+    name: 'Add Google reCaptcha Challenge',
+    value: 'mfaWithCaptcha',
+    triggers: {
+      DefineAuthChallenge: ['captcha-define-challenge'],
+      CreateAuthChallenge: ['captcha-create-challenge'],
+      VerifyAuthChallengeResponse: ['captcha-verify'],
+    },
+  },
+  {
+    name: 'Email Verification Link with Redirect',
+    value: 'confirmationRedirect',
+    triggers: {
+      CustomMessage: ['verification-link'],
+    },
+  },
+  {
+    name: 'Add User to Group',
+    value: 'addUserToGroup',
+    triggers: {
+      PostConfirmation: ['add-to-group'],
+    },
+  },
+  {
+    name: 'Email Domain Filtering (blacklist)',
+    value: 'emailBlacklist',
+    triggers: {
+      PreSignup: ['email-filter-blacklist'],
+    },
+  },
+  {
+    name: 'Email Domain Filtering (whitelist)',
+    value: 'emailWhitelist',
+    triggers: {
+      PreSignup: ['email-filter-whitelist'],
+    },
+  },
+  {
+    name: 'Custom Auth Challenge Flow (basic scaffolding - not for production)',
+    value: 'customAuthScaffolding',
+    triggers: {
+      DefineAuthChallenge: ['boilerplate-define-challenge'],
+      CreateAuthChallenge: ['boilerplate-create-challenge'],
+      VerifyAuthChallengeResponse: ['boilerplate-verify'],
+    },
+  },
+];
+
+const additonalConfigMap = [
+  {
+    name: 'No, I am done.',
+    value: [],
+  },
+  {
+    name: 'Yes, I want to make some additional changes.',
+    value: ['requiredAttributes', 'triggers'],
+  },
+];
+
 const disableOptionsOnEdit = () => {
   mfaOptions.find(i => i.value === 'ON').disabled = true;
 };
@@ -487,6 +547,8 @@ const getAllMaps = ((edit) => {
     authorizeScopes,
     attributeProviderMap,
     updateFlowMap,
+    capabilities,
+    additonalConfigMap,
   };
 });
 
@@ -510,4 +572,6 @@ module.exports = {
   messages,
   attributeProviderMap,
   updateFlowMap,
+  capabilities,
+  additonalConfigMap,
 };