quidproquo-actionprocessor-awslambda 0.0.96 → 0.0.98

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

@@ -27,7 +27,7 @@ const getProcessExecuteStory = (qpqConfig, dynamicModuleLoader) => {
         }
         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}`]);
+        `${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, storyResult.error.errorText, `story error! in ${payload.src}::${payload.runtime} -> [${storyResult.error.errorStack}]`);

package/lib/getActionProcessor/core/userDirectory/getUserDirectoryReadAccessTokenActionProcessor.d.ts

@@ -0,0 +1,5 @@
+import { UserDirectoryReadAccessTokenActionProcessor, QPQConfig } from 'quidproquo-core';
+declare const _default: (qpqConfig: QPQConfig) => {
+    "@quidproquo-core/UserDirectory/ReadAccessToken": UserDirectoryReadAccessTokenActionProcessor;
+};
+export default _default;

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

@@ -0,0 +1,35 @@
+"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 });
+const quidproquo_core_1 = require("quidproquo-core");
+const awsNamingUtils_1 = require("../../../awsNamingUtils");
+const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
+const decodeValidJwt_1 = require("../../../logic/cognito/decodeValidJwt");
+const getUserDirectoryReadAccessTokenActionProcessor = (qpqConfig) => {
+    return ({ userDirectoryName, serviceOverride }, 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, serviceOverride), region);
+        const userPoolClientId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolClientIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
+        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');
+        }
+        return (0, quidproquo_core_1.actionResult)({
+            userId: authInfo.userId,
+            username: authInfo.username,
+        });
+    });
+};
+exports.default = (qpqConfig) => {
+    return {
+        [quidproquo_core_1.UserDirectoryActionType.ReadAccessToken]: getUserDirectoryReadAccessTokenActionProcessor(qpqConfig),
+    };
+};

package/lib/getActionProcessor/core/userDirectory/index.d.ts

@@ -2,6 +2,7 @@ import { QPQConfig } from 'quidproquo-core';
 declare const _default: (qpqConfig: QPQConfig) => {
     "@quidproquo-core/UserDirectory/RequestEmailVerification": import("quidproquo-core").UserDirectoryRequestEmailVerificationActionProcessor;
     "@quidproquo-core/UserDirectory/RefreshToken": import("quidproquo-core").UserDirectoryRefreshTokenActionProcessor;
+    "@quidproquo-core/UserDirectory/ReadAccessToken": import("quidproquo-core").UserDirectoryReadAccessTokenActionProcessor;
     "@quidproquo-core/UserDirectory/ForgotPassword": import("quidproquo-core").UserDirectoryForgotPasswordActionProcessor;
     "@quidproquo-core/UserDirectory/CreateUser": import("quidproquo-core").UserDirectoryCreateUserActionProcessor;
     "@quidproquo-core/UserDirectory/ConfirmForgotPassword": import("quidproquo-core").UserDirectoryConfirmForgotPasswordActionProcessor;

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

@@ -8,6 +8,7 @@ const getUserDirectoryConfirmEmailVerificationActionProcessor_1 = __importDefaul
 const getUserDirectoryConfirmForgetPasswordActionProcessor_1 = __importDefault(require("./getUserDirectoryConfirmForgetPasswordActionProcessor"));
 const getUserDirectoryCreateUserActionProcessor_1 = __importDefault(require("./getUserDirectoryCreateUserActionProcessor"));
 const getUserDirectoryForgetPasswordActionProcessor_1 = __importDefault(require("./getUserDirectoryForgetPasswordActionProcessor"));
+const getUserDirectoryReadAccessTokenActionProcessor_1 = __importDefault(require("./getUserDirectoryReadAccessTokenActionProcessor"));
 const getUserDirectoryRefreshTokenActionProcessor_1 = __importDefault(require("./getUserDirectoryRefreshTokenActionProcessor"));
 const getUserDirectoryRequestEmailVerificationActionProcessor_1 = __importDefault(require("./getUserDirectoryRequestEmailVerificationActionProcessor"));
-exports.default = (qpqConfig) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (0, getUserDirectoryAuthenticateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmEmailVerificationActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryCreateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRefreshTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRequestEmailVerificationActionProcessor_1.default)(qpqConfig)));
+exports.default = (qpqConfig) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (0, getUserDirectoryAuthenticateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmEmailVerificationActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryCreateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryReadAccessTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRefreshTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRequestEmailVerificationActionProcessor_1.default)(qpqConfig)));

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

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

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

@@ -14,6 +14,7 @@ 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 getLogByCorrelation_1 = require("../../../logic/dynamo/getLogByCorrelation");
 const readTextFile_1 = require("../../../logic/s3/readTextFile");
 // TODO: Centralize this
 const QPQ_LOG_BUCKET_NAME = 'logs';
@@ -27,12 +28,20 @@ const getAdminGetLogsActionProcessor = (qpqConfig) => {
 };
 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 tableName = (0, awsNamingUtils_1.getQpqRuntimeResourceNameFromConfig)(QPQ_LOG_BUCKET_NAME, qpqConfig, 'flog');
         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 getLogMetadataActionProcessor = (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, getLogByCorrelation_1.getLogByCorrelation)(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');
@@ -47,5 +56,6 @@ exports.default = (qpqConfig) => {
         [quidproquo_webserver_1.AdminActionType.GetLogs]: getAdminGetLogsActionProcessor(qpqConfig),
         [quidproquo_webserver_1.AdminActionType.GetLog]: getAdminGetLogActionProcessor(qpqConfig),
         [quidproquo_webserver_1.AdminActionType.GetLogMetadataChildren]: getLogMetadataChildrenActionProcessor(qpqConfig),
+        [quidproquo_webserver_1.AdminActionType.GetLogMetadata]: getLogMetadataActionProcessor(qpqConfig),
     };
 };

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

@@ -3,5 +3,6 @@ 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;
+    "@quidproquo-webserver/Admin/GetLogMetadata": import("quidproquo-webserver/lib").AdminGetLogMetadataActionProcessor;
 };
 export default _default;

package/lib/logic/dynamo/getLogChildrenByFromCorrelation.js

@@ -17,8 +17,11 @@ function getLogChildrenByFromCorrelation(tableName, region, fromCorrelation, pag
         const dynamoDBClient = new client_dynamodb_1.DynamoDBClient({ region });
         const queryParams = {
             TableName: tableName,
-            IndexName: 'FromCorrelationIndex',
-            KeyConditionExpression: 'fromCorrelation = :fromCorrelation',
+            // removed IndexName
+            KeyConditionExpression: '#fromCorrelation = :fromCorrelation',
+            ExpressionAttributeNames: {
+                '#fromCorrelation': 'fromCorrelation', // define attribute name
+            },
             ExpressionAttributeValues: {
                 ':fromCorrelation': { S: fromCorrelation },
             },

package/package.json

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