quidproquo-actionprocessor-awslambda 0.0.115 → 0.0.117

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreQueryActionProcessor.js

@@ -15,14 +15,14 @@ const quidproquo_core_2 = require("quidproquo-core");
 const dynamo_1 = require("../../../logic/dynamo");
 const qpqDynamoOrm_1 = require("../../../logic/dynamo/qpqDynamoOrm");
 const getProcessKeyValueStoreQuery = (qpqConfig) => {
-    return ({ keyValueStoreName, keyCondition, filterCondition }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, keyCondition, filterCondition, nextPageKey }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const storeConfig = quidproquo_core_1.qpqCoreUtils.getKeyValueStoreByName(qpqConfig, keyValueStoreName);
         if (!storeConfig) {
             return (0, quidproquo_core_1.actionResultError)(quidproquo_core_1.ErrorTypeEnum.NotFound, `Could not find key value store with name "${keyValueStoreName}"`);
         }
-        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, filterCondition, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
+        const items = yield (0, dynamo_1.query)(dynamoTableName, region, keyCondition, filterCondition, nextPageKey, (0, qpqDynamoOrm_1.getDynamoTableIndexByConfigAndQuery)(storeConfig, keyCondition));
         return (0, quidproquo_core_2.actionResult)(items);
     });
 };

package/lib/getActionProcessor/core/keyValueStore/getKeyValueStoreScanActionProcessor.js

@@ -14,10 +14,10 @@ const awsNamingUtils_1 = require("../../../awsNamingUtils");
 const quidproquo_core_2 = require("quidproquo-core");
 const scan_1 = require("../../../logic/dynamo/scan");
 const getProcessKeyValueStoreScan = (qpqConfig) => {
-    return ({ keyValueStoreName, filterCondition }) => __awaiter(void 0, void 0, void 0, function* () {
+    return ({ keyValueStoreName, filterCondition, nextPageKey }) => __awaiter(void 0, void 0, void 0, function* () {
         const dynamoTableName = (0, awsNamingUtils_1.getKvsDynamoTableNameFromConfig)(keyValueStoreName, qpqConfig, 'kvs');
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
-        const items = yield (0, scan_1.scan)(dynamoTableName, region, filterCondition);
+        const items = yield (0, scan_1.scan)(dynamoTableName, region, filterCondition, nextPageKey);
         return (0, quidproquo_core_2.actionResult)(items);
     });
 };

package/lib/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesByUserIdActionProcessor.d.ts

@@ -0,0 +1,5 @@
+import { UserDirectoryGetUserAttributesByUserIdActionProcessor, QPQConfig } from 'quidproquo-core';
+declare const _default: (qpqConfig: QPQConfig) => {
+    "@quidproquo-core/UserDirectory/GetUserAttributesByUserId": UserDirectoryGetUserAttributesByUserIdActionProcessor;
+};
+export default _default;

package/lib/getActionProcessor/core/userDirectory/getUserDirectoryGetUserAttributesByUserIdActionProcessor.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 });
+const quidproquo_core_1 = require("quidproquo-core");
+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* () {
+        const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
+        const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(userDirectoryName, qpqConfig, serviceOverride), region);
+        const userAttributes = yield (0, getUserAttributesBySub_1.getUserAttributesBySub)(userPoolId, region, userId);
+        return (0, quidproquo_core_1.actionResult)(userAttributes);
+    });
+};
+exports.default = (qpqConfig) => {
+    return {
+        [quidproquo_core_1.UserDirectoryActionType.GetUserAttributesByUserId]: getUserDirectoryGetUserAttributesByUserIdActionProcessor(qpqConfig),
+    };
+};

package/lib/getActionProcessor/core/userDirectory/index.d.ts

