quidproquo-actionprocessor-awslambda 0.0.218 → 0.0.220

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

@@ -8,6 +8,7 @@ import getUserDirectoryForgetPasswordActionProcessor from './getUserDirectoryFor
 import getUserDirectoryGetUserAttributesActionProcessor from './getUserDirectoryGetUserAttributesActionProcessor';
 import getUserDirectoryGetUserAttributesByUserIdActionProcessor from './getUserDirectoryGetUserAttributesByUserIdActionProcessor';
 import getUserDirectoryGetUsersActionProcessor from './getUserDirectoryGetUsersActionProcessor';
+import getUserDirectoryGetUsersByAttributeActionProcessor from './getUserDirectoryGetUsersByAttributeActionProcessor';
 import getUserDirectoryReadAccessTokenActionProcessor from './getUserDirectoryReadAccessTokenActionProcessor';
 import getUserDirectoryRefreshTokenActionProcessor from './getUserDirectoryRefreshTokenActionProcessor';
 import getUserDirectoryRequestEmailVerificationActionProcessor from './getUserDirectoryRequestEmailVerificationActionProcessor';
@@ -26,6 +27,7 @@ export default (qpqConfig) => ({
     ...getUserDirectoryGetUserAttributesActionProcessor(qpqConfig),
     ...getUserDirectoryGetUserAttributesByUserIdActionProcessor(qpqConfig),
     ...getUserDirectoryGetUsersActionProcessor(qpqConfig),
+    ...getUserDirectoryGetUsersByAttributeActionProcessor(qpqConfig),
     ...getUserDirectoryReadAccessTokenActionProcessor(qpqConfig),
     ...getUserDirectoryRefreshTokenActionProcessor(qpqConfig),
     ...getUserDirectoryRequestEmailVerificationActionProcessor(qpqConfig),

package/lib/esm/logic/cognito/authenticateUser.d.ts

@@ -1,2 +1,2 @@
 import { AuthenticateUserResponse } from 'quidproquo-core';
-export declare const authenticateUser: (userPoolId: string, clientId: string, region: string, username: string, password: string) => Promise<AuthenticateUserResponse>;
+export declare const authenticateUser: (userPoolId: string, clientId: string, region: string, isCustom: boolean, username: string, password?: string) => Promise<AuthenticateUserResponse>;

package/lib/esm/logic/cognito/authenticateUser.js

@@ -4,22 +4,24 @@ import { getUserPoolClientSecret } from './getUserPoolClientSecret';
 import { cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo } from './utils/transformCognitoResponse';
 import { createAwsClient } from '../createAwsClient';
 // TODO: retry for TooManyRequestsException
-export const authenticateUser = async (userPoolId, clientId, region, username, password) => {
+export const authenticateUser = async (userPoolId, clientId, region, isCustom, username, password) => {
     const cognitoClient = createAwsClient(CognitoIdentityProviderClient, { region });
     const clientSecret = await getUserPoolClientSecret(userPoolId, clientId, region);
     const secretHash = calculateSecretHash(username, clientId, clientSecret);
     // Time we issued the request
     const issueDateTime = new Date().toISOString();
     const params = {
-        AuthFlow: AuthFlowType.ADMIN_USER_PASSWORD_AUTH,
+        AuthFlow: isCustom ? AuthFlowType.CUSTOM_AUTH : AuthFlowType.ADMIN_USER_PASSWORD_AUTH,
         UserPoolId: userPoolId,
         ClientId: clientId,
         AuthParameters: {
             USERNAME: username,
-            PASSWORD: password,
             SECRET_HASH: secretHash,
         },
     };
+    if (password) {
+        params.AuthParameters.PASSWORD = password;
+    }
     const response = await cognitoClient.send(new AdminInitiateAuthCommand(params));
     return cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo(response, issueDateTime);
 };

package/lib/esm/logic/cognito/cognitoAttributeMap.d.ts

@@ -8,3 +8,4 @@ export declare const getQpqAttributesFromCognitoUserAttributes: (cognitoUserAttr
     Name: string;
     Value: string;
 }[]) => UserAttributes;
+export declare const getQpqAttributesFromCognitoStringMap: (cognitoUserAttributes: Record<string, string>) => UserAttributes;

package/lib/esm/logic/cognito/cognitoAttributeMap.js

@@ -28,18 +28,28 @@ export const getCognitoUserAttributesFromQpqUserAttributes = (userAttributes) =>
     }))
         .filter((attribute) => !!attribute.Name && !!attribute.Value);
 };
