quidproquo-actionprocessor-awslambda 0.0.94 → 0.0.96

package/lib/getActionProcessor/core/event/getAPIGatewayEventActionProcessor.js

@@ -59,6 +59,8 @@ const getProcessAutoRespond = (qpqConfig) => {
                 headers: quidproquo_webserver_1.qpqWebServerUtils.getCorsHeaders(qpqConfig, payload.matchResult.config || {}, payload.transformedEventParams.headers),
             });
         }
+        // TODO: We can pull out the jwt from the session if thats a better way?
+        // Think about that when you dont have covid.
         const authValid = yield (0, isAuthValid_1.isAuthValid)(qpqConfig, quidproquo_webserver_1.qpqWebServerUtils.getHeaderValue('Authorization', payload.transformedEventParams.headers), quidproquo_webserver_1.qpqWebServerUtils.getHeaderValue('x-api-key', payload.transformedEventParams.headers), (_a = payload.matchResult.config) === null || _a === void 0 ? void 0 : _a.routeAuthSettings);
         if (!authValid) {
             return (0, quidproquo_core_1.actionResult)({

package/lib/getActionProcessor/core/event/getSQSEventRecordActionProcessor.d.ts

@@ -1,11 +1,11 @@
 import { QPQConfig, MatchStoryResult, EventMatchStoryActionProcessor, EventTransformEventParamsActionProcessor, EventTransformResponseResultActionProcessor, EventAutoRespondActionProcessor, QueueMessage, QueueQPQConfigSetting } from 'quidproquo-core';
 import { QueueEvent, QueueEventTypeParams } from 'quidproquo-webserver';
-import { Context, SQSRecord } from 'aws-lambda';
+import { Context } from 'aws-lambda';
 type AnyQueueEvent = QueueEvent<QueueMessage<any>>;
 export type SqsEventMatchStoryResult = MatchStoryResult<QueueEventTypeParams, string>;
 export declare const getQueueConfigSetting: () => QueueQPQConfigSetting;
 declare const _default: (qpqConfig: QPQConfig) => {
-    "@quidproquo-core/event/TransformEventParams": EventTransformEventParamsActionProcessor<[SQSRecord, Context], AnyQueueEvent>;
+    "@quidproquo-core/event/TransformEventParams": EventTransformEventParamsActionProcessor<[QueueMessage<any>, Context], AnyQueueEvent>;
     "@quidproquo-core/event/TransformResponseResult": EventTransformResponseResultActionProcessor<boolean, AnyQueueEvent, boolean>;
     "@quidproquo-core/event/AutoRespond": EventAutoRespondActionProcessor<AnyQueueEvent, SqsEventMatchStoryResult, boolean>;
     "@quidproquo-core/event/MatchStory": EventMatchStoryActionProcessor<AnyQueueEvent, SqsEventMatchStoryResult>;

package/lib/getActionProcessor/core/event/getSQSEventRecordActionProcessor.js

@@ -20,11 +20,10 @@ const getQueueConfigSetting = () => {
 exports.getQueueConfigSetting = getQueueConfigSetting;
 const getProcessTransformEventParams = (qpqConfig) => {
     return ({ eventParams: [record, context] }) => __awaiter(void 0, void 0, void 0, function* () {
-        const parsedRecord = JSON.parse(record.body);
         return (0, quidproquo_core_1.actionResult)({
             message: {
-                type: parsedRecord.type,
-                payload: parsedRecord.payload,
+                type: record.type,
+                payload: record.payload,
             },
         });
     });

package/lib/getActionProcessor/core/event/getServiceFunctionExecuteEventActionProcessor.js

@@ -11,11 +11,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
-const transformHttpEventHeadersToAPIGatewayProxyResultHeaders = (headers) => {
-    return Object.keys(headers)
-        .filter((header) => !!headers[header])
-        .reduce((acc, header) => (Object.assign(Object.assign({}, acc), { [header]: headers[header] })), {});
-};
 const getProcessTransformEventParams = (qpqConfig) => {
     return ({ eventParams: [executeServiceFunctionEvent, context] }) => __awaiter(void 0, void 0, void 0, function* () {
         return (0, quidproquo_core_1.actionResult)(executeServiceFunctionEvent);

package/lib/getActionProcessor/core/eventBus/getQueueSendMessageActionProcessor.js

@@ -15,10 +15,13 @@ const publishMessage_1 = require("../../../logic/sns/publishMessage");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getProcessEventBusSendMessage = (qpqConfig) => {
-    return ({ eventBusName, eventBusMessages }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ eventBusName, eventBusMessages }, session) => __awaiter(void 0, void 0, void 0, function* () {
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const topicArn = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameSnsTopicArnFromConfig)(eventBusName, qpqConfig), region);
-        yield (0, publishMessage_1.publishMessage)(topicArn, region, eventBusMessages.map((message) => JSON.stringify(message)));
+        yield (0, publishMessage_1.publishMessage)(topicArn, region, eventBusMessages.map((message) => {
+            const eventBusMessageWithSession = Object.assign(Object.assign({}, message), { storySession: session });
+            return JSON.stringify(eventBusMessageWithSession);
+        }));
         return (0, quidproquo_core_2.actionResult)(void 0);
     });
 };

package/lib/getActionProcessor/core/queue/getQueueSendMessageActionProcessor.js

@@ -14,10 +14,14 @@ const qpqAwsLambdaRuntimeConfigUtils_1 = require("../../../runtimeConfig/qpqAwsL
 const quidproquo_core_2 = require("quidproquo-core");
 const sendMessages_1 = require("../../../logic/sqs/sendMessages");
 const getProcessQueueSendMessage = (qpqConfig) => {
-    return ({ queueName, queueMessages }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ queueName, queueMessages }, session) => __awaiter(void 0, void 0, void 0, function* () {
         // While we have some uuids
         const sqsQueueName = (0, qpqAwsLambdaRuntimeConfigUtils_1.resolveResourceName)(queueName, qpqConfig);
-        yield (0, sendMessages_1.sendMessages)(sqsQueueName, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), queueMessages.map((message) => JSON.stringify(message)));
+        yield (0, sendMessages_1.sendMessages)(sqsQueueName, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), queueMessages.map((message) => {
+            // Add the session info to the message
+            const queueMessageWithSession = Object.assign(Object.assign({}, message), { storySession: session });
+            return JSON.stringify(queueMessageWithSession);
+        }));
         return (0, quidproquo_core_2.actionResult)(void 0);
     });
 };

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

@@ -15,6 +15,7 @@ const awsLambdaUtils_1 = require("./../../../awsLambdaUtils");
 const getDateNow = () => new Date().toISOString();
 exports.getDateNow = getDateNow;
 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* () {
         let module = yield dynamicModuleLoader(payload.src);
         if (module === null) {
@@ -24,10 +25,12 @@ const getProcessExecuteStory = (qpqConfig, dynamicModuleLoader) => {
         if (!story) {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `[${payload.runtime}] not found in module [${payload.src}]`);
         }
-        const resolveStory = (0, quidproquo_core_1.createRuntime)(qpqConfig, session, actionProcessors, exports.getDateNow, logger, awsLambdaUtils_1.randomGuid, quidproquo_core_1.QpqRuntimeType.EXECUTE_STORY, [`${payload.src}::${payload.runtime}`]);
+        const resolveStory = (0, quidproquo_core_1.createRuntime)(qpqConfig, session, actionProcessors, exports.getDateNow, logger, 
+        // TODO: Share this logic.
+        `${moduleName}-${(0, awsLambdaUtils_1.randomGuid)()}`, quidproquo_core_1.QpqRuntimeType.EXECUTE_STORY, [`${payload.src}::${payload.runtime}`]);
         const storyResult = yield resolveStory(story, payload.params);
         if (storyResult.error) {
-            return (0, quidproquo_core_1.actionResultError)(storyResult.error.errorType, `story error! in ${payload.src}::${payload.runtime} -> [${storyResult.error.errorText}]`, storyResult.error.errorStack);
+            return (0, quidproquo_core_1.actionResultError)(storyResult.error.errorType, storyResult.error.errorText, `story error! in ${payload.src}::${payload.runtime} -> [${storyResult.error.errorStack}]`);
         }
         return (0, quidproquo_core_1.actionResult)(storyResult.result);
     });

package/lib/getActionProcessor/core/userDirectory/getUserDirectoryRefreshTokenActionProcessor.js

@@ -13,12 +13,17 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const refreshToken_1 = require("../../../logic/cognito/refreshToken");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
+const decodeValidJwt_1 = require("../../../logic/cognito/decodeValidJwt");
 const getUserDirectoryRefreshTokenActionProcessor = (qpqConfig) => {
-    return ({ userDirectoryName, username, refreshToken }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, refreshToken }, session) => __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 authResponse = yield (0, refreshToken_1.refreshToken)(userPoolId, userPoolClientId, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), username, refreshToken);
+        const authInfo = yield (0, decodeValidJwt_1.decodeValidJwt)(userPoolId, userPoolClientId, 'access', session.accessToken);
+        if (!authInfo || !(authInfo === null || authInfo === void 0 ? void 0 : authInfo.username)) {
+            return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.Unauthorized, 'Invalid accessToken');
+        }
+        const authResponse = yield (0, refreshToken_1.refreshToken)(userPoolId, userPoolClientId, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), authInfo === null || authInfo === void 0 ? void 0 : authInfo.username, refreshToken);
         return (0, quidproquo_core_1.actionResult)(authResponse);
     });
 };

