@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/repo/person.js

@@ -1,13 +1,4 @@
 "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.PersonRepo = void 0;
 // import { fromEnv } from '@aws-sdk/credential-providers';
@@ -17,6 +8,8 @@ const factory = require("../factory");
  * 会員リポジトリ
  */
 class PersonRepo {
+    cognitoIdentityServiceProvider;
+    userPoolId;
     constructor(options) {
         const { cognitoIdentityServiceProvider, userPoolId } = options;
         this.userPoolId = userPoolId;
@@ -81,10 +74,16 @@ class PersonRepo {
             //     { name: 'iss', value: `${credentials.aws.tokenIssuerEndpoint}/${params.userPoolId}` }
             // );
         }
-        const person = Object.assign(Object.assign({}, profile), { typeOf: factory.personType.Person, id: '', identifier: identifier, memberOf: {
+        const person = {
+            ...profile,
+            typeOf: factory.personType.Person,
+            id: '',
+            identifier: identifier,
+            memberOf: {
                 membershipNumber: params.username,
                 typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership
-            } });
+            }
+        };
         if (Array.isArray(params.attributes)) {
             params.attributes.forEach((a) => {
                 switch (a.Name) {
@@ -172,318 +171,299 @@ class PersonRepo {
     /**
      * 管理者権限でユーザー属性を取得する
      */
-    getUserAttributes(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                this.cognitoIdentityServiceProvider.adminGetUser({
-                    UserPoolId: this.userPoolId,
-                    Username: params.username
-                }, (err, data) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(PersonRepo.ATTRIBUTE2PROFILE({ attributes: data === null || data === void 0 ? void 0 : data.UserAttributes }));
-                    }
-                });
+    async getUserAttributes(params) {
+        return new Promise((resolve, reject) => {
+            this.cognitoIdentityServiceProvider.adminGetUser({
+                UserPoolId: this.userPoolId,
+                Username: params.username
+            }, (err, data) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    resolve(PersonRepo.ATTRIBUTE2PROFILE({ attributes: data?.UserAttributes }));
+                }
             });
         });
     }
     /**
      * 管理者権限でプロフィール更新
      */
-    updateProfile(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
-                this.cognitoIdentityServiceProvider.adminUpdateUserAttributes({
-                    UserPoolId: this.userPoolId,
-                    Username: params.username,
-                    UserAttributes: userAttributes
-                }, (err) => {
-                    if (err instanceof Error) {
-                        reject(new factory.errors.Argument('profile', err.message));
-                    }
-                    else {
-                        resolve();
-                    }
-                });
+    async updateProfile(params) {
+        return new Promise((resolve, reject) => {
+            const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
+            this.cognitoIdentityServiceProvider.adminUpdateUserAttributes({
+                UserPoolId: this.userPoolId,
+                Username: params.username,
+                UserAttributes: userAttributes
+            }, (err) => {
+                if (err instanceof Error) {
+                    reject(new factory.errors.Argument('profile', err.message));
+                }
+                else {
+                    resolve();
+                }
             });
         });
     }
     /**
      * 管理者権限でsubでユーザーを検索する
      */
-    findById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                this.cognitoIdentityServiceProvider.listUsers({
-                    UserPoolId: this.userPoolId,
-                    Filter: `sub="${params.userId}"`
-                }, (err, data) => {
-                    if (err instanceof Error) {
-                        reject(err);
+    async findById(params) {
+        return new Promise((resolve, reject) => {
+            this.cognitoIdentityServiceProvider.listUsers({
+                UserPoolId: this.userPoolId,
+                Filter: `sub="${params.userId}"`
+            }, (err, data) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    // tslint:disable-next-line:no-single-line-block-comment
+                    /* istanbul ignore if: please write tests */
+                    if (data?.Users === undefined) {
+                        reject(new factory.errors.NotFound('User'));
                     }
                     else {
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore if: please write tests */
-                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
+                        const user = data.Users.shift();
+                        if (user === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {
-                            const user = data.Users.shift();
-                            if (user === undefined) {
-                                reject(new factory.errors.NotFound('User'));
-                            }
-                            else {
-                                const person = PersonRepo.ATTRIBUTE2PERSON({
-                                    username: user.Username,
-                                    userPoolId: this.userPoolId,
-                                    attributes: user.Attributes
-                                });
-                                resolve(Object.assign(Object.assign({}, user), person));
-                            }
+                            const person = PersonRepo.ATTRIBUTE2PERSON({
+                                username: user.Username,
+                                userPoolId: this.userPoolId,
+                                attributes: user.Attributes
+                            });
+                            resolve({ ...user, ...person });
                         }
                     }
-                });
+                }
             });
         });
     }
     /**
      * アクセストークンでユーザー属性を取得する
      */
-    getUserAttributesByAccessToken(accessToken) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                this.cognitoIdentityServiceProvider.getUser({
-                    AccessToken: accessToken
-                }, (err, data) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(PersonRepo.ATTRIBUTE2PROFILE({ attributes: data === null || data === void 0 ? void 0 : data.UserAttributes }));
-                    }
-                });
+    async getUserAttributesByAccessToken(accessToken) {
+        return new Promise((resolve, reject) => {
+            this.cognitoIdentityServiceProvider.getUser({
+                AccessToken: accessToken
+            }, (err, data) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    resolve(PersonRepo.ATTRIBUTE2PROFILE({ attributes: data?.UserAttributes }));
+                }
             });
         });
     }
     /**
      * 会員プロフィール更新
      */
-    updateProfileByAccessToken(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
-                this.cognitoIdentityServiceProvider.updateUserAttributes({
-                    AccessToken: params.accessToken,
-                    UserAttributes: userAttributes
-                }, (err) => {
-                    if (err instanceof Error) {
-                        reject(new factory.errors.Argument('profile', err.message));
-                    }
-                    else {
-                        resolve();
-                    }
-                });
+    async updateProfileByAccessToken(params) {
+        return new Promise((resolve, reject) => {
+            const userAttributes = PersonRepo.PROFILE2ATTRIBUTE(params.profile);
+            this.cognitoIdentityServiceProvider.updateUserAttributes({
+                AccessToken: params.accessToken,
+                UserAttributes: userAttributes
+            }, (err) => {
+                if (err instanceof Error) {
+                    reject(new factory.errors.Argument('profile', err.message));
+                }
+                else {
+                    resolve();
+                }
             });
         });
     }
     /**
      * 削除
      */
-    deleteById(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                this.cognitoIdentityServiceProvider.listUsers({
-                    UserPoolId: this.userPoolId,
-                    Filter: `sub="${params.userId}"`
-                }, (listUsersErr, data) => {
-                    if (listUsersErr instanceof Error) {
-                        reject(listUsersErr);
+    async deleteById(params) {
+        return new Promise((resolve, reject) => {
+            this.cognitoIdentityServiceProvider.listUsers({
+                UserPoolId: this.userPoolId,
+                Filter: `sub="${params.userId}"`
+            }, (listUsersErr, data) => {
+                if (listUsersErr instanceof Error) {
+                    reject(listUsersErr);
+                }
+                else {
+                    // tslint:disable-next-line:no-single-line-block-comment
+                    /* istanbul ignore if: please write tests */
+                    if (data?.Users === undefined) {
+                        reject(new factory.errors.NotFound('User'));
                     }
                     else {
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore if: please write tests */
-                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
+                        const user = data.Users.shift();
+                        if (user === undefined || user.Username === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {
-                            const user = data.Users.shift();
-                            if (user === undefined || user.Username === undefined) {
-                                reject(new factory.errors.NotFound('User'));
-                            }
-                            else {
-                                this.cognitoIdentityServiceProvider.adminDeleteUser({
-                                    UserPoolId: this.userPoolId,
-                                    Username: user.Username
-                                }, (err) => {
-                                    if (err instanceof Error) {
-                                        reject(err);
-                                    }
-                                    else {
-                                        resolve();
-                                    }
-                                });
-                            }
+                            this.cognitoIdentityServiceProvider.adminDeleteUser({
+                                UserPoolId: this.userPoolId,
+                                Username: user.Username
+                            }, (err) => {
+                                if (err instanceof Error) {
+                                    reject(err);
+                                }
+                                else {
+                                    resolve();
+                                }
+                            });
                         }
                     }
-                });
+                }
             });
         });
     }
     /**
      * 無効化する
      */
-    disable(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                this.cognitoIdentityServiceProvider.listUsers({
-                    UserPoolId: this.userPoolId,
-                    Filter: `sub="${params.userId}"`
-                }, (listUsersErr, data) => {
-                    if (listUsersErr instanceof Error) {
-                        reject(listUsersErr);
+    async disable(params) {
+        return new Promise((resolve, reject) => {
+            this.cognitoIdentityServiceProvider.listUsers({
+                UserPoolId: this.userPoolId,
+                Filter: `sub="${params.userId}"`
+            }, (listUsersErr, data) => {
+                if (listUsersErr instanceof Error) {
+                    reject(listUsersErr);
+                }
+                else {
+                    // tslint:disable-next-line:no-single-line-block-comment
+                    /* istanbul ignore if: please write tests */
+                    if (data?.Users === undefined) {
+                        reject(new factory.errors.NotFound('User'));
                     }
                     else {
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore if: please write tests */
-                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
+                        const user = data.Users.shift();
+                        if (user === undefined || user.Username === undefined) {
                             reject(new factory.errors.NotFound('User'));
                         }
                         else {
-                            const user = data.Users.shift();
-                            if (user === undefined || user.Username === undefined) {
-                                reject(new factory.errors.NotFound('User'));
-                            }
-                            else {
-                                this.cognitoIdentityServiceProvider.adminDisableUser({
-                                    UserPoolId: this.userPoolId,
-                                    Username: user.Username
-                                }, (err) => {
-                                    if (err instanceof Error) {
-                                        reject(err);
-                                    }
-                                    else {
-                                        resolve();
-                                    }
-                                });
-                            }
+                            this.cognitoIdentityServiceProvider.adminDisableUser({
+                                UserPoolId: this.userPoolId,
+                                Username: user.Username
+                            }, (err) => {
+                                if (err instanceof Error) {
+                                    reject(err);
+                                }
+                                else {
+                                    resolve();
+                                }
+                            });
                         }
                     }
-                });
+                }
             });
         });
     }
     /**
      * グローバルサインアウトかつ無効化
      */
-    globalSignOutAndDisable(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                this.cognitoIdentityServiceProvider.listUsers({
-                    UserPoolId: this.userPoolId,
-                    Filter: `sub="${params.userId}"`
-                }, (listUsersErr, data) => {
-                    var _a, _b;
-                    if (listUsersErr instanceof Error) {
-                        reject(listUsersErr);
+    async globalSignOutAndDisable(params) {
+        return new Promise((resolve, reject) => {
+            this.cognitoIdentityServiceProvider.listUsers({
+                UserPoolId: this.userPoolId,
+                Filter: `sub="${params.userId}"`
+            }, (listUsersErr, data) => {
+                if (listUsersErr instanceof Error) {
+                    reject(listUsersErr);
+                }
+                else {
+                    const username = data?.Users?.shift()?.Username;
+                    if (typeof username !== 'string') {
+                        reject(new factory.errors.NotFound('User'));
                     }
                     else {
-                        const username = (_b = (_a = data === null || data === void 0 ? void 0 : data.Users) === null || _a === void 0 ? void 0 : _a.shift()) === null || _b === void 0 ? void 0 : _b.Username;
-                        if (typeof username !== 'string') {
-                            reject(new factory.errors.NotFound('User'));
-                        }
-                        else {
-                            this.cognitoIdentityServiceProvider.adminUserGlobalSignOut({
-                                UserPoolId: this.userPoolId,
-                                Username: username
-                            }, (adminUserGlobalSignOutErr) => {
-                                if (adminUserGlobalSignOutErr instanceof Error) {
-                                    reject(adminUserGlobalSignOutErr);
-                                }
-                                else {
-                                    this.cognitoIdentityServiceProvider.adminDisableUser({
-                                        UserPoolId: this.userPoolId,
-                                        Username: username
-                                    }, (adminDisableUserErr) => {
-                                        if (adminDisableUserErr instanceof Error) {
-                                            reject(adminDisableUserErr);
-                                        }
-                                        else {
-                                            resolve();
-                                        }
-                                    });
-                                }
-                            });
-                        }
+                        this.cognitoIdentityServiceProvider.adminUserGlobalSignOut({
+                            UserPoolId: this.userPoolId,
+                            Username: username
+                        }, (adminUserGlobalSignOutErr) => {
+                            if (adminUserGlobalSignOutErr instanceof Error) {
+                                reject(adminUserGlobalSignOutErr);
+                            }
+                            else {
+                                this.cognitoIdentityServiceProvider.adminDisableUser({
+                                    UserPoolId: this.userPoolId,
+                                    Username: username
+                                }, (adminDisableUserErr) => {
+                                    if (adminDisableUserErr instanceof Error) {
+                                        reject(adminDisableUserErr);
+                                    }
+                                    else {
+                                        resolve();
+                                    }
+                                });
+                            }
+                        });
                     }
-                });
+                }
             });
         });
     }
     /**
      * 検索
      */
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const request = {
-                    // Limit: 60,
-                    UserPoolId: this.userPoolId
-                };
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.id !== undefined) {
-                    request.Filter = `sub^="${params.id}"`;
-                }
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.username !== undefined) {
-                    request.Filter = `username^="${params.username}"`;
-                }
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.email !== undefined) {
-                    request.Filter = `email^="${params.email}"`;
-                }
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.telephone !== undefined) {
-                    request.Filter = `phone_number^="${params.telephone}"`;
-                }
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.givenName !== undefined) {
-                    request.Filter = `given_name^="${params.givenName}"`;
-                }
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.familyName !== undefined) {
-                    request.Filter = `family_name^="${params.familyName}"`;
+    async search(params) {
+        return new Promise((resolve, reject) => {
+            const request = {
+                // Limit: 60,
+                UserPoolId: this.userPoolId
+            };
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.id !== undefined) {
+                request.Filter = `sub^="${params.id}"`;
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.username !== undefined) {
+                request.Filter = `username^="${params.username}"`;
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.email !== undefined) {
+                request.Filter = `email^="${params.email}"`;
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.telephone !== undefined) {
+                request.Filter = `phone_number^="${params.telephone}"`;
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.givenName !== undefined) {
+                request.Filter = `given_name^="${params.givenName}"`;
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.familyName !== undefined) {
+                request.Filter = `family_name^="${params.familyName}"`;
+            }
+            this.cognitoIdentityServiceProvider.listUsers(request, (err, data) => {
+                if (err instanceof Error) {
+                    reject(err);
                 }
-                this.cognitoIdentityServiceProvider.listUsers(request, (err, data) => {
-                    if (err instanceof Error) {
-                        reject(err);
+                else {
+                    // tslint:disable-next-line:no-single-line-block-comment
+                    /* istanbul ignore if: please write tests */
+                    if (data?.Users === undefined) {
+                        reject(new factory.errors.NotFound('User'));
                     }
                     else {
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore if: please write tests */
-                        if ((data === null || data === void 0 ? void 0 : data.Users) === undefined) {
-                            reject(new factory.errors.NotFound('User'));
-                        }
-                        else {
-                            resolve(data.Users.map((u) => {
-                                const person = PersonRepo.ATTRIBUTE2PERSON({
-                                    username: u.Username,
-                                    userPoolId: this.userPoolId,
-                                    attributes: u.Attributes
-                                });
-                                return Object.assign(Object.assign({}, u), person);
-                            }));
-                        }
+                        resolve(data.Users.map((u) => {
+                            const person = PersonRepo.ATTRIBUTE2PERSON({
+                                username: u.Username,
+                                userPoolId: this.userPoolId,
+                                attributes: u.Attributes
+                            });
+                            return { ...u, ...person };
+                        }));
                     }
-                });
+                }
             });
         });
     }