@@ -5,6 +5,7 @@ declare const _default: (qpqConfig: QPQConfig) => {
     "@quidproquo-core/UserDirectory/RequestEmailVerification": import("quidproquo-core").UserDirectoryRequestEmailVerificationActionProcessor;
     "@quidproquo-core/UserDirectory/RefreshToken": import("quidproquo-core").UserDirectoryRefreshTokenActionProcessor;
     "@quidproquo-core/UserDirectory/ReadAccessToken": import("quidproquo-core").UserDirectoryReadAccessTokenActionProcessor;
+    "@quidproquo-core/UserDirectory/GetUserAttributesByUserId": import("quidproquo-core").UserDirectoryGetUserAttributesByUserIdActionProcessor;
     "@quidproquo-core/UserDirectory/GetUserAttributes": import("quidproquo-core").UserDirectoryGetUserAttributesActionProcessor;
     "@quidproquo-core/UserDirectory/ForgotPassword": import("quidproquo-core").UserDirectoryForgotPasswordActionProcessor;
     "@quidproquo-core/UserDirectory/DecodeAccessToken": import("quidproquo-core").UserDirectoryDecodeAccessTokenActionProcessor;

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

@@ -10,9 +10,10 @@ const getUserDirectoryCreateUserActionProcessor_1 = __importDefault(require("./g
 const getUserDirectoryDecodeAccessTokenActionProcessor_1 = __importDefault(require("./getUserDirectoryDecodeAccessTokenActionProcessor"));
 const getUserDirectoryForgetPasswordActionProcessor_1 = __importDefault(require("./getUserDirectoryForgetPasswordActionProcessor"));
 const getUserDirectoryGetUserAttributesActionProcessor_1 = __importDefault(require("./getUserDirectoryGetUserAttributesActionProcessor"));
+const getUserDirectoryGetUserAttributesByUserIdActionProcessor_1 = __importDefault(require("./getUserDirectoryGetUserAttributesByUserIdActionProcessor"));
 const getUserDirectoryReadAccessTokenActionProcessor_1 = __importDefault(require("./getUserDirectoryReadAccessTokenActionProcessor"));
 const getUserDirectoryRefreshTokenActionProcessor_1 = __importDefault(require("./getUserDirectoryRefreshTokenActionProcessor"));
 const getUserDirectoryRequestEmailVerificationActionProcessor_1 = __importDefault(require("./getUserDirectoryRequestEmailVerificationActionProcessor"));
 const getUserDirectoryRespondToAuthChallengeActionProcessor_1 = __importDefault(require("./getUserDirectoryRespondToAuthChallengeActionProcessor"));
 const getUserDirectorySetUserAttributesActionProcessor_1 = __importDefault(require("./getUserDirectorySetUserAttributesActionProcessor"));
-exports.default = (qpqConfig) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (0, getUserDirectoryAuthenticateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmEmailVerificationActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryCreateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryDecodeAccessTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryGetUserAttributesActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryReadAccessTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRefreshTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRequestEmailVerificationActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRespondToAuthChallengeActionProcessor_1.default)(qpqConfig)), (0, getUserDirectorySetUserAttributesActionProcessor_1.default)(qpqConfig)));
+exports.default = (qpqConfig) => (Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (0, getUserDirectoryAuthenticateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmEmailVerificationActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryConfirmForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryCreateUserActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryDecodeAccessTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryForgetPasswordActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryGetUserAttributesActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryGetUserAttributesByUserIdActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryReadAccessTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRefreshTokenActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRequestEmailVerificationActionProcessor_1.default)(qpqConfig)), (0, getUserDirectoryRespondToAuthChallengeActionProcessor_1.default)(qpqConfig)), (0, getUserDirectorySetUserAttributesActionProcessor_1.default)(qpqConfig)));

package/lib/logic/cognito/getUserAttributesBySub.d.ts

@@ -0,0 +1,2 @@
+import { UserAttributes } from 'quidproquo-core';
+export declare const getUserAttributesBySub: (userPoolId: string, region: string, sub: string) => Promise<UserAttributes>;

package/lib/logic/cognito/getUserAttributesBySub.js

@@ -0,0 +1,29 @@
+"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.getUserAttributesBySub = void 0;
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
+const cognitoAttributeMap_1 = require("./cognitoAttributeMap");
+const getUserAttributesBySub = (userPoolId, region, sub) => __awaiter(void 0, void 0, void 0, function* () {
+    const cognitoClient = new client_cognito_identity_provider_1.CognitoIdentityProviderClient({ region });
+    const response = yield cognitoClient.send(new client_cognito_identity_provider_1.ListUsersCommand({
+        UserPoolId: userPoolId,
+        Filter: `sub = "${sub}"`,
+    }));
+    console.log(response);
+    const [user] = (response === null || response === void 0 ? void 0 : response.Users) || [];
+    if (!user) {
+        throw new Error('User not found');
+    }
+    const validAttributes = (user.Attributes || []).filter((attr) => attr.Name && attr.Value);
+    return (0, cognitoAttributeMap_1.getQpqAttributesFromCognitoUserAttributes)(validAttributes);
+});
+exports.getUserAttributesBySub = getUserAttributesBySub;

package/lib/logic/dynamo/logs/utils/stringToLastEvaluatedKey.d.ts

@@ -1 +1,2 @@
-export declare function stringToLastEvaluatedKey(encodedKey: string): any;
+import { AttributeValue } from '@aws-sdk/client-dynamodb';
+export declare function stringToLastEvaluatedKey(encodedKey: string): Record<string, AttributeValue>;

package/lib/logic/dynamo/query.d.ts

@@ -1,2 +1,2 @@
-import { KvsQueryOperation } from 'quidproquo-core';
-export declare function query<Item>(tableName: string, region: string, keyExpression: KvsQueryOperation, filterExpression?: KvsQueryOperation, indexName?: string): Promise<Item[]>;
+import { KvsQueryOperation, QpqPagedData } from 'quidproquo-core';
+export declare function query<Item>(tableName: string, region: string, keyExpression: KvsQueryOperation, filterExpression?: KvsQueryOperation, pageKey?: string, indexName?: string): Promise<QpqPagedData<Item>>;