package/lib/getActionProcessor/webserver/admin/getAdminActionProcessor.d.ts

@@ -1,7 +1,8 @@
 import { QPQConfig } from 'quidproquo-core';
-import { AdminGetLogsActionProcessor, AdminGetLogActionProcessor } from 'quidproquo-webserver';
+import { AdminGetLogsActionProcessor, AdminGetLogActionProcessor, AdminGetLogMetadataChildrenActionProcessor } from 'quidproquo-webserver';
 declare const _default: (qpqConfig: QPQConfig) => {
     "@quidproquo-webserver/Admin/GetLogs": AdminGetLogsActionProcessor;
     "@quidproquo-webserver/Admin/GetLog": AdminGetLogActionProcessor;
+    "@quidproquo-webserver/Admin/GetLogMetadataChildren": AdminGetLogMetadataChildrenActionProcessor;
 };
 export default _default;

package/lib/getActionProcessor/webserver/admin/getAdminActionProcessor.js

@@ -13,6 +13,7 @@ const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_webserver_1 = require("quidproquo-webserver");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getPagedItemsOverRange_1 = require("../../../logic/dynamo/getPagedItemsOverRange");
+const getLogChildrenByFromCorrelation_1 = require("../../../logic/dynamo/getLogChildrenByFromCorrelation");
 const readTextFile_1 = require("../../../logic/s3/readTextFile");
 // TODO: Centralize this
 const QPQ_LOG_BUCKET_NAME = 'logs';