+const getQpqAttributeObjectFromCognitoKeyValue = (key, value) => {
+    const userAttributeKey = reversedCognitoAttributeMap[key];
+    if (!userAttributeKey) {
+        return {}; // If there's no matching key in your mapping, just return nothing
+    }
+    if (userAttributeKey === 'emailVerified') {
+        // Assume the value of 'email_verified' is a string of 'true' or 'false'
+        return { [userAttributeKey]: value === 'true' };
+    }
+    return { [userAttributeKey]: value };
+};
 export const getQpqAttributesFromCognitoUserAttributes = (cognitoUserAttributes) => {
     // Map cognitoUserAttributes to your UserAttributes format
     const userAttributes = cognitoUserAttributes.reduce((acc, { Name, Value }) => {
-        const userAttributeKey = reversedCognitoAttributeMap[Name];
-        if (!userAttributeKey) {
-            return acc; // If there's no matching key in your mapping, just continue with the current accumulation
-        }
-        if (userAttributeKey === 'emailVerified') {
-            // Assume the value of 'email_verified' is a string of 'true' or 'false'
-            return { ...acc, [userAttributeKey]: Value === 'true' };
-        }
-        return { ...acc, [userAttributeKey]: Value };
+        return { ...acc, ...getQpqAttributeObjectFromCognitoKeyValue(Name, Value) };
     }, {});
     return userAttributes;
 };
+export const getQpqAttributesFromCognitoStringMap = (cognitoUserAttributes) => {
+    const userAttributes = Object.keys(cognitoUserAttributes).reduce((acc, key) => ({
+        ...acc,
+        ...getQpqAttributeObjectFromCognitoKeyValue(key, cognitoUserAttributes[key]),
+    }), {});
+    return userAttributes;
+};

package/lib/esm/logic/cognito/confirmForgotPassword.js

@@ -16,6 +16,6 @@ export const confirmForgotPassword = async (userPoolId, clientId, region, code,
     };
     await cognitoClient.send(new ConfirmForgotPasswordCommand(params));
     // Authenticate the user
-    const authResponse = await authenticateUser(userPoolId, clientId, region, username, password);
+    const authResponse = await authenticateUser(userPoolId, clientId, region, false, username, password);
     return authResponse;
 };

package/lib/esm/logic/cognito/createUser.js

@@ -21,6 +21,6 @@ export const createUser = async (userPoolId, region, clientId, createUserRequest
     // Set the user's password
     await setUserPassword(region, userPoolId, username, createUserRequest.password);
     // Authenticate the user
-    const authResponse = await authenticateUser(userPoolId, clientId, region, username, createUserRequest.password);
+    const authResponse = await authenticateUser(userPoolId, clientId, region, false, username, createUserRequest.password);
     return authResponse;
 };

package/lib/esm/logic/cognito/listPagedUsersByAttribute.d.ts

@@ -0,0 +1,2 @@
+import { UserAttributes, QpqPagedData } from 'quidproquo-core';
+export declare const listPagedUsersByAttribute: (userPoolId: string, region: string, attributeName: string, attributeValue: string, limit?: number, pageKey?: string) => Promise<QpqPagedData<UserAttributes>>;

package/lib/esm/logic/cognito/listPagedUsersByAttribute.js

@@ -0,0 +1,21 @@
+import { CognitoIdentityProviderClient, ListUsersCommand } from '@aws-sdk/client-cognito-identity-provider';
+import { getQpqAttributesFromCognitoUserAttributes } from './cognitoAttributeMap';
+import { pageKeyToPaginationToken, paginationTokenToPageKey } from './utils';
+import { createAwsClient } from '../createAwsClient';
+export const listPagedUsersByAttribute = async (userPoolId, region, attributeName, attributeValue, limit, pageKey) => {
+    const cognitoClient = createAwsClient(CognitoIdentityProviderClient, { region });
+    const response = await cognitoClient.send(new ListUsersCommand({
+        UserPoolId: userPoolId,
+        Limit: limit,
+        Filter: `${attributeName} = "${attributeValue}"`,
+        PaginationToken: pageKeyToPaginationToken(pageKey),
+    }));
+    const users = (response.Users || []).map((user) => {
+        const validAttributes = (user.Attributes || []).filter((attr) => attr.Name && attr.Value);
+        return getQpqAttributesFromCognitoUserAttributes(validAttributes);
+    });
+    return {
+        nextPageKey: paginationTokenToPageKey(response.PaginationToken),
+        items: users,
+    };
+};

