quidproquo-actionprocessor-awslambda 0.0.219 → 0.0.221

package/lib/commonjs/awsLambdaUtils.js

@@ -9,6 +9,7 @@ const randomGuid = () => {
 };
 exports.randomGuid = randomGuid;
 const matchUrl = (path, url) => {
+    console.log('Matching: ', path);
     // /attempt/{attemptUuid}/result/{test} => /attempt/:attemptUuid/result/:test
     const modifiedPath = path.replaceAll(/{(.+?)}/g, (m, g) => `:${g}`);
     const matchResult = (0, node_match_path_1.match)(modifiedPath, url);
@@ -21,21 +22,21 @@ exports.matchUrl = matchUrl;
 const getS3BucketStorageClassFromStorageDriveTier = (driveTier) => {
     switch (driveTier) {
         case quidproquo_core_1.StorageDriveTier.REGULAR:
-            return "STANDARD";
+            return 'STANDARD';
         case quidproquo_core_1.StorageDriveTier.OCCASIONAL_ACCESS:
-            return "STANDARD_IA";
+            return 'STANDARD_IA';
         case quidproquo_core_1.StorageDriveTier.SINGLE_ZONE_OCCASIONAL_ACCESS:
-            return "ONEZONE_IA";
+            return 'ONEZONE_IA';
         case quidproquo_core_1.StorageDriveTier.COLD_STORAGE:
-            return "GLACIER";
+            return 'GLACIER';
         case quidproquo_core_1.StorageDriveTier.COLD_STORAGE_INSTANT_ACCESS:
-            return "GLACIER_IR";
+            return 'GLACIER_IR';
         case quidproquo_core_1.StorageDriveTier.DEEP_COLD_STORAGE:
-            return "DEEP_ARCHIVE";
+            return 'DEEP_ARCHIVE';
         case quidproquo_core_1.StorageDriveTier.SMART_TIERING:
-            return "INTELLIGENT_TIERING";
+            return 'INTELLIGENT_TIERING';
         default:
-            return "INTELLIGENT_TIERING";
+            return 'INTELLIGENT_TIERING';
     }
 };
 exports.getS3BucketStorageClassFromStorageDriveTier = getS3BucketStorageClassFromStorageDriveTier;

package/lib/commonjs/getActionProcessor/core/event/apiGatwayEvent/api/matchStory.js

@@ -30,7 +30,6 @@ const getProcessMatchStory = (qpqConfig) => {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `route not found [${qpqEventRecord.path}] - [${quidproquo_webserver_1.qpqWebServerUtils.getHeaderValue('user-agent', qpqEventRecord.headers)}]`);
         }
         return (0, quidproquo_core_1.actionResult)({
-            src: matchedRoute.route.src,
             runtime: matchedRoute.route.runtime,
             runtimeOptions: matchedRoute.match.params || {},
             // TODO: Make this aware of the API that we are eventing

package/lib/commonjs/getActionProcessor/core/event/apiGatwayEvent/websocket/matchStory.js

@@ -18,18 +18,15 @@ const getProcessMatchStory = (qpqConfig) => {
         switch (qpqEventRecord.eventType) {
             case quidproquo_webserver_1.WebSocketEventType.Connect:
                 return (0, quidproquo_core_1.actionResult)({
-                    src: userDirectoryConfig.eventProcessors.onConnect.src,
-                    runtime: userDirectoryConfig.eventProcessors.onConnect.runtime,
+                    runtime: userDirectoryConfig.eventProcessors.onConnect,
                 });
             case quidproquo_webserver_1.WebSocketEventType.Disconnect:
                 return (0, quidproquo_core_1.actionResult)({
-                    src: userDirectoryConfig.eventProcessors.onDisconnect.src,
-                    runtime: userDirectoryConfig.eventProcessors.onDisconnect.runtime,
+                    runtime: userDirectoryConfig.eventProcessors.onDisconnect,
                 });
             case quidproquo_webserver_1.WebSocketEventType.Message:
                 return (0, quidproquo_core_1.actionResult)({
-                    src: userDirectoryConfig.eventProcessors.onMessage.src,
-                    runtime: userDirectoryConfig.eventProcessors.onMessage.runtime,
+                    runtime: userDirectoryConfig.eventProcessors.onMessage,
                 });
             default:
                 return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Websocket lambda not implemented for ${qpqEventRecord.eventType}`);

package/lib/commonjs/getActionProcessor/core/event/cloudFrontOriginRequest/matchStory.js

@@ -29,7 +29,6 @@ const getProcessMatchStory = (qpqConfig) => {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `seo not found [${qpqEventRecord.path}]`);
         }
         return (0, quidproquo_core_1.actionResult)({
-            src: matchedSeoConfig.route.src,
             runtime: matchedSeoConfig.route.runtime,
             runtimeOptions: matchedSeoConfig.match.params || {},
             config: matchedSeoConfig.route,

package/lib/commonjs/getActionProcessor/core/event/cognito/createAuthChallenge/getRecords.js

@@ -11,12 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
 const cognitoAttributeMap_1 = require("../../../../../logic/cognito/cognitoAttributeMap");
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 const getProcessGetRecords = (qpqConfig) => {
     return ({ eventParams: [event, context] }) => __awaiter(void 0, void 0, void 0, function* () {
         const internalEventRecord = {
             userName: event.userName,
-            session: (0, utils_1.getChallengeSessionFromCognitoCreateAuthChallengeTriggerEvent)(event),
+            session: (0, utils_1.getChallengeSessionFromCognitoTriggerEventSession)(event.request.session),
             userAttributes: (0, cognitoAttributeMap_1.getQpqAttributesFromCognitoStringMap)(event.request.userAttributes),
         };
         return (0, quidproquo_core_1.actionResult)([internalEventRecord]);

package/lib/commonjs/getActionProcessor/core/event/cognito/createAuthChallenge/matchStory.js

@@ -16,13 +16,12 @@ const GLOBAL_USER_DIRECTORY_NAME = process.env.userDirectoryName;
 const getProcessMatchStory = (qpqConfig) => {
     const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectories(qpqConfig).find((ud) => ud.name === GLOBAL_USER_DIRECTORY_NAME);
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        if (!((_b = (_a = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.customAuthRuntime) === null || _a === void 0 ? void 0 : _a.createAuthChallenge) === null || _b === void 0 ? void 0 : _b.src)) {
-            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Missing customAuthRuntime.createAuthChallenge.src in [${GLOBAL_USER_DIRECTORY_NAME}]`);
+        var _a;
+        if (!((_a = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.customAuthRuntime) === null || _a === void 0 ? void 0 : _a.createAuthChallenge)) {
+            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Missing customAuthRuntime.createAuthChallenge in [${GLOBAL_USER_DIRECTORY_NAME}]`);
         }
         return (0, quidproquo_core_2.actionResult)({
-            src: userDirectoryConfig.customAuthRuntime.createAuthChallenge.src,
-            runtime: userDirectoryConfig.customAuthRuntime.createAuthChallenge.runtime,
+            runtime: userDirectoryConfig.customAuthRuntime.createAuthChallenge,
         });
     });
 };

package/lib/commonjs/getActionProcessor/core/event/cognito/customMessage/autoRespond.js

@@ -15,21 +15,20 @@ const quidproquo_webserver_1 = require("quidproquo-webserver");
 const getProcessAutoRespond = (qpqConfig) => {
     const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectories(qpqConfig).find((ud) => ud.name === types_1.GLOBAL_USER_DIRECTORY_NAME);
     return ({ qpqEventRecord, matchResult }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
         const getErrorResult = () => (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Email lambda not implemented for ${qpqEventRecord.eventType}`);
         switch (qpqEventRecord.eventType) {
             case quidproquo_webserver_1.EmailSendEventType.ResetPassword:
-                if (!((_a = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPassword) === null || _a === void 0 ? void 0 : _a.src) || !((_b = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPassword) === null || _b === void 0 ? void 0 : _b.runtime)) {
+                if (!(userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPassword)) {
                     return getErrorResult();
                 }
                 break;
             case quidproquo_webserver_1.EmailSendEventType.ResetPasswordAdmin:
-                if (!((_c = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPasswordAdmin) === null || _c === void 0 ? void 0 : _c.src) || !((_d = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPasswordAdmin) === null || _d === void 0 ? void 0 : _d.runtime)) {
+                if (!(userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPasswordAdmin)) {
                     return getErrorResult();
                 }
                 break;
             case quidproquo_webserver_1.EmailSendEventType.VerifyEmail:
-                if (!((_e = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.verifyEmail) === null || _e === void 0 ? void 0 : _e.src) || !((_f = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.verifyEmail) === null || _f === void 0 ? void 0 : _f.runtime)) {
+                if (!(userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.verifyEmail)) {
                     return getErrorResult();
                 }
                 break;

package/lib/commonjs/getActionProcessor/core/event/cognito/customMessage/matchStory.js

@@ -16,22 +16,18 @@ const GLOBAL_USER_DIRECTORY_NAME = process.env.userDirectoryName;
 const getProcessMatchStory = (qpqConfig) => {
     const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectories(qpqConfig).find((ud) => ud.name === GLOBAL_USER_DIRECTORY_NAME);
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
         switch (qpqEventRecord.eventType) {
             case quidproquo_webserver_1.EmailSendEventType.ResetPassword:
                 return (0, quidproquo_core_1.actionResult)({
-                    src: (_a = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPassword) === null || _a === void 0 ? void 0 : _a.src,
-                    runtime: (_b = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPassword) === null || _b === void 0 ? void 0 : _b.runtime,
+                    runtime: userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPassword,
                 });
             case quidproquo_webserver_1.EmailSendEventType.ResetPasswordAdmin:
                 return (0, quidproquo_core_1.actionResult)({
-                    src: (_c = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPasswordAdmin) === null || _c === void 0 ? void 0 : _c.src,
-                    runtime: (_d = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPasswordAdmin) === null || _d === void 0 ? void 0 : _d.runtime,
+                    runtime: userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.resetPasswordAdmin,
                 });
             case quidproquo_webserver_1.EmailSendEventType.VerifyEmail:
                 return (0, quidproquo_core_1.actionResult)({
-                    src: (_e = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.verifyEmail) === null || _e === void 0 ? void 0 : _e.src,
-                    runtime: (_f = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.verifyEmail) === null || _f === void 0 ? void 0 : _f.runtime,
+                    runtime: userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.emailTemplates.verifyEmail,
                 });
             default:
                 return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Email lambda not implemented for ${qpqEventRecord.eventType}`);

package/lib/commonjs/getActionProcessor/core/event/cognito/defineAuthChallenge/getRecords.js

@@ -10,9 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
+const cognitoAttributeMap_1 = require("../../../../../logic/cognito/cognitoAttributeMap");
+const utils_1 = require("../utils");
 const getProcessGetRecords = (qpqConfig) => {
-    return ({ eventParams: [customMessageTriggerEvent, context] }) => __awaiter(void 0, void 0, void 0, function* () {
-        const internalEventRecord = {};
+    return ({ eventParams: [event, context] }) => __awaiter(void 0, void 0, void 0, function* () {
+        const internalEventRecord = {
+            userName: event.userName,
+            session: (0, utils_1.getChallengeSessionFromCognitoTriggerEventSession)(event.request.session),
+            userAttributes: (0, cognitoAttributeMap_1.getQpqAttributesFromCognitoStringMap)(event.request.userAttributes),
+        };
         return (0, quidproquo_core_1.actionResult)([internalEventRecord]);
     });
 };

package/lib/commonjs/getActionProcessor/core/event/cognito/defineAuthChallenge/matchStory.js

@@ -17,12 +17,11 @@ const getProcessMatchStory = (qpqConfig) => {
     const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectories(qpqConfig).find((ud) => ud.name === GLOBAL_USER_DIRECTORY_NAME);
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        if (!userDirectoryConfig || !((_a = userDirectoryConfig.customAuthRuntime) === null || _a === void 0 ? void 0 : _a.defineAuthChallenge.src)) {
-            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Missing customAuthRuntime.defineAuthChallenge.src in [${GLOBAL_USER_DIRECTORY_NAME}]`);
+        if (!userDirectoryConfig || !((_a = userDirectoryConfig.customAuthRuntime) === null || _a === void 0 ? void 0 : _a.defineAuthChallenge)) {
+            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Missing customAuthRuntime.defineAuthChallenge in [${GLOBAL_USER_DIRECTORY_NAME}]`);
         }
         return (0, quidproquo_core_2.actionResult)({
-            src: userDirectoryConfig.customAuthRuntime.defineAuthChallenge.src,
-            runtime: userDirectoryConfig.customAuthRuntime.defineAuthChallenge.runtime,
+            runtime: userDirectoryConfig.customAuthRuntime.defineAuthChallenge,
         });
     });
 };

package/lib/commonjs/getActionProcessor/core/event/cognito/utils/getChallengeSessionFromCognitoTriggerEventSession.d.ts

@@ -0,0 +1,3 @@
+import { DefineAuthChallengeTriggerEvent } from 'aws-lambda';
+import { ChallengeSession } from 'quidproquo-core';
+export declare const getChallengeSessionFromCognitoTriggerEventSession: (session: DefineAuthChallengeTriggerEvent['request']['session']) => ChallengeSession;

package/lib/commonjs/getActionProcessor/core/event/cognito/utils/getChallengeSessionFromCognitoTriggerEventSession.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getChallengeSessionFromCognitoTriggerEventSession = void 0;
+const getChallengeSessionFromCognitoTriggerEventSession = (session) => {
+    const challengeSession = session.map((c) => {
+        const result = {
+            challengeName: c.challengeMetadata || '',
+            challengeResult: c.challengeResult,
+        };
+        return result;
+    });
+    return challengeSession;
+};
+exports.getChallengeSessionFromCognitoTriggerEventSession = getChallengeSessionFromCognitoTriggerEventSession;

package/lib/commonjs/getActionProcessor/core/event/cognito/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './getChallengeSessionFromCognitoTriggerEventSession';

package/lib/commonjs/getActionProcessor/core/event/cognito/{verifyAuthChallenge/utils → utils}/index.js

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./getChallengeSessionFromCognitoCreateAuthChallengeTriggerEvent"), exports);
+__exportStar(require("./getChallengeSessionFromCognitoTriggerEventSession"), exports);

package/lib/commonjs/getActionProcessor/core/event/cognito/verifyAuthChallenge/getRecords.js

@@ -14,7 +14,7 @@ const cognitoAttributeMap_1 = require("../../../../../logic/cognito/cognitoAttri
 const getProcessGetRecords = (qpqConfig) => {
     return ({ eventParams: [event, context] }) => __awaiter(void 0, void 0, void 0, function* () {
         const internalEventRecord = {
-            challengeAnswer: event.request.challengeAnswer,
+            challengeAnswer: event.request.challengeAnswer ? JSON.parse(event.request.challengeAnswer) : {},
             userAttributes: (0, cognitoAttributeMap_1.getQpqAttributesFromCognitoStringMap)(event.request.userAttributes),
             userNotFound: event.request.userNotFound,
             privateChallengeParameters: event.request.privateChallengeParameters,

package/lib/commonjs/getActionProcessor/core/event/cognito/verifyAuthChallenge/matchStory.js

@@ -16,13 +16,12 @@ const GLOBAL_USER_DIRECTORY_NAME = process.env.userDirectoryName;
 const getProcessMatchStory = (qpqConfig) => {
     const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectories(qpqConfig).find((ud) => ud.name === GLOBAL_USER_DIRECTORY_NAME);
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        if (!((_b = (_a = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.customAuthRuntime) === null || _a === void 0 ? void 0 : _a.verifyAuthChallenge) === null || _b === void 0 ? void 0 : _b.src)) {
-            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Missing customAuthRuntime.verifyAuthChallenge.src in [${GLOBAL_USER_DIRECTORY_NAME}]`);
+        var _a;
+        if (!((_a = userDirectoryConfig === null || userDirectoryConfig === void 0 ? void 0 : userDirectoryConfig.customAuthRuntime) === null || _a === void 0 ? void 0 : _a.verifyAuthChallenge)) {
+            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Missing customAuthRuntime.verifyAuthChallenge in [${GLOBAL_USER_DIRECTORY_NAME}]`);
         }
         return (0, quidproquo_core_2.actionResult)({
-            src: userDirectoryConfig.customAuthRuntime.verifyAuthChallenge.src,
-            runtime: userDirectoryConfig.customAuthRuntime.verifyAuthChallenge.runtime,
+            runtime: userDirectoryConfig.customAuthRuntime.verifyAuthChallenge,
         });
     });
 };

package/lib/commonjs/getActionProcessor/core/event/eventBridgeEvent/deployStack/matchStory.js

@@ -19,8 +19,7 @@ const getProcessMatchStory = (qpqConfig) => {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Could not find deploy event config ${GLOBAL_DEPLOY_EVENT_NAME}`);
         }
         return (0, quidproquo_core_1.actionResult)({
-            src: deployConfig.src.src,
-            runtime: deployConfig.src.runtime,
+            runtime: deployConfig.runtime,
         });
     });
 };

package/lib/commonjs/getActionProcessor/core/event/eventBridgeEvent/recurringSchedule/matchStory.js

@@ -15,7 +15,6 @@ const lambdaRuntimeConfig = JSON.parse(process.env.lambdaRuntimeConfig || '{}');
 const getProcessMatchStory = (qpqConfig) => {
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
         return (0, quidproquo_core_1.actionResult)({
-            src: lambdaRuntimeConfig.src,
             runtime: lambdaRuntimeConfig.runtime,
             runtimeOptions: {},
         });

package/lib/commonjs/getActionProcessor/core/event/lambda/serviceFunction/matchStory.js

@@ -20,7 +20,6 @@ const getProcessMatchStory = (qpqConfig) => {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `service function not found [${qpqEventRecord.functionName}]`);
         }
         return (0, quidproquo_core_1.actionResult)({
-            src: matchedRoute.src,
             runtime: matchedRoute.runtime,
         });
     });

package/lib/commonjs/getActionProcessor/core/event/s3/fileEvent/matchStory.js

@@ -13,7 +13,9 @@ const quidproquo_core_1 = require("quidproquo-core");
 const types_1 = require("./types");
 const getProcessMatchStory = (qpqConfig) => {
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
-        return (0, quidproquo_core_1.actionResult)(types_1.GLOBAL_STORAGE_DRIVE_RUNTIME);
+        return (0, quidproquo_core_1.actionResult)({
+            runtime: types_1.GLOBAL_STORAGE_DRIVE_RUNTIME,
+        });
     });
 };
 exports.default = (qpqConfig) => {

package/lib/commonjs/getActionProcessor/core/event/s3/fileEvent/types.d.ts

@@ -1,8 +1,8 @@
 import { StorageDriveEvent, StorageDriveEventResponse } from 'quidproquo-webserver';
 import { S3Event, Context } from 'aws-lambda';
-import { MatchStoryResult, QpqSourceEntry } from 'quidproquo-core';
+import { MatchStoryResult, QpqFunctionRuntime } from 'quidproquo-core';
 export declare const GLOBAL_STORAGE_DRIVE_NAME: string;
-export declare const GLOBAL_STORAGE_DRIVE_RUNTIME: QpqSourceEntry;
+export declare const GLOBAL_STORAGE_DRIVE_RUNTIME: QpqFunctionRuntime;
 export type EventInput = [S3Event, Context];
 export type EventOutput = void;
 export type InternalEventRecord = StorageDriveEvent;

package/lib/commonjs/getActionProcessor/core/event/s3/fileEvent/types.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GLOBAL_STORAGE_DRIVE_RUNTIME = exports.GLOBAL_STORAGE_DRIVE_NAME = void 0;
 // Customs
 exports.GLOBAL_STORAGE_DRIVE_NAME = process.env.storageDriveName;
-exports.GLOBAL_STORAGE_DRIVE_RUNTIME = JSON.parse(process.env.storageDriveEntry || '{}');
+// TODO: Get this from the storageDriveConfig.
+exports.GLOBAL_STORAGE_DRIVE_RUNTIME = JSON.parse(process.env.storageDriveEntry || '"/::"');

package/lib/commonjs/getActionProcessor/core/event/sqs/queue/autoRespond.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
 const getProcessAutoRespond = (qpqConfig) => {
-    return ({ qpqEventRecord, matchResult }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ matchResult }) => __awaiter(void 0, void 0, void 0, function* () {
         // If we could not match, we can just auto respond...
-        if (!matchResult.src || !matchResult.runtime) {
+        if (!matchResult.runtime) {
             // Just say we have finished gracefully.
             return (0, quidproquo_core_1.actionResult)(true);
         }

package/lib/commonjs/getActionProcessor/core/event/sqs/queue/matchStory.js

@@ -21,9 +21,10 @@ exports.getQueueConfigSetting = getQueueConfigSetting;
 const getProcessMatchStory = (qpqConfig) => {
     // TODO: Get this out of the qpqconfig like the other event processors
     const queueQPQConfigSetting = (0, exports.getQueueConfigSetting)();
+    const queueQueueProcessors = quidproquo_core_1.qpqCoreUtils.getQueueQueueProcessors(queueQPQConfigSetting.name, qpqConfig);
+    const queueTypes = Object.keys(queueQueueProcessors).sort();
     return ({ qpqEventRecord }) => __awaiter(void 0, void 0, void 0, function* () {
-        const queueQueueProcessors = quidproquo_core_1.qpqCoreUtils.getQueueQueueProcessors(queueQPQConfigSetting.name, qpqConfig);
-        const queueTypes = Object.keys(queueQueueProcessors).sort();
+        console.log('qpqEventRecord', JSON.stringify(qpqEventRecord, null, 2));
         // Find the most relevant match
         const matchedQueueType = queueTypes
             .map((qt) => ({
@@ -41,8 +42,7 @@ const getProcessMatchStory = (qpqConfig) => {
         }
         const sourceEntry = queueQueueProcessors[matchedQueueType.queueType];
         return (0, quidproquo_core_1.actionResult)({
-            src: sourceEntry.src,
-            runtime: sourceEntry.runtime,
+            runtime: sourceEntry,
             runtimeOptions: matchedQueueType.match.params || {},
             config: matchedQueueType.queueType,
         });

package/lib/commonjs/getActionProcessor/core/keyValueStore/getKeyValueStoreUpsertActionProcessor.js

@@ -36,6 +36,7 @@ const getProcessKeyValueStoreUpsert = (qpqConfig) => {
         catch (error) {
             return (0, quidproquo_core_1.actionResultErrorFromCaughtError)(error, {
                 InternalServerError: () => (0, quidproquo_core_1.actionResultError)(quidproquo_core_2.KeyValueStoreUpsertErrorTypeEnum.ServiceUnavailable, 'KVS Service Unavailable'),
+                ResourceNotFoundException: () => (0, quidproquo_core_1.actionResultError)(quidproquo_core_2.KeyValueStoreUpsertErrorTypeEnum.ResourceNotFound, 'KVS Resource Not Found'),
             });
         }
     });

package/lib/commonjs/getActionProcessor/core/system/getExecuteStoryActionProcessor.js

@@ -18,13 +18,12 @@ const getProcessExecuteStory = (qpqConfig, dynamicModuleLoader) => {
     const moduleName = quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
     return (payload, session, actionProcessors, logger) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        let module = yield dynamicModuleLoader(payload.src);
-        if (module === null) {
-            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Module not found [${payload.src}]`);
-        }
-        const story = module[payload.runtime];
+        console.log('Trying to load module');
+        let story = yield dynamicModuleLoader(payload.runtime);
+        console.log('After - Trying to load module');
         if (!story) {
-            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `[${payload.runtime}] not found in module [${payload.src}]`);
+            console.log('No story');
+            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Unable to dynamically load: [${payload.runtime}]`);
         }
         const resolveStory = (0, quidproquo_core_1.createRuntime)(qpqConfig, {
             context: ((_a = payload.storySession) === null || _a === void 0 ? void 0 : _a.context) || session.context,
@@ -33,11 +32,10 @@ const getProcessExecuteStory = (qpqConfig, dynamicModuleLoader) => {
             correlation: ((_d = payload.storySession) === null || _d === void 0 ? void 0 : _d.correlation) || session.correlation,
         }, actionProcessors, exports.getDateNow, logger, 
         // TODO: Share this logic.
-        `${moduleName}::${(0, awsLambdaUtils_1.randomGuid)()}`, quidproquo_core_1.QpqRuntimeType.EXECUTE_STORY, [`${payload.src}::${payload.runtime}`]);
+        `${moduleName}::${(0, awsLambdaUtils_1.randomGuid)()}`, quidproquo_core_1.QpqRuntimeType.EXECUTE_STORY, [payload.runtime]);
         const storyResult = yield resolveStory(story, payload.params);
         if (storyResult.error) {
-            const stack = `${payload.src}::${payload.runtime}`;
-            return (0, quidproquo_core_1.actionResultError)(storyResult.error.errorType, storyResult.error.errorText, storyResult.error.errorStack ? `${stack} -> [${storyResult.error.errorStack}]` : stack);
+            return (0, quidproquo_core_1.actionResultError)(storyResult.error.errorType, storyResult.error.errorText, storyResult.error.errorStack ? `${payload.runtime} -> [${storyResult.error.errorStack}]` : payload.runtime);
         }
         return (0, quidproquo_core_1.actionResult)(storyResult.result);
     });

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryRespondToAuthChallengeActionProcessor.js

@@ -13,22 +13,37 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const respondToAuthChallengeChallenge_1 = require("../../../logic/cognito/respondToAuthChallengeChallenge");
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
 const anyAuthChallengeToCognitoAttributes = (authChallenge) => {
     switch (authChallenge.challenge) {
         case quidproquo_core_1.AuthenticateUserChallenge.NEW_PASSWORD_REQUIRED:
             return {
                 NEW_PASSWORD: authChallenge.newPassword,
             };
+        case quidproquo_core_1.AuthenticateUserChallenge.CUSTOM_CHALLENGE:
+            return {
+                ANSWER: JSON.stringify(authChallenge.challengeAnswer),
+            };
         default:
             return {};
     }
 };
+const anyAuthChallengeToCognitoChallengeName = (authChallenge) => {
+    switch (authChallenge.challenge) {
+        case quidproquo_core_1.AuthenticateUserChallenge.NEW_PASSWORD_REQUIRED:
+            return client_cognito_identity_provider_1.ChallengeNameType.NEW_PASSWORD_REQUIRED;
+        case quidproquo_core_1.AuthenticateUserChallenge.CUSTOM_CHALLENGE:
+            return client_cognito_identity_provider_1.ChallengeNameType.CUSTOM_CHALLENGE;
+        default:
+            throw new Error(`Unknown challenge`);
+    }
+};
 const getUserDirectoryRespondToAuthChallengeActionProcessor = (qpqConfig) => {
     return ({ userDirectoryName, authChallenge }) => __awaiter(void 0, void 0, void 0, function* () {
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         const userPoolClientId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolClientIdFromConfig)(userDirectoryName, qpqConfig), region);
-        const response = yield (0, respondToAuthChallengeChallenge_1.respondToAuthChallengeChallenge)(userPoolId, userPoolClientId, region, authChallenge.username, authChallenge.session, anyAuthChallengeToCognitoAttributes(authChallenge));
+        const response = yield (0, respondToAuthChallengeChallenge_1.respondToAuthChallengeChallenge)(userPoolId, userPoolClientId, region, authChallenge.username, authChallenge.session, anyAuthChallengeToCognitoChallengeName(authChallenge), anyAuthChallengeToCognitoAttributes(authChallenge));
         return (0, quidproquo_core_1.actionResult)(response);
     });
 };

package/lib/commonjs/logic/cognito/respondToAuthChallengeChallenge.d.ts

@@ -1,2 +1,3 @@
 import { AuthenticateUserResponse } from 'quidproquo-core';
-export declare const respondToAuthChallengeChallenge: (userPoolId: string, clientId: string, region: string, username: string, session: string, attributes: Record<string, string>) => Promise<AuthenticateUserResponse>;
+import { ChallengeNameType } from '@aws-sdk/client-cognito-identity-provider';
+export declare const respondToAuthChallengeChallenge: (userPoolId: string, clientId: string, region: string, username: string, session: string, challengeNameType: ChallengeNameType, attributes: Record<string, string>) => Promise<AuthenticateUserResponse>;

package/lib/commonjs/logic/cognito/respondToAuthChallengeChallenge.js

@@ -15,12 +15,12 @@ const calculateSecretHash_1 = require("./utils/calculateSecretHash");
 const getUserPoolClientSecret_1 = require("./getUserPoolClientSecret");
 const transformCognitoResponse_1 = require("./utils/transformCognitoResponse");
 const createAwsClient_1 = require("../createAwsClient");
-const respondToAuthChallengeChallenge = (userPoolId, clientId, region, username, session, attributes) => __awaiter(void 0, void 0, void 0, function* () {
+const respondToAuthChallengeChallenge = (userPoolId, clientId, region, username, session, challengeNameType, attributes) => __awaiter(void 0, void 0, void 0, function* () {
     const cognitoClient = (0, createAwsClient_1.createAwsClient)(client_cognito_identity_provider_1.CognitoIdentityProviderClient, { region });
     const clientSecret = yield (0, getUserPoolClientSecret_1.getUserPoolClientSecret)(userPoolId, clientId, region);
     const secretHash = (0, calculateSecretHash_1.calculateSecretHash)(username, clientId, clientSecret);
     const params = {
-        ChallengeName: client_cognito_identity_provider_1.ChallengeNameType.NEW_PASSWORD_REQUIRED,
+        ChallengeName: challengeNameType,
         ClientId: clientId,
         Session: session,
         ChallengeResponses: Object.assign({ USERNAME: username, SECRET_HASH: secretHash }, attributes),

package/lib/commonjs/logic/cognito/utils/transformCognitoResponse.js

@@ -24,16 +24,19 @@ const cognitoChallengeNameTypeToQpqAuthenticateUserChallenge = (cognitoChallenge
     }
     const map = {
         [client_cognito_identity_provider_1.ChallengeNameType.NEW_PASSWORD_REQUIRED]: quidproquo_core_1.AuthenticateUserChallenge.NEW_PASSWORD_REQUIRED,
+        [client_cognito_identity_provider_1.ChallengeNameType.CUSTOM_CHALLENGE]: quidproquo_core_1.AuthenticateUserChallenge.CUSTOM_CHALLENGE,
     };
     // TODO: handle the NOT-IMP cases
-    const challenge = map[cognitoChallengeName] || `NOT-IMP-${cognitoChallengeName}`;
+    const challenge = map[cognitoChallengeName] || `QPQ-NOT-IMP-${cognitoChallengeName}`;
     return challenge;
 };
 exports.cognitoChallengeNameTypeToQpqAuthenticateUserChallenge = cognitoChallengeNameTypeToQpqAuthenticateUserChallenge;
 const cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo = (authResponse, issueDateTime) => {
+    console.log('authResponse XYZ', authResponse);
     const res = {
         session: authResponse.Session,
         challenge: (0, exports.cognitoChallengeNameTypeToQpqAuthenticateUserChallenge)(authResponse.ChallengeName),
+        challengeParameters: authResponse.ChallengeParameters,
     };
     if (authResponse.AuthenticationResult) {
         res.authenticationInfo = (0, exports.cognitoAuthenticationResultTypeToQpqAuthenticationInfo)(authResponse.AuthenticationResult, issueDateTime);

package/lib/commonjs/runtimeConfig/QPQAWSResourceMap.d.ts

@@ -1,4 +1,4 @@
+import { QpqFunctionRuntime } from 'quidproquo-core';
 export interface LambdaRuntimeConfig {
-    src: string;
-    runtime: string;
+    runtime: QpqFunctionRuntime;
 }

package/lib/commonjs/types/DynamicLoader.d.ts

@@ -1 +1,2 @@
-export type DynamicModuleLoader = (src: string) => Promise<any>;
+import { QpqFunctionRuntime } from 'quidproquo-core';
+export type DynamicModuleLoader = (runtime: QpqFunctionRuntime) => Promise<any>;

package/lib/esm/awsLambdaUtils.js

@@ -5,6 +5,7 @@ export const randomGuid = () => {
     return randomUUID();
 };
 export const matchUrl = (path, url) => {
+    console.log('Matching: ', path);
     // /attempt/{attemptUuid}/result/{test} => /attempt/:attemptUuid/result/:test
     const modifiedPath = path.replaceAll(/{(.+?)}/g, (m, g) => `:${g}`);
     const matchResult = match(modifiedPath, url);
@@ -16,20 +17,20 @@ export const matchUrl = (path, url) => {
 export const getS3BucketStorageClassFromStorageDriveTier = (driveTier) => {
     switch (driveTier) {
         case StorageDriveTier.REGULAR:
-            return "STANDARD";
+            return 'STANDARD';
         case StorageDriveTier.OCCASIONAL_ACCESS:
-            return "STANDARD_IA";
+            return 'STANDARD_IA';
         case StorageDriveTier.SINGLE_ZONE_OCCASIONAL_ACCESS:
-            return "ONEZONE_IA";
+            return 'ONEZONE_IA';
         case StorageDriveTier.COLD_STORAGE:
-            return "GLACIER";
+            return 'GLACIER';
         case StorageDriveTier.COLD_STORAGE_INSTANT_ACCESS:
-            return "GLACIER_IR";
+            return 'GLACIER_IR';
         case StorageDriveTier.DEEP_COLD_STORAGE:
-            return "DEEP_ARCHIVE";
+            return 'DEEP_ARCHIVE';
         case StorageDriveTier.SMART_TIERING:
-            return "INTELLIGENT_TIERING";
+            return 'INTELLIGENT_TIERING';
         default:
-            return "INTELLIGENT_TIERING";
+            return 'INTELLIGENT_TIERING';
     }
 };

package/lib/esm/getActionProcessor/core/event/apiGatwayEvent/api/matchStory.js

@@ -19,7 +19,6 @@ const getProcessMatchStory = (qpqConfig) => {
             return actionResultError(ErrorTypeEnum.NotFound, `route not found [${qpqEventRecord.path}] - [${qpqWebServerUtils.getHeaderValue('user-agent', qpqEventRecord.headers)}]`);
         }
         return actionResult({
-            src: matchedRoute.route.src,
             runtime: matchedRoute.route.runtime,
             runtimeOptions: matchedRoute.match.params || {},
             // TODO: Make this aware of the API that we are eventing

package/lib/esm/getActionProcessor/core/event/apiGatwayEvent/websocket/matchStory.js

@@ -7,18 +7,15 @@ const getProcessMatchStory = (qpqConfig) => {
         switch (qpqEventRecord.eventType) {
             case WebSocketEventType.Connect:
                 return actionResult({
-                    src: userDirectoryConfig.eventProcessors.onConnect.src,
-                    runtime: userDirectoryConfig.eventProcessors.onConnect.runtime,
+                    runtime: userDirectoryConfig.eventProcessors.onConnect,
                 });
             case WebSocketEventType.Disconnect:
                 return actionResult({
-                    src: userDirectoryConfig.eventProcessors.onDisconnect.src,
-                    runtime: userDirectoryConfig.eventProcessors.onDisconnect.runtime,
+                    runtime: userDirectoryConfig.eventProcessors.onDisconnect,
                 });
             case WebSocketEventType.Message:
                 return actionResult({
-                    src: userDirectoryConfig.eventProcessors.onMessage.src,
-                    runtime: userDirectoryConfig.eventProcessors.onMessage.runtime,
+                    runtime: userDirectoryConfig.eventProcessors.onMessage,
                 });
             default:
                 return actionResultError(ErrorTypeEnum.NotFound, `Websocket lambda not implemented for ${qpqEventRecord.eventType}`);

package/lib/esm/getActionProcessor/core/event/cloudFrontOriginRequest/matchStory.js

@@ -18,7 +18,6 @@ const getProcessMatchStory = (qpqConfig) => {
             return actionResultError(ErrorTypeEnum.NotFound, `seo not found [${qpqEventRecord.path}]`);
         }
         return actionResult({
-            src: matchedSeoConfig.route.src,
             runtime: matchedSeoConfig.route.runtime,
             runtimeOptions: matchedSeoConfig.match.params || {},
             config: matchedSeoConfig.route,

package/lib/esm/getActionProcessor/core/event/cognito/createAuthChallenge/getRecords.js

@@ -1,11 +1,11 @@
 import { EventActionType, actionResult } from 'quidproquo-core';
 import { getQpqAttributesFromCognitoStringMap } from '../../../../../logic/cognito/cognitoAttributeMap';
-import { getChallengeSessionFromCognitoCreateAuthChallengeTriggerEvent } from './utils';
+import { getChallengeSessionFromCognitoTriggerEventSession } from '../utils';
 const getProcessGetRecords = (qpqConfig) => {
     return async ({ eventParams: [event, context] }) => {
         const internalEventRecord = {
             userName: event.userName,
-            session: getChallengeSessionFromCognitoCreateAuthChallengeTriggerEvent(event),
+            session: getChallengeSessionFromCognitoTriggerEventSession(event.request.session),
             userAttributes: getQpqAttributesFromCognitoStringMap(event.request.userAttributes),
         };
         return actionResult([internalEventRecord]);