@@ -24,6 +25,14 @@ const getAdminGetLogsActionProcessor = (qpqConfig) => {
         return (0, quidproquo_core_1.actionResult)(response);
     });
 };
+const getLogMetadataChildrenActionProcessor = (qpqConfig) => {
+    return ({ correlationId }) => __awaiter(void 0, void 0, void 0, function* () {
+        const tableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(QPQ_LOG_BUCKET_NAME, qpqConfig, 'log');
+        const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
+        const response = yield (0, getLogChildrenByFromCorrelation_1.getLogChildrenByFromCorrelation)(tableName, region, correlationId);
+        return (0, quidproquo_core_1.actionResult)(response);
+    });
+};
 const getAdminGetLogActionProcessor = (qpqConfig) => {
     return ({ correlationId }) => __awaiter(void 0, void 0, void 0, function* () {
         const bucketName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(QPQ_LOG_BUCKET_NAME, qpqConfig, 'log');
@@ -37,5 +46,6 @@ exports.default = (qpqConfig) => {
     return {
         [quidproquo_webserver_1.AdminActionType.GetLogs]: getAdminGetLogsActionProcessor(qpqConfig),
         [quidproquo_webserver_1.AdminActionType.GetLog]: getAdminGetLogActionProcessor(qpqConfig),
+        [quidproquo_webserver_1.AdminActionType.GetLogMetadataChildren]: getLogMetadataChildrenActionProcessor(qpqConfig),
     };
 };

package/lib/getActionProcessor/webserver/admin/index.d.ts

@@ -2,5 +2,6 @@ import { QPQConfig } from 'quidproquo-core';
 declare const _default: (qpqConfig: QPQConfig) => {
     "@quidproquo-webserver/Admin/GetLogs": import("quidproquo-webserver/lib").AdminGetLogsActionProcessor;
     "@quidproquo-webserver/Admin/GetLog": import("quidproquo-webserver/lib").AdminGetLogActionProcessor;
+    "@quidproquo-webserver/Admin/GetLogMetadataChildren": import("quidproquo-webserver/lib").AdminGetLogMetadataChildrenActionProcessor;
 };
 export default _default;

package/lib/getActionProcessor/webserver/serviceFunction/getServiceFunctionActionProcessor.js

@@ -14,7 +14,7 @@ const quidproquo_webserver_1 = require("quidproquo-webserver");
 const executeLambdaByName_1 = require("../../../logic/lambda/executeLambdaByName");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getServiceFunctionExecuteActionProcessor = (qpqConfig) => {
-    return ({ functionName, service, payload }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ functionName, service, payload }, session) => __awaiter(void 0, void 0, void 0, function* () {
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const appName = quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
         const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
@@ -23,6 +23,7 @@ const getServiceFunctionExecuteActionProcessor = (qpqConfig) => {
         const serviceFunctionEvent = {
             functionName: functionName,
             payload: payload,
+            storySession: session,
         };
         const result = yield (0, executeLambdaByName_1.executeLambdaByName)(awsFunctionName, region, serviceFunctionEvent);
         if (result === null || result === void 0 ? void 0 : result.error) {

package/lib/logic/cognito/authenticateUser.js

@@ -20,6 +20,8 @@ const authenticateUser = (userPoolId, clientId, region, username, password) => _
     const cognitoClient = new 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);
+    // Time we issued the request
+    const issueDateTime = new Date().toISOString();
     const params = {
         AuthFlow: client_cognito_identity_provider_1.AuthFlowType.ADMIN_USER_PASSWORD_AUTH,
         UserPoolId: userPoolId,
@@ -32,7 +34,7 @@ const authenticateUser = (userPoolId, clientId, region, username, password) => _
     };
     try {
         const response = yield cognitoClient.send(new client_cognito_identity_provider_1.AdminInitiateAuthCommand(params));
-        return (0, transformCognitoResponse_1.cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo)(response);
+        return (0, transformCognitoResponse_1.cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo)(response, issueDateTime);
     }
     catch (e) {
         if (e instanceof Error) {

package/lib/logic/cognito/decodeValidJwt.d.ts

@@ -0,0 +1,5 @@
+export type AuthInfo = {
+    userId: string;
+    username: string;
+};
+export declare const decodeValidJwt: (userPoolId: string, clientId: string, tokenType: 'id' | 'access', accessToken?: string) => Promise<AuthInfo | null>;

package/lib/logic/cognito/decodeValidJwt.js

@@ -0,0 +1,36 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeValidJwt = void 0;
+const aws_jwt_verify_1 = require("aws-jwt-verify");
+const decodeValidJwt = (userPoolId, clientId, tokenType, accessToken) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
+    if (!accessToken) {
+        return null;
+    }
+    const verifier = aws_jwt_verify_1.CognitoJwtVerifier.create({
+        userPoolId: userPoolId,
+        tokenUse: tokenType,
+        clientId: clientId,
+    });
+    try {
+        const payload = yield verifier.verify(accessToken);
+        return {
+            userId: payload.sub,
+            username: ((_a = payload.username) === null || _a === void 0 ? void 0 : _a.toString()) || '',
+        };
+    }
+    catch (e) {
+        console.log('Invalid jwt token', e);
+        return null;
+    }
+});
+exports.decodeValidJwt = decodeValidJwt;

package/lib/logic/cognito/refreshToken.js

@@ -27,7 +27,9 @@ const refreshToken = (userPoolId, clientId, region, username, refreshToken) => _
             SECRET_HASH: secretHash,
         },
     };
+    // Time we issued the request
+    const issueDateTime = new Date().toISOString();
     const response = yield cognitoClient.send(new client_cognito_identity_provider_1.AdminInitiateAuthCommand(params));
-    return (0, transformCognitoResponse_1.cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo)(response);
+    return (0, transformCognitoResponse_1.cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo)(response, issueDateTime);
 });
 exports.refreshToken = refreshToken;

package/lib/logic/cognito/utils/transformCognitoResponse.d.ts

@@ -1,4 +1,4 @@
 import { AuthenticateUserResponse, AuthenticationInfo } from 'quidproquo-core';
 import { AuthenticationResultType, AdminInitiateAuthResponse } from '@aws-sdk/client-cognito-identity-provider';
-export declare const cognitoAuthenticationResultTypeToQpqAuthenticationInfo: (authResult: AuthenticationResultType) => AuthenticationInfo;
-export declare const cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo: (authResponse: AdminInitiateAuthResponse) => AuthenticateUserResponse;
+export declare const cognitoAuthenticationResultTypeToQpqAuthenticationInfo: (authResult: AuthenticationResultType, issueDateTime: string) => AuthenticationInfo;
+export declare const cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo: (authResponse: AdminInitiateAuthResponse, issueDateTime: string) => AuthenticateUserResponse;

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

@@ -2,21 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo = exports.cognitoAuthenticationResultTypeToQpqAuthenticationInfo = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
-const cognitoAuthenticationResultTypeToQpqAuthenticationInfo = (authResult) => ({
-    accessToken: authResult.AccessToken,
-    idToken: authResult.IdToken,
-    expiresIn: authResult.ExpiresIn,
-    refreshToken: authResult.RefreshToken,
-    tokenType: authResult.TokenType,
-});
+const cognitoAuthenticationResultTypeToQpqAuthenticationInfo = (authResult, issueDateTime) => {
+    // Parse the issueDateTime and add the expiresIn to get the expiration date
+    let issueDate = new Date(issueDateTime);
+    issueDate.setSeconds(issueDate.getSeconds() + (authResult.ExpiresIn || 0));
+    const expiresAt = issueDate.toISOString();
+    return {
+        accessToken: authResult.AccessToken,
+        idToken: authResult.IdToken,
+        refreshToken: authResult.RefreshToken,
+        tokenType: authResult.TokenType,
+        expirationDurationInSeconds: authResult.ExpiresIn,
+        expiresAt,
+    };
+};
 exports.cognitoAuthenticationResultTypeToQpqAuthenticationInfo = cognitoAuthenticationResultTypeToQpqAuthenticationInfo;
-const cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo = (authResponse) => {
+const cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo = (authResponse, issueDateTime) => {
     const res = {
         session: authResponse.Session,
         challenge: quidproquo_core_1.AuthenticateUserChallenge.NONE,
     };
     if (authResponse.AuthenticationResult) {
-        res.authenticationInfo = (0, exports.cognitoAuthenticationResultTypeToQpqAuthenticationInfo)(authResponse.AuthenticationResult);
+        res.authenticationInfo = (0, exports.cognitoAuthenticationResultTypeToQpqAuthenticationInfo)(authResponse.AuthenticationResult, issueDateTime);
     }
     return res;
 };

package/lib/logic/cognito/verifyJwt.js

@@ -10,21 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyJwt = void 0;
-const aws_jwt_verify_1 = require("aws-jwt-verify");
+const decodeValidJwt_1 = require("./decodeValidJwt");
 const verifyJwt = (accessToken, userPoolId, clientId, tokenType) => __awaiter(void 0, void 0, void 0, function* () {
-    const verifier = aws_jwt_verify_1.CognitoJwtVerifier.create({
-        userPoolId: userPoolId,
-        tokenUse: tokenType,
-        clientId: clientId,
-    });
-    try {
-        const payload = yield verifier.verify(accessToken);
-        console.log('verify: ', JSON.stringify(payload, null, 2));
-        return true;
-    }
-    catch (e) {
-        console.log(e);
-        return false;
-    }
+    const info = yield (0, decodeValidJwt_1.decodeValidJwt)(userPoolId, clientId, tokenType, accessToken);
+    // if we hav info, its valid
+    return !!info;
 });
 exports.verifyJwt = verifyJwt;

package/lib/logic/dynamo/getLogByCorrelation.d.ts

@@ -0,0 +1,2 @@
+import { StoryResultMetadata } from 'quidproquo-core';
+export declare function getLogByCorrelation(tableName: string, region: string, correlation: string): Promise<StoryResultMetadata>;

package/lib/logic/dynamo/getLogByCorrelation.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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogByCorrelation = void 0;
+const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
+function getLogByCorrelation(tableName, region, correlation) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dynamoDBClient = new client_dynamodb_1.DynamoDBClient({ region });
+        const queryParams = {
+            TableName: tableName,
+            IndexName: 'CorrelationIndex',
+            KeyConditionExpression: 'correlation = :correlation',
+            ExpressionAttributeValues: {
+                ':correlation': { S: correlation },
+            },
+        };
+        try {
+            const queryResult = yield dynamoDBClient.send(new client_dynamodb_1.QueryCommand(queryParams));
+            const items = (queryResult.Items || []).map((i) => {
+                var _a, _b, _c;
+                const [startedAt, correlation] = ((_a = i.startedAtWithCorrelation.S) === null || _a === void 0 ? void 0 : _a.split('#')) || [];
+                const metaData = {
+                    generic: i.generic.S || '',
+                    runtimeType: i.runtimeType.S,
+                    error: (_b = i.error) === null || _b === void 0 ? void 0 : _b.S,
+                    startedAt: startedAt,
+                    correlation,
+                    moduleName: i.moduleName.S || '',
+                    fromCorrelation: (_c = i.fromCorrelation) === null || _c === void 0 ? void 0 : _c.S,
+                };
+                return metaData;
+            });
+            const [result] = items;
+            if (!result) {
+                throw new Error(`Failed to find log with correlation: ${correlation}`);
+            }
+            return result;
+        }
+        catch (err) {
+            console.error(`Failed to find log: ${err}`);
+            throw err;
+        }
+    });
+}
+exports.getLogByCorrelation = getLogByCorrelation;

