quidproquo-actionprocessor-awslambda 0.0.259 → 0.0.261

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryAuthenticateUserActionProcessor.js

@@ -15,13 +15,15 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const authenticateUser_1 = require("../../../logic/cognito/authenticateUser");
+const resolveUsernameByPreferredUsername_1 = require("../../../logic/cognito/resolveUsernameByPreferredUsername");
 const getProcessAuthenticateUser = (qpqConfig) => {
     return (payload) => __awaiter(void 0, void 0, void 0, function* () {
         const region = quidproquo_config_aws_1.qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(payload.userDirectoryName, qpqConfig), region);
         const userPoolClientId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolClientIdFromConfig)(payload.userDirectoryName, qpqConfig), region);
         try {
-            const authResponse = yield (0, authenticateUser_1.authenticateUser)(userPoolId, userPoolClientId, quidproquo_config_aws_1.qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), payload.authenticateUserRequest.isCustom, payload.authenticateUserRequest.email, payload.authenticateUserRequest.password);
+            const resolvedUsername = yield (0, resolveUsernameByPreferredUsername_1.resolveUsernameByPreferredUsername)(userPoolId, region, payload.authenticateUserRequest.email);
+            const authResponse = yield (0, authenticateUser_1.authenticateUser)(userPoolId, userPoolClientId, region, payload.authenticateUserRequest.isCustom, resolvedUsername, payload.authenticateUserRequest.password);
             return (0, quidproquo_core_1.actionResult)(authResponse);
         }
         catch (error) {

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryConfirmForgotPasswordActionProcessor.js

@@ -15,12 +15,14 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const confirmForgotPassword_1 = require("../../../logic/cognito/confirmForgotPassword");
+const resolveUsernameByPreferredUsername_1 = require("../../../logic/cognito/resolveUsernameByPreferredUsername");
 const getProcessConfirmForgotPassword = (qpqConfig) => {
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ userDirectoryName, code, username, password }) {
         const region = quidproquo_config_aws_1.qpqConfigAwsUtils.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, confirmForgotPassword_1.confirmForgotPassword)(userPoolId, userPoolClientId, region, code, username, password);
+        const resolvedUsername = yield (0, resolveUsernameByPreferredUsername_1.resolveUsernameByPreferredUsername)(userPoolId, region, username);
+        const authResponse = yield (0, confirmForgotPassword_1.confirmForgotPassword)(userPoolId, userPoolClientId, region, code, resolvedUsername, password);
         return (0, quidproquo_core_1.actionResult)(authResponse);
     });
 };

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryForgotPasswordActionProcessor.js

@@ -15,12 +15,14 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const forgotPassword_1 = require("../../../logic/cognito/forgotPassword");
+const resolveUsernameByPreferredUsername_1 = require("../../../logic/cognito/resolveUsernameByPreferredUsername");
 const getProcessForgotPassword = (qpqConfig) => {
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ username, userDirectoryName }) {
         const region = quidproquo_config_aws_1.qpqConfigAwsUtils.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, forgotPassword_1.forgotPassword)(userPoolId, userPoolClientId, quidproquo_config_aws_1.qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), username);
+        const resolvedUsername = yield (0, resolveUsernameByPreferredUsername_1.resolveUsernameByPreferredUsername)(userPoolId, region, username);
+        const authResponse = yield (0, forgotPassword_1.forgotPassword)(userPoolId, userPoolClientId, region, resolvedUsername);
         return (0, quidproquo_core_1.actionResult)(authResponse);
     });
 };

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesActionProcessor.js

