quidproquo-deploy-awscdk 0.0.87 → 0.0.89

package/lib/constructs/feature/core/auth/QpqCoreUserDirectoryConstruct.js

@@ -24,11 +24,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QpqCoreUserDirectoryConstruct = exports.QpqCoreUserDirectoryConstructBase = void 0;
+const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_actionprocessor_awslambda_1 = require("quidproquo-actionprocessor-awslambda");
 const QpqConstructBlock_1 = require("../../../base/QpqConstructBlock");
 const aws_cdk_lib_1 = require("aws-cdk-lib");
 const cdk = __importStar(require("aws-cdk-lib"));
 const qpqDeployAwsCdkUtils = __importStar(require("../../../../utils"));
+const Function_1 = require("../../../basic/Function");
 class QpqCoreUserDirectoryConstructBase extends QpqConstructBlock_1.QpqConstructBlock {
     grantRead(grantee) {
         this.userPool.grant(grantee, 'cognito-idp:ListUsers', 'cognito-idp:GetUser', 'cognito-idp:ListGroups', 'cognito-idp:GetGroup', 'cognito-idp:ListUserPools', 'cognito-idp:DescribeUserPool', 'cognito-idp:DescribeUserPoolClient');
@@ -55,7 +57,7 @@ class QpqCoreUserDirectoryConstruct extends QpqCoreUserDirectoryConstructBase {
     }
     constructor(scope, id, props) {
         super(scope, id, props);
-        this.userPool = new aws_cdk_lib_1.aws_cognito.UserPool(this, 'user-pool', {
+        const userPool = new aws_cdk_lib_1.aws_cognito.UserPool(this, 'user-pool', {
             removalPolicy: cdk.RemovalPolicy.DESTROY,
             userPoolName: this.resourceName(props.userDirectoryConfig.name),
             selfSignUpEnabled: props.userDirectoryConfig.selfSignUpEnabled,
@@ -74,6 +76,27 @@ class QpqCoreUserDirectoryConstruct extends QpqCoreUserDirectoryConstructBase {
                 phone: props.userDirectoryConfig.phoneRequired,
             },
         });
+        this.userPool = userPool;
+        // const lambdaFunction = new aws_lambda.Function(this, 'csm-msg-trigger', {
+        //   functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'csm-msg'),
+        //   timeout: cdk.Duration.seconds(25),
+        //   runtime: aws_lambda.Runtime.NODEJS_18_X,
+        //   memorySize: 256,
+        //   code: aws_lambda.Code.fromAsset(path.join(__dirname, '../../../../lambdas')),
+        //   handler: `lambdaCognitoTriggerEvent_CustomMessage.executeCognitoTriggerEvent`,
+        // });
+        const customMessageTrigger = new Function_1.Function(this, 'csm-msg-trigger-func', {
+            buildPath: quidproquo_core_1.qpqCoreUtils.getUserDirectoryEntryFullPath(props.qpqConfig, props.userDirectoryConfig),
+            functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cm-trig'),
+            functionType: 'lambdaCognitoTriggerEvent_CustomMessage',
+            executorName: 'executeCognitoTriggerEvent',
+            qpqConfig: props.qpqConfig,
+            environment: {
+                userDirectoryName: props.userDirectoryConfig.name,
+            },
+            awsAccountId: props.awsAccountId,
+        });
+        userPool.addTrigger(aws_cdk_lib_1.aws_cognito.UserPoolOperation.CUSTOM_MESSAGE, customMessageTrigger.lambdaFunction);
         qpqDeployAwsCdkUtils.exportStackValue(this, quidproquo_actionprocessor_awslambda_1.awsNamingUtils.getCFExportNameUserPoolIdFromConfig(props.userDirectoryConfig.name, props.qpqConfig), this.userPool.userPoolId);
         const userPoolClient = new aws_cdk_lib_1.aws_cognito.UserPoolClient(this, 'user-pool-client', {
             userPoolClientName: this.qpqResourceName(props.userDirectoryConfig.name, 'upc'),

package/lib/lambdas/lambdaCognitoTriggerEvent_CustomMessage.d.ts

@@ -0,0 +1,11 @@
+import { CustomMessageTriggerEvent, Context } from 'aws-lambda';
+import { EmailTemplates } from 'quidproquo-core';
+export interface EmailPayload {
+    username: string;
+    code: string;
+    userAttributes: Record<string, string>;
+    baseDomain: string;
+}
+export declare const renderTemplate: (template: string, data: EmailPayload) => Promise<any>;
+export declare const getTemplates: () => EmailTemplates;
+export declare const executeCognitoTriggerEvent: (event: CustomMessageTriggerEvent, context: Context) => Promise<CustomMessageTriggerEvent>;

package/lib/lambdas/lambdaCognitoTriggerEvent_CustomMessage.js

@@ -0,0 +1,53 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.executeCognitoTriggerEvent = exports.getTemplates = exports.renderTemplate = void 0;
+const liquidjs_1 = require("liquidjs");
+// @ts-ignore - Special webpack loader
+const qpq_user_directory_email_templates_1 = __importDefault(require("qpq-user-directory-email-templates!"));
+const renderTemplate = (template, data) => __awaiter(void 0, void 0, void 0, function* () {
+    const engine = new liquidjs_1.Liquid();
+    const output = yield engine.parseAndRender(template, data);
+    return output;
+});
+exports.renderTemplate = renderTemplate;
+const getTemplates = () => {
+    const emailTemplates = qpq_user_directory_email_templates_1.default;
+    const templates = emailTemplates[process.env.userDirectoryName];
+    return templates;
+};
+exports.getTemplates = getTemplates;
+const executeCognitoTriggerEvent = (event, context) => __awaiter(void 0, void 0, void 0, function* () {
+    console.log(`executeCognitoTriggerEvent: Started [${event.triggerSource}]`, JSON.stringify(event, null, 2));
+    const params = {
+        baseDomain: 'joecoady.development.kitted.app',
+        code: event.request.codeParameter,
+        userAttributes: event.request.userAttributes,
+        username: event.userName,
+    };
+    const templates = (0, exports.getTemplates)();
+    switch (event.triggerSource) {
+        case 'CustomMessage_ForgotPassword':
+            event.response.emailMessage = yield (0, exports.renderTemplate)(templates.resetPassword.body, params);
+            event.response.emailSubject = yield (0, exports.renderTemplate)(templates.resetPassword.subject, params);
+            break;
+        case 'CustomMessage_VerifyUserAttribute':
+            event.response.emailMessage = yield (0, exports.renderTemplate)(templates.verifyEmail.body, params);
+            event.response.emailSubject = yield (0, exports.renderTemplate)(templates.verifyEmail.subject, params);
+            break;
+    }
+    console.log('executeCognitoTriggerEvent: Ended');
+    return event;
+});
+exports.executeCognitoTriggerEvent = executeCognitoTriggerEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-deploy-awscdk",
-  "version": "0.0.87",
+  "version": "0.0.89",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",
@@ -26,10 +26,11 @@
   },
   "homepage": "https://github.com/joe-coady/quidproquo#readme",
   "dependencies": {
-    "aws-cdk-lib": "^2.58.1",
     "aws-cdk": "^2.58.1",
+    "aws-cdk-lib": "^2.58.1",
     "constructs": "^10.1.208",
     "esbuild": "^0.15.16",
+    "liquidjs": "^10.7.0",
     "quidproquo-actionprocessor-awslambda": "*",
     "quidproquo-actionprocessor-node": "*",
     "quidproquo-core": "*",
@@ -40,8 +41,8 @@
     "@types/babel__traverse": "7.18.2",
     "@types/node": "^10.17.60",
     "@types/prettier": "2.6.0",
-    "ts-node": "^10.9.1",
     "quidproquo-tsconfig": "*",
+    "ts-node": "^10.9.1",
     "typescript": "^4.9.3"
   }
 }

package/src/constructs/feature/core/auth/QpqCoreUserDirectoryConstruct.ts

@@ -1,15 +1,19 @@
-import { QPQConfig, UserDirectoryQPQConfigSetting } from 'quidproquo-core';
+import * as path from 'path';
+
+import { QPQConfig, UserDirectoryQPQConfigSetting, qpqCoreUtils } from 'quidproquo-core';
 import { awsNamingUtils } from 'quidproquo-actionprocessor-awslambda';
 
 import { QpqConstructBlock, QpqConstructBlockProps } from '../../../base/QpqConstructBlock';
 import { QpqResource } from '../../../base/QpqResource';
 
 import { Construct } from 'constructs';
-import { aws_iam, aws_cognito } from 'aws-cdk-lib';
+import { aws_iam, aws_cognito, aws_lambda } from 'aws-cdk-lib';
 import * as cdk from 'aws-cdk-lib';
 
 import * as qpqDeployAwsCdkUtils from '../../../../utils';
 
+import { Function } from '../../../basic/Function';
+
 export interface QpqCoreUserDirectoryConstructProps extends QpqConstructBlockProps {
   userDirectoryConfig: UserDirectoryQPQConfigSetting;
 }
@@ -86,7 +90,7 @@ export class QpqCoreUserDirectoryConstruct extends QpqCoreUserDirectoryConstruct
   constructor(scope: Construct, id: string, props: QpqCoreUserDirectoryConstructProps) {
     super(scope, id, props);
 
-    this.userPool = new aws_cognito.UserPool(this, 'user-pool', {
+    const userPool = new aws_cognito.UserPool(this, 'user-pool', {
       removalPolicy: cdk.RemovalPolicy.DESTROY,
       userPoolName: this.resourceName(props.userDirectoryConfig.name),
       selfSignUpEnabled: props.userDirectoryConfig.selfSignUpEnabled,
@@ -106,6 +110,42 @@ export class QpqCoreUserDirectoryConstruct extends QpqCoreUserDirectoryConstruct
       },
     });
 
+    this.userPool = userPool;
+
+    // const lambdaFunction = new aws_lambda.Function(this, 'csm-msg-trigger', {
+    //   functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'csm-msg'),
+    //   timeout: cdk.Duration.seconds(25),
+
+    //   runtime: aws_lambda.Runtime.NODEJS_18_X,
+    //   memorySize: 256,
+
+    //   code: aws_lambda.Code.fromAsset(path.join(__dirname, '../../../../lambdas')),
+    //   handler: `lambdaCognitoTriggerEvent_CustomMessage.executeCognitoTriggerEvent`,
+    // });
+
+    const customMessageTrigger = new Function(this, 'csm-msg-trigger-func', {
+      buildPath: qpqCoreUtils.getUserDirectoryEntryFullPath(
+        props.qpqConfig,
+        props.userDirectoryConfig,
+      ),
+      functionName: this.qpqResourceName(`${props.userDirectoryConfig.name}`, 'cm-trig'),
+      functionType: 'lambdaCognitoTriggerEvent_CustomMessage',
+      executorName: 'executeCognitoTriggerEvent',
+
+      qpqConfig: props.qpqConfig,
+
+      environment: {
+        userDirectoryName: props.userDirectoryConfig.name,
+      },
+
+      awsAccountId: props.awsAccountId,
+    });
+
+    userPool.addTrigger(
+      aws_cognito.UserPoolOperation.CUSTOM_MESSAGE,
+      customMessageTrigger.lambdaFunction,
+    );
+
     qpqDeployAwsCdkUtils.exportStackValue(
       this,
       awsNamingUtils.getCFExportNameUserPoolIdFromConfig(

package/src/lambdas/lambdaCognitoTriggerEvent_CustomMessage.ts

@@ -0,0 +1,65 @@
+import { CustomMessageTriggerEvent, Context } from 'aws-lambda';
+import { Liquid } from 'liquidjs';
+
+import { EmailTemplates } from 'quidproquo-core';
+
+// @ts-ignore - Special webpack loader
+import qpqEmailTemplates from 'qpq-user-directory-email-templates!';
+
+export interface EmailPayload {
+  username: string;
+  code: string;
+
+  userAttributes: Record<string, string>;
+  baseDomain: string;
+}
+
+export const renderTemplate = async (template: string, data: EmailPayload) => {
+  const engine = new Liquid();
+
+  const output = await engine.parseAndRender(template, data);
+
+  return output;
+};
+
+export const getTemplates = (): EmailTemplates => {
+  const emailTemplates: Record<string, EmailTemplates> = qpqEmailTemplates;
+  const templates = emailTemplates[process.env.userDirectoryName!];
+
+  return templates;
+};
+
+export const executeCognitoTriggerEvent = async (
+  event: CustomMessageTriggerEvent,
+  context: Context,
+) => {
+  console.log(
+    `executeCognitoTriggerEvent: Started [${event.triggerSource}]`,
+    JSON.stringify(event, null, 2),
+  );
+
+  const params = {
+    baseDomain: 'joecoady.development.kitted.app',
+    code: event.request.codeParameter,
+    userAttributes: event.request.userAttributes,
+    username: event.userName,
+  };
+
+  const templates = getTemplates();
+
+  switch (event.triggerSource) {
+    case 'CustomMessage_ForgotPassword':
+      event.response.emailMessage = await renderTemplate(templates.resetPassword!.body, params);
+      event.response.emailSubject = await renderTemplate(templates.resetPassword!.subject, params);
+      break;
+
+    case 'CustomMessage_VerifyUserAttribute':
+      event.response.emailMessage = await renderTemplate(templates.verifyEmail!.body, params);
+      event.response.emailSubject = await renderTemplate(templates.verifyEmail!.subject, params);
+      break;
+  }
+
+  console.log('executeCognitoTriggerEvent: Ended');
+
+  return event;
+};