package/lib/logic/dynamo/getLogChildrenByFromCorrelation.d.ts

@@ -0,0 +1,2 @@
+import { QpqLogList } from 'quidproquo-webserver';
+export declare function getLogChildrenByFromCorrelation(tableName: string, region: string, fromCorrelation: string, pageKey?: string): Promise<QpqLogList>;

package/lib/logic/dynamo/getLogChildrenByFromCorrelation.js

@@ -0,0 +1,60 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLogChildrenByFromCorrelation = void 0;
+const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
+const logs_1 = require("./logs");
+function getLogChildrenByFromCorrelation(tableName, region, fromCorrelation, pageKey) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const dynamoDBClient = new client_dynamodb_1.DynamoDBClient({ region });
+        const queryParams = {
+            TableName: tableName,
+            IndexName: 'FromCorrelationIndex',
+            KeyConditionExpression: 'fromCorrelation = :fromCorrelation',
+            ExpressionAttributeValues: {
+                ':fromCorrelation': { S: fromCorrelation },
+            },
+        };
+        if (pageKey) {
+            queryParams.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);
+        }
+        try {
+            const queryResult = yield dynamoDBClient.send(new client_dynamodb_1.QueryCommand(queryParams));
+            const items = (queryResult.Items || []).map((i) => {
+                var _a, _b, _c;
+                const [startedAt, correlation] = ((_a = i.startedAtWithCorrelation.S) === null || _a === void 0 ? void 0 : _a.split('#')) || [];
+                const metaData = {
+                    generic: i.generic.S || '',
+                    runtimeType: i.runtimeType.S,
+                    error: (_b = i.error) === null || _b === void 0 ? void 0 : _b.S,
+                    startedAt: startedAt,
+                    correlation,
+                    moduleName: i.moduleName.S || '',
+                    fromCorrelation: (_c = i.fromCorrelation) === null || _c === void 0 ? void 0 : _c.S,
+                };
+                return metaData;
+            });
+            if (queryResult.LastEvaluatedKey) {
+                const nextPageKey = (0, logs_1.lastEvaluatedKeyToString)(queryResult.LastEvaluatedKey);
+                // You can return the nextPageKey along with the items, so it can be used for the next query.
+                return { items, nextPageKey };
+            }
+            else {
+                return { items };
+            }
+        }
+        catch (err) {
+            console.error(`Failed to query items with the specified fromCorrelation: ${err}`);
+            throw err;
+        }
+    });
+}
+exports.getLogChildrenByFromCorrelation = getLogChildrenByFromCorrelation;