@@ -15,12 +15,14 @@ const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const getUserAttributes_1 = require("../../../logic/cognito/getUserAttributes");
+const resolveUsernameByPreferredUsername_1 = require("../../../logic/cognito/resolveUsernameByPreferredUsername");
 const getProcessGetUserAttributes = (qpqConfig) => {
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ userDirectoryName, username }) {
         const region = quidproquo_config_aws_1.qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         try {
-            const userAttributes = yield (0, getUserAttributes_1.getUserAttributes)(userPoolId, region, username);
+            const resolvedUsername = yield (0, resolveUsernameByPreferredUsername_1.resolveUsernameByPreferredUsername)(userPoolId, region, username);
+            const userAttributes = yield (0, getUserAttributes_1.getUserAttributes)(userPoolId, region, resolvedUsername);
             return (0, quidproquo_core_1.actionResult)(userAttributes);
         }
         catch (error) {

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectorySetPasswordActionProcessor.js

@@ -14,12 +14,14 @@ const quidproquo_config_aws_1 = require("quidproquo-config-aws");
 const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
+const resolveUsernameByPreferredUsername_1 = require("../../../logic/cognito/resolveUsernameByPreferredUsername");
 const setUserPassword_1 = require("../../../logic/cognito/setUserPassword");
 const getProcessSetPassword = (qpqConfig) => {
     return (_a, session_1) => __awaiter(void 0, [_a, session_1], void 0, function* ({ userDirectoryName, newPassword, username }, session) {
         const region = quidproquo_config_aws_1.qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
-        yield (0, setUserPassword_1.setUserPassword)(region, userPoolId, username, newPassword);
+        const resolvedUsername = yield (0, resolveUsernameByPreferredUsername_1.resolveUsernameByPreferredUsername)(userPoolId, region, username);
+        yield (0, setUserPassword_1.setUserPassword)(region, userPoolId, resolvedUsername, newPassword);
         return (0, quidproquo_core_1.actionResult)(void 0);
     });
 };

package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectorySetUserAttributesActionProcessor.js

@@ -14,12 +14,14 @@ const quidproquo_config_aws_1 = require("quidproquo-config-aws");
 const quidproquo_core_1 = require("quidproquo-core");
 const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
+const resolveUsernameByPreferredUsername_1 = require("../../../logic/cognito/resolveUsernameByPreferredUsername");
 const setUserAttributes_1 = require("../../../logic/cognito/setUserAttributes");
 const getProcessSetUserAttributes = (qpqConfig) => {
     return (_a, session_1) => __awaiter(void 0, [_a, session_1], void 0, function* ({ userDirectoryName, username, userAttributes }, session) {
         const region = quidproquo_config_aws_1.qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
-        yield (0, setUserAttributes_1.setUserAttributes)(userPoolId, region, username, userAttributes);
+        const resolvedUsername = yield (0, resolveUsernameByPreferredUsername_1.resolveUsernameByPreferredUsername)(userPoolId, region, username);
+        yield (0, setUserAttributes_1.setUserAttributes)(userPoolId, region, resolvedUsername, userAttributes);
         return (0, quidproquo_core_1.actionResult)(void 0);
     });
 };

package/lib/commonjs/logic/cognito/resolveUsernameByPreferredUsername.d.ts

@@ -0,0 +1 @@
+export declare const resolveUsernameByPreferredUsername: (userPoolId: string, region: string, preferredUsername: string) => Promise<string>;

package/lib/commonjs/logic/cognito/resolveUsernameByPreferredUsername.js

@@ -0,0 +1,28 @@
+"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.resolveUsernameByPreferredUsername = void 0;
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
+const createAwsClient_1 = require("../createAwsClient");
+const resolveUsernameByPreferredUsername = (userPoolId, region, preferredUsername) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
+    const cognitoClient = (0, createAwsClient_1.createAwsClient)(client_cognito_identity_provider_1.CognitoIdentityProviderClient, {
+        region,
+    });
+    const response = yield cognitoClient.send(new client_cognito_identity_provider_1.ListUsersCommand({
+        UserPoolId: userPoolId,
+        Limit: 1,
+        Filter: `preferred_username = "${preferredUsername}"`,
+    }));
+    const resolvedUsername = (_b = (_a = response.Users) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.Username;
+    return resolvedUsername || preferredUsername;
+});
+exports.resolveUsernameByPreferredUsername = resolveUsernameByPreferredUsername;

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

@@ -3,13 +3,15 @@ import { actionResult, actionResultError, actionResultErrorFromCaughtError, User
 import { getCFExportNameUserPoolClientIdFromConfig, getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
 import { authenticateUser } from '../../../logic/cognito/authenticateUser';
+import { resolveUsernameByPreferredUsername } from '../../../logic/cognito/resolveUsernameByPreferredUsername';
 const getProcessAuthenticateUser = (qpqConfig) => {
     return async (payload) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(payload.userDirectoryName, qpqConfig), region);
         const userPoolClientId = await getExportedValue(getCFExportNameUserPoolClientIdFromConfig(payload.userDirectoryName, qpqConfig), region);
         try {
-            const authResponse = await authenticateUser(userPoolId, userPoolClientId, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), payload.authenticateUserRequest.isCustom, payload.authenticateUserRequest.email, payload.authenticateUserRequest.password);
+            const resolvedUsername = await resolveUsernameByPreferredUsername(userPoolId, region, payload.authenticateUserRequest.email);
+            const authResponse = await authenticateUser(userPoolId, userPoolClientId, region, payload.authenticateUserRequest.isCustom, resolvedUsername, payload.authenticateUserRequest.password);
             return actionResult(authResponse);
         }
         catch (error) {

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

@@ -3,12 +3,14 @@ import { actionResult, UserDirectoryActionType, } from 'quidproquo-core';
 import { getCFExportNameUserPoolClientIdFromConfig, getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
 import { confirmForgotPassword } from '../../../logic/cognito/confirmForgotPassword';
+import { resolveUsernameByPreferredUsername } from '../../../logic/cognito/resolveUsernameByPreferredUsername';
 const getProcessConfirmForgotPassword = (qpqConfig) => {
     return async ({ userDirectoryName, code, username, password }) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
         const userPoolClientId = await getExportedValue(getCFExportNameUserPoolClientIdFromConfig(userDirectoryName, qpqConfig), region);
-        const authResponse = await confirmForgotPassword(userPoolId, userPoolClientId, region, code, username, password);
+        const resolvedUsername = await resolveUsernameByPreferredUsername(userPoolId, region, username);
+        const authResponse = await confirmForgotPassword(userPoolId, userPoolClientId, region, code, resolvedUsername, password);
         return actionResult(authResponse);
     };
 };

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

@@ -3,12 +3,14 @@ import { actionResult, UserDirectoryActionType, } from 'quidproquo-core';
 import { getCFExportNameUserPoolClientIdFromConfig, getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
 import { forgotPassword } from '../../../logic/cognito/forgotPassword';
+import { resolveUsernameByPreferredUsername } from '../../../logic/cognito/resolveUsernameByPreferredUsername';
 const getProcessForgotPassword = (qpqConfig) => {
     return async ({ username, userDirectoryName }) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
         const userPoolClientId = await getExportedValue(getCFExportNameUserPoolClientIdFromConfig(userDirectoryName, qpqConfig), region);
-        const authResponse = await forgotPassword(userPoolId, userPoolClientId, qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig), username);
+        const resolvedUsername = await resolveUsernameByPreferredUsername(userPoolId, region, username);
+        const authResponse = await forgotPassword(userPoolId, userPoolClientId, region, resolvedUsername);
         return actionResult(authResponse);
     };
 };

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

@@ -3,12 +3,14 @@ import { actionResult, actionResultError, actionResultErrorFromCaughtError, User
 import { getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
 import { getUserAttributes } from '../../../logic/cognito/getUserAttributes';
+import { resolveUsernameByPreferredUsername } from '../../../logic/cognito/resolveUsernameByPreferredUsername';
 const getProcessGetUserAttributes = (qpqConfig) => {
     return async ({ userDirectoryName, username }) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
         try {
-            const userAttributes = await getUserAttributes(userPoolId, region, username);
+            const resolvedUsername = await resolveUsernameByPreferredUsername(userPoolId, region, username);
+            const userAttributes = await getUserAttributes(userPoolId, region, resolvedUsername);
             return actionResult(userAttributes);
         }
         catch (error) {

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

@@ -2,12 +2,14 @@ import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
 import { actionResult, UserDirectoryActionType, } from 'quidproquo-core';
 import { getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
+import { resolveUsernameByPreferredUsername } from '../../../logic/cognito/resolveUsernameByPreferredUsername';
 import { setUserPassword } from '../../../logic/cognito/setUserPassword';
 const getProcessSetPassword = (qpqConfig) => {
     return async ({ userDirectoryName, newPassword, username }, session) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
-        await setUserPassword(region, userPoolId, username, newPassword);
+        const resolvedUsername = await resolveUsernameByPreferredUsername(userPoolId, region, username);
+        await setUserPassword(region, userPoolId, resolvedUsername, newPassword);
         return actionResult(void 0);
     };
 };

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

@@ -2,12 +2,14 @@ import { qpqConfigAwsUtils } from 'quidproquo-config-aws';
 import { actionResult, UserDirectoryActionType, } from 'quidproquo-core';
 import { getCFExportNameUserPoolIdFromConfig } from '../../../awsNamingUtils';
 import { getExportedValue } from '../../../logic/cloudformation/getExportedValue';
+import { resolveUsernameByPreferredUsername } from '../../../logic/cognito/resolveUsernameByPreferredUsername';
 import { setUserAttributes } from '../../../logic/cognito/setUserAttributes';
 const getProcessSetUserAttributes = (qpqConfig) => {
     return async ({ userDirectoryName, username, userAttributes }, session) => {
         const region = qpqConfigAwsUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = await getExportedValue(getCFExportNameUserPoolIdFromConfig(userDirectoryName, qpqConfig), region);
-        await setUserAttributes(userPoolId, region, username, userAttributes);
+        const resolvedUsername = await resolveUsernameByPreferredUsername(userPoolId, region, username);
+        await setUserAttributes(userPoolId, region, resolvedUsername, userAttributes);
         return actionResult(void 0);
     };
 };

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

@@ -0,0 +1 @@
+export declare const resolveUsernameByPreferredUsername: (userPoolId: string, region: string, preferredUsername: string) => Promise<string>;

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

@@ -0,0 +1,14 @@
+import { CognitoIdentityProviderClient, ListUsersCommand } from '@aws-sdk/client-cognito-identity-provider';
+import { createAwsClient } from '../createAwsClient';
+export const resolveUsernameByPreferredUsername = async (userPoolId, region, preferredUsername) => {
+    const cognitoClient = createAwsClient(CognitoIdentityProviderClient, {
+        region,
+    });
+    const response = await cognitoClient.send(new ListUsersCommand({
+        UserPoolId: userPoolId,
+        Limit: 1,
+        Filter: `preferred_username = "${preferredUsername}"`,
+    }));
+    const resolvedUsername = response.Users?.[0]?.Username;
+    return resolvedUsername || preferredUsername;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.259",
+  "version": "0.0.261",
   "description": "",
   "main": "./lib/commonjs/index.js",
   "module": "./lib/esm/index.js",
@@ -57,16 +57,16 @@
     "lodash": "^4.17.21",
     "node-cache": "^5.1.2",
     "node-match-path": "^0.6.3",
-    "quidproquo-config-aws": "0.0.259",
-    "quidproquo-core": "0.0.259",
-    "quidproquo-webserver": "0.0.259"
+    "quidproquo-config-aws": "0.0.261",
+    "quidproquo-core": "0.0.261",
+    "quidproquo-webserver": "0.0.261"
   },
   "devDependencies": {
     "@types/busboy": "^1.5.0",
     "@types/jsonwebtoken": "^9.0.2",
     "@types/lodash": "^4.14.194",
     "@types/node": "^22.13.13",
-    "quidproquo-tsconfig": "0.0.259",
+    "quidproquo-tsconfig": "0.0.261",
     "typescript": "^5.8.2"
   }
 }