quidproquo-actionprocessor-awslambda 0.0.185 → 0.0.187

package/lib/commonjs/awsNamingUtils.d.ts

@@ -10,13 +10,13 @@ export declare const getConfigRuntimeResourceNameFromConfigWithServiceOverride:
 export declare const getQpqRuntimeResourceName: (resourceName: string, application: string, service: string, environment: string, feature?: string, resourceType?: string) => string;
 export declare const getQpqRuntimeResourceNameFromConfig: (resourceName: ResourceName, qpqConfig: QPQConfig, resourceType?: string) => string;
 export declare const getKvsDynamoTableNameFromConfig: (resourceName: string, qpqConfig: QPQConfig, resourceType?: string) => string;
-export declare const getCFExportNameUserPoolIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
+export declare const getCFExportNameUserPoolIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig) => string;
 export declare const getCFExportNameCachePolicyIdFromConfig: (cacheConfigName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
-export declare const getCFExportNameUserPoolClientIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
+export declare const getCFExportNameUserPoolClientIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig) => string;
 export declare const getCFExportNameApiKeyIdFromConfig: (apiKeyName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
 export declare const getCFExportNameSnsTopicArnFromConfig: (eventBusName: string, qpqConfig: QPQConfig, applicationOverride?: string) => string;
 export declare const getCFExportNameDistributionIdArnFromConfig: (webEntryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
-export declare const getCFExportNameWebsocketApiIdFromConfig: (websocketApiName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
+export declare const getCFExportNameWebsocketApiIdFromConfig: (websocketApiName: string, qpqConfig: QPQConfig) => string;
 export declare const getEventBusSnsTopicArn: (eventBusName: string, qpqConfig: QPQConfig, module: string, environment: string, application: string, feature?: string) => string;
 export declare const getBaseStackName: (qpqConfig: QPQConfig) => string;
 export declare const getInfStackName: (qpqConfig: QPQConfig) => string;

package/lib/commonjs/awsNamingUtils.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBootstrapStackName = exports.getApiStackName = exports.getWebStackName = exports.getInfStackName = exports.getBaseStackName = exports.getEventBusSnsTopicArn = exports.getCFExportNameWebsocketApiIdFromConfig = exports.getCFExportNameDistributionIdArnFromConfig = exports.getCFExportNameSnsTopicArnFromConfig = exports.getCFExportNameApiKeyIdFromConfig = exports.getCFExportNameUserPoolClientIdFromConfig = exports.getCFExportNameCachePolicyIdFromConfig = exports.getCFExportNameUserPoolIdFromConfig = exports.getKvsDynamoTableNameFromConfig = exports.getQpqRuntimeResourceNameFromConfig = exports.getQpqRuntimeResourceName = exports.getConfigRuntimeResourceNameFromConfigWithServiceOverride = exports.getConfigRuntimeBootstrapResourceNameFromConfig = exports.resolveConfigRuntimeResourceNameFromConfig = exports.getConfigRuntimeResourceNameFromConfig = exports.getConfigRuntimeBootstrapResourceName = exports.getConfigRuntimeResourceName = exports.getGlobalQpqRuntimeResourceName = exports.getGlobalConfigRuntimeResourceName = void 0;
 const quidproquo_core_1 = require("quidproquo-core");
 const quidproquo_config_aws_1 = require("quidproquo-config-aws");
+const quidproquo_webserver_1 = require("quidproquo-webserver");
 const getGlobalConfigRuntimeResourceName = (resourceName, application, environment, feature) => {
     const baseName = `${resourceName}-${application}-${environment}`;
     if (feature) {
@@ -91,12 +92,16 @@ const getKvsDynamoTableNameFromConfig = (resourceName, qpqConfig, resourceType =
     return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, resourceType);
 };
 exports.getKvsDynamoTableNameFromConfig = getKvsDynamoTableNameFromConfig;
-const getCFExportNameUserPoolIdFromConfig = (userDirectoryName, qpqConfig, serviceOverride, applicationOverride) => {
-    const application = applicationOverride || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
-    const service = serviceOverride || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
-    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-    return (0, exports.getQpqRuntimeResourceName)(userDirectoryName, application, service, environment, feature, 'user-pool-id-export');
+const getCFExportNameUserPoolIdFromConfig = (userDirectoryName, qpqConfig) => {
+    var _a, _b, _c, _d, _e;
+    const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectoryByName(userDirectoryName, qpqConfig);
+    const application = ((_a = userDirectoryConfig.owner) === null || _a === void 0 ? void 0 : _a.application) || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
+    const service = ((_b = userDirectoryConfig.owner) === null || _b === void 0 ? void 0 : _b.module) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const environment = ((_c = userDirectoryConfig.owner) === null || _c === void 0 ? void 0 : _c.environment) ||
+        quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+    const feature = ((_d = userDirectoryConfig.owner) === null || _d === void 0 ? void 0 : _d.feature) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    const resourceName = ((_e = userDirectoryConfig.owner) === null || _e === void 0 ? void 0 : _e.resourceNameOverride) || userDirectoryName;
+    return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, 'user-pool-id-export');
 };
 exports.getCFExportNameUserPoolIdFromConfig = getCFExportNameUserPoolIdFromConfig;
 const getCFExportNameCachePolicyIdFromConfig = (cacheConfigName, qpqConfig, serviceOverride, applicationOverride) => {
@@ -107,12 +112,16 @@ const getCFExportNameCachePolicyIdFromConfig = (cacheConfigName, qpqConfig, serv
     return (0, exports.getQpqRuntimeResourceName)(cacheConfigName, application, service, environment, feature, 'cache-policy-name-export');
 };
 exports.getCFExportNameCachePolicyIdFromConfig = getCFExportNameCachePolicyIdFromConfig;
-const getCFExportNameUserPoolClientIdFromConfig = (userDirectoryName, qpqConfig, serviceOverride, applicationOverride) => {
-    const application = applicationOverride || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
-    const service = serviceOverride || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
-    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-    return (0, exports.getQpqRuntimeResourceName)(userDirectoryName, application, service, environment, feature, 'user-pool-client-id-export');
+const getCFExportNameUserPoolClientIdFromConfig = (userDirectoryName, qpqConfig) => {
+    var _a, _b, _c, _d, _e;
+    const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectoryByName(userDirectoryName, qpqConfig);
+    const application = ((_a = userDirectoryConfig.owner) === null || _a === void 0 ? void 0 : _a.application) || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
+    const service = ((_b = userDirectoryConfig.owner) === null || _b === void 0 ? void 0 : _b.module) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const environment = ((_c = userDirectoryConfig.owner) === null || _c === void 0 ? void 0 : _c.environment) ||
+        quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+    const feature = ((_d = userDirectoryConfig.owner) === null || _d === void 0 ? void 0 : _d.feature) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    const resourceName = ((_e = userDirectoryConfig.owner) === null || _e === void 0 ? void 0 : _e.resourceNameOverride) || userDirectoryName;
+    return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, 'user-pool-client-id-export');
 };
 exports.getCFExportNameUserPoolClientIdFromConfig = getCFExportNameUserPoolClientIdFromConfig;
 const getCFExportNameApiKeyIdFromConfig = (apiKeyName, qpqConfig, serviceOverride, applicationOverride) => {
@@ -138,12 +147,16 @@ const getCFExportNameDistributionIdArnFromConfig = (webEntryName, qpqConfig, ser
     return (0, exports.getQpqRuntimeResourceName)(webEntryName, application, service, environment, feature, 'distribution-id-export');
 };
 exports.getCFExportNameDistributionIdArnFromConfig = getCFExportNameDistributionIdArnFromConfig;
-const getCFExportNameWebsocketApiIdFromConfig = (websocketApiName, qpqConfig, serviceOverride, applicationOverride) => {
-    const application = applicationOverride || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
-    const service = serviceOverride || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
-    const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
-    const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
-    return (0, exports.getQpqRuntimeResourceName)(websocketApiName, application, service, environment, feature, 'websocket-api-id-export');
+const getCFExportNameWebsocketApiIdFromConfig = (websocketApiName, qpqConfig) => {
+    var _a, _b, _c, _d, _e;
+    const websocketApiConfig = quidproquo_webserver_1.qpqWebServerUtils.getWebsocketEntryByApiName(websocketApiName, qpqConfig);
+    const application = ((_a = websocketApiConfig.owner) === null || _a === void 0 ? void 0 : _a.application) || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
+    const service = ((_b = websocketApiConfig.owner) === null || _b === void 0 ? void 0 : _b.module) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
+    const environment = ((_c = websocketApiConfig.owner) === null || _c === void 0 ? void 0 : _c.environment) ||
+        quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
+    const feature = ((_d = websocketApiConfig.owner) === null || _d === void 0 ? void 0 : _d.feature) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
+    const resourceName = ((_e = websocketApiConfig.owner) === null || _e === void 0 ? void 0 : _e.resourceNameOverride) || websocketApiName;
+    return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, 'websocket-api-id-export');
 };
 exports.getCFExportNameWebsocketApiIdFromConfig = getCFExportNameWebsocketApiIdFromConfig;
 const getEventBusSnsTopicArn = (eventBusName, qpqConfig, module, environment, application, feature) => {

package/lib/commonjs/getActionProcessor/core/event/utils/isAuthValid.js

@@ -33,7 +33,7 @@ const isAuthValidForCognito = (qpqConfig, authSettings, authHeader) => __awaiter
     const userDirectoryName = authSettings.userDirectoryName;
     const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
     // Resolve the user pool id
-    const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, authSettings.serviceName, authSettings.applicationName), region);
+    const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
     // Verify the token
     return yield (0, verifyJwt_1.verifyJwt)(accessToken, userPoolId, region, false);
 });

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

@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const decodeValidJwt_1 = require("../../../logic/cognito/decodeValidJwt");
 const getUserDirectoryDecodeAccessTokenActionProcessor = (qpqConfig) => {
-    return ({ userDirectoryName, accessToken, ignoreExpiration, serviceOverride }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, accessToken, ignoreExpiration }) => __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 userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         const authInfo = yield (0, decodeValidJwt_1.decodeValidJwt)(userPoolId, region, ignoreExpiration, 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');

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

@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const getUserAttributes_1 = require("../../../logic/cognito/getUserAttributes");
 const getUserDirectoryGetUserAttributesActionProcessor = (qpqConfig) => {
-    return ({ userDirectoryName, serviceOverride, username }, session) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, username }, 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 userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         const userAttributes = yield (0, getUserAttributes_1.getUserAttributes)(userPoolId, region, username);
         return (0, quidproquo_core_1.actionResult)(userAttributes);
     });

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

@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const getUserAttributesBySub_1 = require("../../../logic/cognito/getUserAttributesBySub");
 const getUserDirectoryGetUserAttributesByUserIdActionProcessor = (qpqConfig) => {
-    return ({ userDirectoryName, serviceOverride, userId }, session) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, userId }, 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 userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         const userAttributes = yield (0, getUserAttributesBySub_1.getUserAttributesBySub)(userPoolId, region, userId);
         return (0, quidproquo_core_1.actionResult)(userAttributes);
     });

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

@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const listPagedUsers_1 = require("../../../logic/cognito/listPagedUsers");
 const getUserDirectoryGetUsersActionProcessor = (qpqConfig) => {
-    return ({ userDirectoryName, serviceOverride, nextPageKey }, session) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, nextPageKey }, 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 userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         const userAttributes = yield (0, listPagedUsers_1.listPagedUsers)(userPoolId, region, nextPageKey);
         return (0, quidproquo_core_1.actionResult)(userAttributes);
     });

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

@@ -14,9 +14,9 @@ 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, ignoreExpiration }, session) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, ignoreExpiration }, 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 userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         const authInfo = yield (0, decodeValidJwt_1.decodeValidJwt)(userPoolId, region, ignoreExpiration, 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');

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

@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
 const setUserAttributes_1 = require("../../../logic/cognito/setUserAttributes");
 const getUserDirectorySetUserAttributesActionProcessor = (qpqConfig) => {
-    return ({ userDirectoryName, serviceOverride, username, userAttributes }, session) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ userDirectoryName, username, userAttributes }, 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 userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
         yield (0, setUserAttributes_1.setUserAttributes)(userPoolId, region, username, userAttributes);
         return (0, quidproquo_core_1.actionResult)(void 0);
     });

package/package.json

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