package/lib/esm/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/esm/logic/cognito/respondToAuthChallengeChallenge.js

@@ -1,14 +1,14 @@
-import { CognitoIdentityProviderClient, RespondToAuthChallengeCommand, ChallengeNameType, } from '@aws-sdk/client-cognito-identity-provider';
+import { CognitoIdentityProviderClient, RespondToAuthChallengeCommand, } from '@aws-sdk/client-cognito-identity-provider';
 import { calculateSecretHash } from './utils/calculateSecretHash';
 import { getUserPoolClientSecret } from './getUserPoolClientSecret';
 import { cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo } from './utils/transformCognitoResponse';
 import { createAwsClient } from '../createAwsClient';
-export const respondToAuthChallengeChallenge = async (userPoolId, clientId, region, username, session, attributes) => {
+export const respondToAuthChallengeChallenge = async (userPoolId, clientId, region, username, session, challengeNameType, attributes) => {
     const cognitoClient = createAwsClient(CognitoIdentityProviderClient, { region });
     const clientSecret = await getUserPoolClientSecret(userPoolId, clientId, region);
     const secretHash = calculateSecretHash(username, clientId, clientSecret);
     const params = {
-        ChallengeName: ChallengeNameType.NEW_PASSWORD_REQUIRED,
+        ChallengeName: challengeNameType,
         ClientId: clientId,
         Session: session,
         ChallengeResponses: {

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

@@ -1,5 +1,5 @@
-import { AuthenticateUserChallenge, } from 'quidproquo-core';
-import { ChallengeNameType, } from '@aws-sdk/client-cognito-identity-provider';
+import { AuthenticateUserChallenge } from 'quidproquo-core';
+import { ChallengeNameType } from '@aws-sdk/client-cognito-identity-provider';
 export const cognitoAuthenticationResultTypeToQpqAuthenticationInfo = (authResult, issueDateTime) => {
     // Parse the issueDateTime and add the expiresIn to get the expiration date
     let issueDate = new Date(issueDateTime);
@@ -20,15 +20,18 @@ export const cognitoChallengeNameTypeToQpqAuthenticateUserChallenge = (cognitoCh
     }
     const map = {
         [ChallengeNameType.NEW_PASSWORD_REQUIRED]: AuthenticateUserChallenge.NEW_PASSWORD_REQUIRED,
+        [ChallengeNameType.CUSTOM_CHALLENGE]: 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;
 };
 export const cognitoAdminInitiateAuthResponseToQpqAuthenticationInfo = (authResponse, issueDateTime) => {
+    console.log('authResponse XYZ', authResponse);
     const res = {
         session: authResponse.Session,
         challenge: cognitoChallengeNameTypeToQpqAuthenticateUserChallenge(authResponse.ChallengeName),
+        challengeParameters: authResponse.ChallengeParameters,
     };
     if (authResponse.AuthenticationResult) {
         res.authenticationInfo = cognitoAuthenticationResultTypeToQpqAuthenticationInfo(authResponse.AuthenticationResult, issueDateTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.218",
+  "version": "0.0.220",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -51,9 +51,9 @@
     "lodash": "^4.17.21",
     "node-cache": "^5.1.2",
     "node-match-path": "^0.6.3",
-    "quidproquo-config-aws": "0.0.218",
-    "quidproquo-core": "0.0.218",
-    "quidproquo-webserver": "0.0.218"
+    "quidproquo-config-aws": "0.0.220",
+    "quidproquo-core": "0.0.220",
+    "quidproquo-webserver": "0.0.220"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",
@@ -61,7 +61,7 @@
     "@types/jsonwebtoken": "^9.0.2",
     "@types/lodash": "^4.14.194",
     "@types/node": "^18.11.9",
-    "quidproquo-tsconfig": "0.0.218",
+    "quidproquo-tsconfig": "0.0.220",
     "typescript": "^4.9.3"
   }
 }