quidproquo-actionprocessor-awslambda 0.0.184 → 0.0.186

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/lib/commonjs/awsNamingUtils.d.ts +2 -2
  2. package/lib/commonjs/awsNamingUtils.js +20 -12
  3. package/lib/commonjs/getActionProcessor/core/event/utils/isAuthValid.js +1 -1
  4. package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryDecodeAccessTokenActionProcessor.js +2 -2
  5. package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesActionProcessor.js +2 -2
  6. package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesByUserIdActionProcessor.js +2 -2
  7. package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUsersActionProcessor.js +2 -2
  8. package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryReadAccessTokenActionProcessor.js +2 -2
  9. package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectorySetUserAttributesActionProcessor.js +2 -2
  10. package/package.json +5 -5
package/lib/commonjs/awsNamingUtils.d.ts CHANGED
@@ -10,9 +10,9 @@ export declare const getConfigRuntimeResourceNameFromConfigWithServiceOverride:
10
10
  export declare const getQpqRuntimeResourceName: (resourceName: string, application: string, service: string, environment: string, feature?: string, resourceType?: string) => string;
11
11
  export declare const getQpqRuntimeResourceNameFromConfig: (resourceName: ResourceName, qpqConfig: QPQConfig, resourceType?: string) => string;
12
12
  export declare const getKvsDynamoTableNameFromConfig: (resourceName: string, qpqConfig: QPQConfig, resourceType?: string) => string;
13
- export declare const getCFExportNameUserPoolIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
13
+ export declare const getCFExportNameUserPoolIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig) => string;
14
14
  export declare const getCFExportNameCachePolicyIdFromConfig: (cacheConfigName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
15
- export declare const getCFExportNameUserPoolClientIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
15
+ export declare const getCFExportNameUserPoolClientIdFromConfig: (userDirectoryName: string, qpqConfig: QPQConfig) => string;
16
16
  export declare const getCFExportNameApiKeyIdFromConfig: (apiKeyName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
17
17
  export declare const getCFExportNameSnsTopicArnFromConfig: (eventBusName: string, qpqConfig: QPQConfig, applicationOverride?: string) => string;
18
18
  export declare const getCFExportNameDistributionIdArnFromConfig: (webEntryName: string, qpqConfig: QPQConfig, serviceOverride?: string, applicationOverride?: string) => string;
package/lib/commonjs/awsNamingUtils.js CHANGED
@@ -91,12 +91,16 @@ const getKvsDynamoTableNameFromConfig = (resourceName, qpqConfig, resourceType =
91
91
  return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, resourceType);
92
92
  };
93
93
  exports.getKvsDynamoTableNameFromConfig = getKvsDynamoTableNameFromConfig;
94
- const getCFExportNameUserPoolIdFromConfig = (userDirectoryName, qpqConfig, serviceOverride, applicationOverride) => {
95
- const application = applicationOverride || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
96
- const service = serviceOverride || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
97
- const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
98
- const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
99
- return (0, exports.getQpqRuntimeResourceName)(userDirectoryName, application, service, environment, feature, 'user-pool-id-export');
94
+ const getCFExportNameUserPoolIdFromConfig = (userDirectoryName, qpqConfig) => {
95
+ var _a, _b, _c, _d, _e;
96
+ const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectoryByName(userDirectoryName, qpqConfig);
97
+ const application = ((_a = userDirectoryConfig.owner) === null || _a === void 0 ? void 0 : _a.application) || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
98
+ const service = ((_b = userDirectoryConfig.owner) === null || _b === void 0 ? void 0 : _b.module) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
99
+ const environment = ((_c = userDirectoryConfig.owner) === null || _c === void 0 ? void 0 : _c.environment) ||
100
+ quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
101
+ const feature = ((_d = userDirectoryConfig.owner) === null || _d === void 0 ? void 0 : _d.feature) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
102
+ const resourceName = ((_e = userDirectoryConfig.owner) === null || _e === void 0 ? void 0 : _e.resourceNameOverride) || userDirectoryName;
103
+ return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, 'user-pool-id-export');
100
104
  };
101
105
  exports.getCFExportNameUserPoolIdFromConfig = getCFExportNameUserPoolIdFromConfig;
102
106
  const getCFExportNameCachePolicyIdFromConfig = (cacheConfigName, qpqConfig, serviceOverride, applicationOverride) => {
@@ -107,12 +111,16 @@ const getCFExportNameCachePolicyIdFromConfig = (cacheConfigName, qpqConfig, serv
107
111
  return (0, exports.getQpqRuntimeResourceName)(cacheConfigName, application, service, environment, feature, 'cache-policy-name-export');
108
112
  };
109
113
  exports.getCFExportNameCachePolicyIdFromConfig = getCFExportNameCachePolicyIdFromConfig;
110
- const getCFExportNameUserPoolClientIdFromConfig = (userDirectoryName, qpqConfig, serviceOverride, applicationOverride) => {
111
- const application = applicationOverride || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
112
- const service = serviceOverride || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
113
- const environment = quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
114
- const feature = quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
115
- return (0, exports.getQpqRuntimeResourceName)(userDirectoryName, application, service, environment, feature, 'user-pool-client-id-export');
114
+ const getCFExportNameUserPoolClientIdFromConfig = (userDirectoryName, qpqConfig) => {
115
+ var _a, _b, _c, _d, _e;
116
+ const userDirectoryConfig = quidproquo_core_1.qpqCoreUtils.getUserDirectoryByName(userDirectoryName, qpqConfig);
117
+ const application = ((_a = userDirectoryConfig.owner) === null || _a === void 0 ? void 0 : _a.application) || quidproquo_core_1.qpqCoreUtils.getApplicationName(qpqConfig);
118
+ const service = ((_b = userDirectoryConfig.owner) === null || _b === void 0 ? void 0 : _b.module) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleName(qpqConfig);
119
+ const environment = ((_c = userDirectoryConfig.owner) === null || _c === void 0 ? void 0 : _c.environment) ||
120
+ quidproquo_core_1.qpqCoreUtils.getApplicationModuleEnvironment(qpqConfig);
121
+ const feature = ((_d = userDirectoryConfig.owner) === null || _d === void 0 ? void 0 : _d.feature) || quidproquo_core_1.qpqCoreUtils.getApplicationModuleFeature(qpqConfig);
122
+ const resourceName = ((_e = userDirectoryConfig.owner) === null || _e === void 0 ? void 0 : _e.resourceNameOverride) || userDirectoryName;
123
+ return (0, exports.getQpqRuntimeResourceName)(resourceName, application, service, environment, feature, 'user-pool-client-id-export');
116
124
  };
117
125
  exports.getCFExportNameUserPoolClientIdFromConfig = getCFExportNameUserPoolClientIdFromConfig;
118
126
  const getCFExportNameApiKeyIdFromConfig = (apiKeyName, qpqConfig, serviceOverride, applicationOverride) => {
package/lib/commonjs/getActionProcessor/core/event/utils/isAuthValid.js CHANGED
@@ -33,7 +33,7 @@ const isAuthValidForCognito = (qpqConfig, authSettings, authHeader) => __awaiter
33
33
  const userDirectoryName = authSettings.userDirectoryName;
34
34
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
35
35
  // Resolve the user pool id
36
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, authSettings.serviceName, authSettings.applicationName), region);
36
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
37
37
  // Verify the token
38
38
  return yield (0, verifyJwt_1.verifyJwt)(accessToken, userPoolId, region, false);
39
39
  });
