quidproquo-actionprocessor-awslambda 0.0.95 → 0.0.96

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/package.json

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