quidproquo-actionprocessor-awslambda 0.0.95 → 0.0.97

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/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/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/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/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.95",
+  "version": "0.0.97",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",