package/lib/logic/dynamo/getPagedItemsOverRange.js

@@ -11,12 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPagedItemsOverRange = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
-function lastEvaluatedKeyToString(lastEvaluatedKey) {
-    return Buffer.from(JSON.stringify(lastEvaluatedKey)).toString('base64');
-}
-function stringToLastEvaluatedKey(encodedKey) {
-    return JSON.parse(Buffer.from(encodedKey, 'base64').toString());
-}
+const logs_1 = require("./logs");
 function getPagedItemsOverRange(tableName, region, runtimeType, startIsoDateTime, endIsoDateTime, pageKey) {
     return __awaiter(this, void 0, void 0, function* () {
         const dynamoDBClient = new client_dynamodb_1.DynamoDBClient({ region });
@@ -31,7 +26,7 @@ function getPagedItemsOverRange(tableName, region, runtimeType, startIsoDateTime
             ScanIndexForward: false,
         };
         if (pageKey) {
-            queryParams.ExclusiveStartKey = stringToLastEvaluatedKey(pageKey);
+            queryParams.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);
         }
         try {
             const queryResult = yield dynamoDBClient.send(new client_dynamodb_1.QueryCommand(queryParams));
@@ -50,7 +45,7 @@ function getPagedItemsOverRange(tableName, region, runtimeType, startIsoDateTime
                 return metaData;
             });
             if (queryResult.LastEvaluatedKey) {
-                const nextPageKey = lastEvaluatedKeyToString(queryResult.LastEvaluatedKey);
+                const nextPageKey = (0, logs_1.lastEvaluatedKeyToString)(queryResult.LastEvaluatedKey);
                 // You can return the nextPageKey along with the items, so it can be used for the next query.
                 return { items, nextPageKey };
             }

package/lib/logic/dynamo/logs/index.d.ts

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

package/lib/logic/dynamo/logs/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./utils"), exports);

package/lib/logic/dynamo/logs/utils/index.d.ts

@@ -0,0 +1,2 @@
+export * from './lastEvaluatedKeyToString';
+export * from './stringToLastEvaluatedKey';

package/lib/logic/dynamo/logs/utils/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./lastEvaluatedKeyToString"), exports);
+__exportStar(require("./stringToLastEvaluatedKey"), exports);

package/lib/logic/dynamo/logs/utils/lastEvaluatedKeyToString.d.ts

@@ -0,0 +1 @@
+export declare function lastEvaluatedKeyToString(lastEvaluatedKey: any): string;

package/lib/logic/dynamo/logs/utils/lastEvaluatedKeyToString.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.lastEvaluatedKeyToString = void 0;
+function lastEvaluatedKeyToString(lastEvaluatedKey) {
+    return Buffer.from(JSON.stringify(lastEvaluatedKey)).toString('base64');
+}
+exports.lastEvaluatedKeyToString = lastEvaluatedKeyToString;

package/lib/logic/dynamo/logs/utils/stringToLastEvaluatedKey.d.ts

@@ -0,0 +1 @@
+export declare function stringToLastEvaluatedKey(encodedKey: string): any;

package/lib/logic/dynamo/logs/utils/stringToLastEvaluatedKey.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringToLastEvaluatedKey = void 0;
+function stringToLastEvaluatedKey(encodedKey) {
+    return JSON.parse(Buffer.from(encodedKey, 'base64').toString());
+}
+exports.stringToLastEvaluatedKey = stringToLastEvaluatedKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",