package/lib/logic/dynamo/query.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.query = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
+const logs_1 = require("./logs");
+const itemsToQpqPagedData_1 = require("./utils/itemsToQpqPagedData");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
-function query(tableName, region, keyExpression, filterExpression, indexName) {
+function query(tableName, region, keyExpression, filterExpression, pageKey, indexName) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         // Instantiate DynamoDB client
@@ -26,13 +28,14 @@ function query(tableName, region, keyExpression, filterExpression, indexName) {
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildExpressionAttributeNames)([keyExpression, filterExpression]),
             IndexName: indexName,
         };
-        // TODO: Remove this log
-        console.log(params);
+        if (pageKey) {
+            params.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);
+        }
         // Create QueryCommand
         const command = new client_dynamodb_1.QueryCommand(params);
         // TODO: Catch errors and throw QPQ ones
         const data = yield dynamoClient.send(command);
-        return (((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []);
+        return (0, itemsToQpqPagedData_1.itemsToQpqPagedData)((((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []), data.LastEvaluatedKey);
     });
 }
 exports.query = query;

package/lib/logic/dynamo/scan.d.ts

@@ -1,2 +1,2 @@
-import { KvsQueryOperation } from 'quidproquo-core';
-export declare function scan<Item>(tableName: string, region: string, filterExpression?: KvsQueryOperation): Promise<Item[]>;
+import { KvsQueryOperation, QpqPagedData } from 'quidproquo-core';
+export declare function scan<Item>(tableName: string, region: string, filterExpression?: KvsQueryOperation, pageKey?: string): Promise<QpqPagedData<Item>>;

package/lib/logic/dynamo/scan.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scan = void 0;
 const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
 const convertObjectToDynamoMap_1 = require("./convertObjectToDynamoMap");
+const logs_1 = require("./logs");
+const itemsToQpqPagedData_1 = require("./utils/itemsToQpqPagedData");
 const qpqDynamoOrm_1 = require("./qpqDynamoOrm");
-function scan(tableName, region, filterExpression) {
+function scan(tableName, region, filterExpression, pageKey) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
         // Instantiate DynamoDB client
@@ -24,12 +26,14 @@ function scan(tableName, region, filterExpression) {
             ExpressionAttributeValues: (0, qpqDynamoOrm_1.buildExpressionAttributeValues)([filterExpression]),
             ExpressionAttributeNames: (0, qpqDynamoOrm_1.buildExpressionAttributeNames)([filterExpression]),
         };
-        console.log(params);
+        if (pageKey) {
+            params.ExclusiveStartKey = (0, logs_1.stringToLastEvaluatedKey)(pageKey);
+        }
         // Create ScanCommand
         const command = new client_dynamodb_1.ScanCommand(params);
         // TODO: Catch errors and throw QPQ ones
         const data = yield dynamoClient.send(command);
-        return (((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []);
+        return (0, itemsToQpqPagedData_1.itemsToQpqPagedData)((((_a = data.Items) === null || _a === void 0 ? void 0 : _a.map((i) => (0, convertObjectToDynamoMap_1.convertDynamoMapToObject)(i))) || []), data.LastEvaluatedKey);
     });
 }
 exports.scan = scan;

package/lib/logic/dynamo/utils/itemsToQpqPagedData.d.ts

@@ -0,0 +1,2 @@
+import { QpqPagedData } from 'quidproquo-core';
+export declare const itemsToQpqPagedData: <T>(items: T[], lastEvaluatedKey?: any) => QpqPagedData<T>;

package/lib/logic/dynamo/utils/itemsToQpqPagedData.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.itemsToQpqPagedData = void 0;
+const logs_1 = require("../logs");
+const itemsToQpqPagedData = (items, lastEvaluatedKey) => ({
+    items,
+    nextPageKey: lastEvaluatedKey ? (0, logs_1.lastEvaluatedKeyToString)(lastEvaluatedKey) : undefined,
+});
+exports.itemsToQpqPagedData = itemsToQpqPagedData;

package/lib/logic/dynamo/utils/qpqPagedDataToItems.d.ts

@@ -0,0 +1,4 @@
+export declare const itemsToQpqPagedData: <T>(items: T[], lastEvaluatedKey?: string) => {
+    items: T[];
+    lastEvaluatedKey: "" | Record<string, import("@aws-sdk/client-dynamodb").AttributeValue> | undefined;
+};

package/lib/logic/dynamo/utils/qpqPagedDataToItems.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.itemsToQpqPagedData = void 0;
+const logs_1 = require("../logs");
+const itemsToQpqPagedData = (items, lastEvaluatedKey) => ({
+    items,
+    lastEvaluatedKey: lastEvaluatedKey && (0, logs_1.stringToLastEvaluatedKey)(lastEvaluatedKey),
+});
+exports.itemsToQpqPagedData = itemsToQpqPagedData;

package/package.json

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