package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryDecodeAccessTokenActionProcessor.js CHANGED
@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
14
14
  const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
15
15
  const decodeValidJwt_1 = require("../../../logic/cognito/decodeValidJwt");
16
16
  const getUserDirectoryDecodeAccessTokenActionProcessor = (qpqConfig) => {
17
- return ({ userDirectoryName, accessToken, ignoreExpiration, serviceOverride }) => __awaiter(void 0, void 0, void 0, function* () {
17
+ return ({ userDirectoryName, accessToken, ignoreExpiration }) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
19
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
19
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
20
20
  const authInfo = yield (0, decodeValidJwt_1.decodeValidJwt)(userPoolId, region, ignoreExpiration, accessToken);
21
21
  if (!authInfo || !(authInfo === null || authInfo === void 0 ? void 0 : authInfo.username)) {
22
22
  return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.Unauthorized, 'Invalid accessToken');
package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesActionProcessor.js CHANGED
@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
14
14
  const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
15
15
  const getUserAttributes_1 = require("../../../logic/cognito/getUserAttributes");
16
16
  const getUserDirectoryGetUserAttributesActionProcessor = (qpqConfig) => {
17
- return ({ userDirectoryName, serviceOverride, username }, session) => __awaiter(void 0, void 0, void 0, function* () {
17
+ return ({ userDirectoryName, username }, session) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
19
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
19
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
20
20
  const userAttributes = yield (0, getUserAttributes_1.getUserAttributes)(userPoolId, region, username);
21
21
  return (0, quidproquo_core_1.actionResult)(userAttributes);
22
22
  });
package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesByUserIdActionProcessor.js CHANGED
@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
14
14
  const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
15
15
  const getUserAttributesBySub_1 = require("../../../logic/cognito/getUserAttributesBySub");
16
16
  const getUserDirectoryGetUserAttributesByUserIdActionProcessor = (qpqConfig) => {
17
- return ({ userDirectoryName, serviceOverride, userId }, session) => __awaiter(void 0, void 0, void 0, function* () {
17
+ return ({ userDirectoryName, userId }, session) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
19
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
19
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
20
20
  const userAttributes = yield (0, getUserAttributesBySub_1.getUserAttributesBySub)(userPoolId, region, userId);
21
21
  return (0, quidproquo_core_1.actionResult)(userAttributes);
22
22
  });
package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryGetUsersActionProcessor.js CHANGED
@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
14
14
  const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
15
15
  const listPagedUsers_1 = require("../../../logic/cognito/listPagedUsers");
16
16
  const getUserDirectoryGetUsersActionProcessor = (qpqConfig) => {
17
- return ({ userDirectoryName, serviceOverride, nextPageKey }, session) => __awaiter(void 0, void 0, void 0, function* () {
17
+ return ({ userDirectoryName, nextPageKey }, session) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
19
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
19
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
20
20
  const userAttributes = yield (0, listPagedUsers_1.listPagedUsers)(userPoolId, region, nextPageKey);
21
21
  return (0, quidproquo_core_1.actionResult)(userAttributes);
22
22
  });
package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectoryReadAccessTokenActionProcessor.js CHANGED
@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
14
14
  const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
15
15
  const decodeValidJwt_1 = require("../../../logic/cognito/decodeValidJwt");
16
16
  const getUserDirectoryReadAccessTokenActionProcessor = (qpqConfig) => {
17
- return ({ userDirectoryName, serviceOverride, ignoreExpiration }, session) => __awaiter(void 0, void 0, void 0, function* () {
17
+ return ({ userDirectoryName, ignoreExpiration }, session) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
19
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
19
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
20
20
  const authInfo = yield (0, decodeValidJwt_1.decodeValidJwt)(userPoolId, region, ignoreExpiration, session.accessToken);
21
21
  if (!authInfo || !(authInfo === null || authInfo === void 0 ? void 0 : authInfo.username)) {
22
22
  return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.Unauthorized, 'Invalid accessToken');
package/lib/commonjs/getActionProcessor/core/userDirectory/getUserDirectorySetUserAttributesActionProcessor.js CHANGED
@@ -14,9 +14,9 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
14
14
  const getExportedValue_1 = require("../../../logic/cloudformation/getExportedValue");
15
15
  const setUserAttributes_1 = require("../../../logic/cognito/setUserAttributes");
16
16
  const getUserDirectorySetUserAttributesActionProcessor = (qpqConfig) => {
17
- return ({ userDirectoryName, serviceOverride, username, userAttributes }, session) => __awaiter(void 0, void 0, void 0, function* () {
17
+ return ({ userDirectoryName, username, userAttributes }, session) => __awaiter(void 0, void 0, void 0, function* () {
18
18
  const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
19
- const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
19
+ const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig), region);
20
20
  yield (0, setUserAttributes_1.setUserAttributes)(userPoolId, region, username, userAttributes);
21
21
  return (0, quidproquo_core_1.actionResult)(void 0);
22
22
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "quidproquo-actionprocessor-awslambda",
3
- "version": "0.0.184",
3
+ "version": "0.0.186",
4
4
  "description": "",
5
5
  "main": "./lib/commonjs/index.js",
6
6
  "types": "./lib/commonjs/index.d.ts",
@@ -47,9 +47,9 @@
47
47
  "lodash": "^4.17.21",
48
48
  "node-cache": "^5.1.2",
49
49
  "node-match-path": "^0.6.3",
50
- "quidproquo-config-aws": "0.0.184",
51
- "quidproquo-core": "0.0.184",
52
- "quidproquo-webserver": "0.0.184"
50
+ "quidproquo-config-aws": "0.0.186",
51
+ "quidproquo-core": "0.0.186",
52
+ "quidproquo-webserver": "0.0.186"
53
53
  },
54
54
  "devDependencies": {
55
55
  "@types/aws-lambda": "^8.10.109",
@@ -57,7 +57,7 @@
57
57
  "@types/jsonwebtoken": "^9.0.2",
58
58
  "@types/lodash": "^4.14.194",
59
59
  "@types/node": "^18.11.9",
60
- "quidproquo-tsconfig": "0.0.184",
60
+ "quidproquo-tsconfig": "0.0.186",
61
61
  "typescript": "^4.9.3"
62
62
  }
63
63
  }