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

package/lib/chevre/repo/passport.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.PassportRepo = void 0;
 const createDebug = require("debug");
@@ -20,13 +11,15 @@ const debug = createDebug('chevre-domain:repo:passport');
  * 取引許可証リポジトリ
  */
 class PassportRepo {
+    concurrentLockRepo;
+    // private readonly redisClient: RedisClientType;
+    options;
     constructor(redisClient, options) {
         this.concurrentLockRepo = new concurrentLock_1.ConcurrentLockRepo({ redisClient });
         // this.redisClient = redisClient;
         this.options = options;
     }
     static CREATE_VERIFIED_PASSPORT(params) {
-        var _a;
         if (typeof params === 'string' || params === undefined) {
             throw new factory.errors.Argument('decoded must be an object');
         }
@@ -42,120 +35,119 @@ class PassportRepo {
         if (typeof params.iss !== 'string' || params.iss === '') {
             throw new factory.errors.ArgumentNull('iss');
         }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (typeof ((_a = params.issueUnit) === null || _a === void 0 ? void 0 : _a.identifier) !== 'string' || params.issueUnit.identifier === '') {
+        if (typeof params.issueUnit?.identifier !== 'string' || params.issueUnit.identifier === '') {
             throw new factory.errors.Argument('issueUnit.identifier', 'issueUnit.identifier must be string');
         }
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (typeof params.issueUnit.numberOfRequests !== 'number') {
             throw new factory.errors.Argument('issueUnit.numberOfRequests', 'issueUnit.numberOfRequests must be number');
         }
         const identifier = `${params.issueUnit.identifier}:${params.issueUnit.numberOfRequests}`;
-        return Object.assign({ identifier, scope: params.scope, iat: params.iat, exp: params.exp, iss: params.iss, 
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            project: params.project, 
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-            issueUnit: params.issueUnit }, (Array.isArray(params.aud)) ? { aud: params.aud } : undefined);
+        return {
+            identifier,
+            scope: params.scope,
+            iat: params.iat,
+            exp: params.exp,
+            iss: params.iss,
+            project: params.project,
+            issueUnit: params.issueUnit,
+            ...(Array.isArray(params.aud)) ? { aud: params.aud } : undefined
+        };
     }
     static CREATE_REDIS_KEY(params) {
         return `chvr:lockPassport:${params.identifier}`;
     }
-    lock(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const now = moment();
-            const passportExpires = moment.unix(params.exp);
-            const key = PassportRepo.CREATE_REDIS_KEY(params);
-            const expires = (passportExpires.isAfter(now))
-                ? passportExpires.toDate()
-                : now.add(1, 'second')
-                    .toDate();
-            // reimplement using concurrentLockRepo(2025-05-27~)
-            try {
-                yield this.concurrentLockRepo.lock({
-                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
-                    about: { identifier: key, typeOf: 'Thing' },
-                    expires,
-                    audience: { identifier: '1', typeOf: 'Audience' }
-                });
-                debug('locked,', params.issueUnit.identifier, passportExpires);
-            }
-            catch (error) {
-                throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
-            }
-            // const ttl = (passportExpires.isAfter(now))
-            //     ? moment.unix(params.exp)
-            //         .diff(moment(), 'seconds')
-            //     : 1;
-            // const results = await this.redisClient.multi()
-            //     .setNX(key, '1')
-            //     .expire(key, ttl)
-            //     .exec();
-            // debug('locked,', params.issueUnit.identifier, now, passportExpires, ttl, results);
-            // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
-            //     return;
-            // } else {
-            //     throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
-            // }
-        });
+    async lock(params) {
+        const now = moment();
+        const passportExpires = moment.unix(params.exp);
+        const key = PassportRepo.CREATE_REDIS_KEY(params);
+        const expires = (passportExpires.isAfter(now))
+            ? passportExpires.toDate()
+            : now.add(1, 'second')
+                .toDate();
+        // reimplement using concurrentLockRepo(2025-05-27~)
+        try {
+            await this.concurrentLockRepo.lock({
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                about: { identifier: key, typeOf: 'Thing' },
+                expires,
+                audience: { identifier: '1', typeOf: 'Audience' }
+            });
+            debug('locked,', params.issueUnit.identifier, passportExpires);
+        }
+        catch (error) {
+            throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
+        }
+        // const ttl = (passportExpires.isAfter(now))
+        //     ? moment.unix(params.exp)
+        //         .diff(moment(), 'seconds')
+        //     : 1;
+        // const results = await this.redisClient.multi()
+        //     .setNX(key, '1')
+        //     .expire(key, ttl)
+        //     .exec();
+        // debug('locked,', params.issueUnit.identifier, now, passportExpires, ttl, results);
+        // if (Array.isArray(results) && (results[0] === 1 || (<any>results)[0] === true)) {
+        //     return;
+        // } else {
+        //     throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
+        // }
     }
     /**
      * 許可証トークンがあれば検証する
      */
-    validatePassportTokenIfExist(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let passport;
-            let customerType;
-            if (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.passport) === null || _b === void 0 ? void 0 : _b.token) === 'string') {
-                try {
-                    passport = yield this.verify({
-                        token: params.object.passport.token
-                        // secret: this.options.secret
-                    });
-                }
-                catch (error) {
-                    let message = `Invalid token: ${error.message}`;
-                    if (error instanceof jwt.JsonWebTokenError) {
-                        // remove -> 'jwt issuer invalid. expected: [OPTIONS ISSUER]'
-                        const indexOfExpected = message.indexOf('expected:');
-                        if (indexOfExpected >= 0) {
-                            message = message.substring(0, indexOfExpected);
-                        }
+    async validatePassportTokenIfExist(params) {
+        let passport;
+        let customerType;
+        if (typeof params.object?.passport?.token === 'string') {
+            try {
+                passport = await this.verify({
+                    token: params.object.passport.token
+                    // secret: this.options.secret
+                });
+            }
+            catch (error) {
+                let message = `Invalid token: ${error.message}`;
+                if (error instanceof jwt.JsonWebTokenError) {
+                    // remove -> 'jwt issuer invalid. expected: [OPTIONS ISSUER]'
+                    const indexOfExpected = message.indexOf('expected:');
+                    if (indexOfExpected >= 0) {
+                        message = message.substring(0, indexOfExpected);
                     }
-                    throw new factory.errors.Argument('passport.token', message);
                 }
-                // 許可証バリデーション
-                if (typeof this.options.passportValidator === 'function') {
-                    if (!this.options.passportValidator({ passport })) {
-                        throw new factory.errors.Argument('passport.token', 'passportValidator requirement not satisfied');
-                    }
+                throw new factory.errors.Argument('passport.token', message);
+            }
+            // 許可証バリデーション
+            if (typeof this.options.passportValidator === 'function') {
+                if (!this.options.passportValidator({ passport })) {
+                    throw new factory.errors.Argument('passport.token', 'passportValidator requirement not satisfied');
                 }
-                // カスタマータイプ決定(2023-11-20~)
-                // スコープのフォーマットは、Transaction:${TransactionType}:${sellerId}:${customerType}
-                const splittedScope = passport.scope.split(':');
-                // tslint:disable-next-line:no-magic-numbers
-                customerType = splittedScope[3];
             }
-            return Object.assign(Object.assign({}, (typeof customerType === 'string') ? { customerType } : undefined), (passport !== undefined) ? { passport } : undefined);
-        });
+            // カスタマータイプ決定(2023-11-20~)
+            // スコープのフォーマットは、Transaction:${TransactionType}:${sellerId}:${customerType}
+            const splittedScope = passport.scope.split(':');
+            // tslint:disable-next-line:no-magic-numbers
+            customerType = splittedScope[3];
+        }
+        return {
+            ...(typeof customerType === 'string') ? { customerType } : undefined,
+            ...(passport !== undefined) ? { passport } : undefined
+        };
     }
     /**
      * 暗号化された許可証を検証する
      */
-    verify(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                jwt.verify(params.token, this.options.secret, {
-                    algorithms: ['HS256'],
-                    issuer: this.options.issuers // add verify issuer(2024-07-08~)
-                }, (err, decoded) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(PassportRepo.CREATE_VERIFIED_PASSPORT(decoded));
-                    }
-                });
+    async verify(params) {
+        return new Promise((resolve, reject) => {
+            jwt.verify(params.token, this.options.secret, {
+                algorithms: ['HS256'],
+                issuer: this.options.issuers // add verify issuer(2024-07-08~)
+            }, (err, decoded) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    resolve(PassportRepo.CREATE_VERIFIED_PASSPORT(decoded));
+                }
             });
         });
     }

package/lib/chevre/repo/paymentMethod/creditCard.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.CreditCardRepo = void 0;
 const GMO = require("@motionpicture/gmo-service");
@@ -16,209 +7,202 @@ const factory = require("../../factory");
  * クレジットカードリポジトリ
  */
 class CreditCardRepo {
+    options;
     constructor(options) {
         this.options = options;
     }
     /**
      * クレジットカード追加
      */
-    save(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let addedCreditCard;
-            const memberId = params.personId;
-            const memberName = params.personId;
+    async save(params) {
+        let addedCreditCard;
+        const memberId = params.personId;
+        const memberName = params.personId;
+        try {
+            // まずGMO会員登録
             try {
-                // まずGMO会員登録
-                try {
-                    yield this.options.cardService.searchMember({
-                        siteId: this.options.siteId,
-                        sitePass: this.options.sitePass,
-                        memberId: memberId
-                    });
-                }
-                catch (searchMemberError) {
-                    // 会員が存在しない場合このエラーになる
-                    if (Array.isArray(searchMemberError.errors) &&
-                        searchMemberError.errors.length === 1 &&
-                        searchMemberError.errors[0].info === 'E01390002') {
-                        yield this.options.cardService.saveMember({
-                            siteId: this.options.siteId,
-                            sitePass: this.options.sitePass,
-                            memberId: memberId,
-                            memberName: memberName
-                        });
-                    }
-                    else {
-                        throw searchMemberError;
-                    }
-                }
-                const saveCardResult = yield this.options.cardService.saveCard({
-                    siteId: this.options.siteId,
-                    sitePass: this.options.sitePass,
-                    memberId: memberId,
-                    seqMode: GMO.utils.util.SeqMode.Physics,
-                    cardNo: params.creditCard.cardNo,
-                    cardPass: params.creditCard.cardPass,
-                    expire: params.creditCard.expire,
-                    holderName: params.creditCard.holderName,
-                    token: params.creditCard.token,
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    defaultFlag: (params.defaultFlag === true) ? /* istanbul ignore next */ '1' : '0'
-                });
-                const searchCardResults = yield this.options.cardService.searchCard({
+                await this.options.cardService.searchMember({
                     siteId: this.options.siteId,
                     sitePass: this.options.sitePass,
-                    memberId: memberId,
-                    seqMode: GMO.utils.util.SeqMode.Physics,
-                    cardSeq: saveCardResult.cardSeq
+                    memberId: memberId
                 });
-                addedCreditCard = searchCardResults[0];
             }
-            catch (error) {
-                if (error.name === 'GMOServiceBadRequestError') {
-                    throw new factory.errors.Argument('creditCard', error.errors[0].content);
+            catch (searchMemberError) {
+                // 会員が存在しない場合このエラーになる
+                if (Array.isArray(searchMemberError.errors) &&
+                    searchMemberError.errors.length === 1 &&
+                    searchMemberError.errors[0].info === 'E01390002') {
+                    await this.options.cardService.saveMember({
+                        siteId: this.options.siteId,
+                        sitePass: this.options.sitePass,
+                        memberId: memberId,
+                        memberName: memberName
+                    });
                 }
                 else {
-                    throw error;
+                    throw searchMemberError;
                 }
             }
-            return addedCreditCard;
-        });
+            const saveCardResult = await this.options.cardService.saveCard({
+                siteId: this.options.siteId,
+                sitePass: this.options.sitePass,
+                memberId: memberId,
+                seqMode: GMO.utils.util.SeqMode.Physics,
+                cardNo: params.creditCard.cardNo,
+                cardPass: params.creditCard.cardPass,
+                expire: params.creditCard.expire,
+                holderName: params.creditCard.holderName,
+                token: params.creditCard.token,
+                // tslint:disable-next-line:no-single-line-block-comment
+                defaultFlag: (params.defaultFlag === true) ? /* istanbul ignore next */ '1' : '0'
+            });
+            const searchCardResults = await this.options.cardService.searchCard({
+                siteId: this.options.siteId,
+                sitePass: this.options.sitePass,
+                memberId: memberId,
+                seqMode: GMO.utils.util.SeqMode.Physics,
+                cardSeq: saveCardResult.cardSeq
+            });
+            addedCreditCard = searchCardResults[0];
+        }
+        catch (error) {
+            if (error.name === 'GMOServiceBadRequestError') {
+                throw new factory.errors.Argument('creditCard', error.errors[0].content);
+            }
+            else {
+                throw error;
+            }
+        }
+        return addedCreditCard;
     }
     /**
      * クレジットカード削除
      */
-    deleteBySequenceNumber(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const memberId = params.personId;
-            try {
-                // GMOからカード削除
-                yield this.options.cardService.deleteCard({
-                    siteId: this.options.siteId,
-                    sitePass: this.options.sitePass,
-                    memberId: memberId,
-                    seqMode: GMO.utils.util.SeqMode.Physics,
-                    cardSeq: params.cardSeq
-                });
+    async deleteBySequenceNumber(params) {
+        const memberId = params.personId;
+        try {
+            // GMOからカード削除
+            await this.options.cardService.deleteCard({
+                siteId: this.options.siteId,
+                sitePass: this.options.sitePass,
+                memberId: memberId,
+                seqMode: GMO.utils.util.SeqMode.Physics,
+                cardSeq: params.cardSeq
+            });
+        }
+        catch (error) {
+            if (error.name === 'GMOServiceBadRequestError') {
+                throw new factory.errors.Argument('cardSeq', error.errors[0].content);
             }
-            catch (error) {
-                if (error.name === 'GMOServiceBadRequestError') {
-                    throw new factory.errors.Argument('cardSeq', error.errors[0].content);
-                }
-                else {
-                    throw error;
-                }
+            else {
+                throw error;
             }
-        });
+        }
     }
     /**
      * 会員のクレジットカードを全て削除
      */
-    deleteAll(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const memberId = params.personId;
-            let searchResult;
+    async deleteAll(params) {
+        const memberId = params.personId;
+        let searchResult;
+        try {
             try {
-                try {
-                    searchResult = yield this.options.cardService.searchMember({
-                        siteId: this.options.siteId,
-                        sitePass: this.options.sitePass,
-                        memberId: memberId
-                    });
-                }
-                catch (searchMemberError) {
-                    // 会員が存在しない場合このエラーになる
-                    if (Array.isArray(searchMemberError.errors) &&
-                        searchMemberError.errors.length === 1 &&
-                        searchMemberError.errors[0].info === 'E01390002') {
-                        // すでに存在しなければok
-                    }
-                    else {
-                        throw searchMemberError;
-                    }
-                }
-                if (searchResult !== undefined) {
-                    // GMOから会員削除
-                    yield this.options.cardService.deleteMember({
-                        siteId: this.options.siteId,
-                        sitePass: this.options.sitePass,
-                        memberId: memberId
-                    });
-                }
+                searchResult = await this.options.cardService.searchMember({
+                    siteId: this.options.siteId,
+                    sitePass: this.options.sitePass,
+                    memberId: memberId
+                });
             }
-            catch (error) {
-                if (error.name === 'GMOServiceBadRequestError') {
-                    throw new factory.errors.Argument('cardSeq', error.errors[0].content);
+            catch (searchMemberError) {
+                // 会員が存在しない場合このエラーになる
+                if (Array.isArray(searchMemberError.errors) &&
+                    searchMemberError.errors.length === 1 &&
+                    searchMemberError.errors[0].info === 'E01390002') {
+                    // すでに存在しなければok
                 }
                 else {
-                    throw error;
+                    throw searchMemberError;
                 }
             }
-        });
+            if (searchResult !== undefined) {
+                // GMOから会員削除
+                await this.options.cardService.deleteMember({
+                    siteId: this.options.siteId,
+                    sitePass: this.options.sitePass,
+                    memberId: memberId
+                });
+            }
+        }
+        catch (error) {
+            if (error.name === 'GMOServiceBadRequestError') {
+                throw new factory.errors.Argument('cardSeq', error.errors[0].content);
+            }
+            else {
+                throw error;
+            }
+        }
     }
     /**
      * クレジットカード検索
      */
-    search(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let creditCards = [];
+    async search(params) {
+        let creditCards = [];
+        try {
+            const memberId = params.personId;
+            // const memberName = params.personId;
+            let searchMemberResult;
             try {
-                const memberId = params.personId;
-                // const memberName = params.personId;
-                let searchMemberResult;
-                try {
-                    // まずGMO会員存在確認
-                    searchMemberResult = yield this.options.cardService.searchMember({
-                        siteId: this.options.siteId,
-                        sitePass: this.options.sitePass,
-                        memberId: memberId
-                    });
-                }
-                catch (searchMemberError) {
-                    // 会員が存在しない場合このエラーになる
-                    if (Array.isArray(searchMemberError.errors) &&
-                        searchMemberError.errors.length === 1 &&
-                        searchMemberError.errors[0].info === 'E01390002') {
-                        // 存在しなければカードなし
-                    }
-                    else {
-                        throw searchMemberError;
-                    }
+                // まずGMO会員存在確認
+                searchMemberResult = await this.options.cardService.searchMember({
+                    siteId: this.options.siteId,
+                    sitePass: this.options.sitePass,
+                    memberId: memberId
+                });
+            }
+            catch (searchMemberError) {
+                // 会員が存在しない場合このエラーになる
+                if (Array.isArray(searchMemberError.errors) &&
+                    searchMemberError.errors.length === 1 &&
+                    searchMemberError.errors[0].info === 'E01390002') {
+                    // 存在しなければカードなし
                 }
-                // 会員が存在していればカード検索
-                if (searchMemberResult !== undefined) {
-                    creditCards = yield this.options.cardService.searchCard({
-                        siteId: this.options.siteId,
-                        sitePass: this.options.sitePass,
-                        memberId: memberId,
-                        seqMode: GMO.utils.util.SeqMode.Physics
-                        // 未削除のものに絞り込む
-                    })
-                        .then((results) => results.filter((result) => result.deleteFlag === '0'));
+                else {
+                    throw searchMemberError;
                 }
             }
-            catch (error) {
-                if (error.name === 'GMOServiceBadRequestError') {
-                    // カードが存在しない場合このエラーになる
-                    // ErrCode=E01&ErrInfo=E01240002
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore if: please write tests */
-                    if (Array.isArray(error.errors) &&
-                        error.errors.length === 1 &&
-                        error.errors[0].info === 'E01240002') {
-                        // no op
-                        // 存在しないだけなので何もしない
-                    }
-                    else {
-                        throw new factory.errors.Argument('personId', error.errors[0].content);
-                    }
+            // 会員が存在していればカード検索
+            if (searchMemberResult !== undefined) {
+                creditCards = await this.options.cardService.searchCard({
+                    siteId: this.options.siteId,
+                    sitePass: this.options.sitePass,
+                    memberId: memberId,
+                    seqMode: GMO.utils.util.SeqMode.Physics
+                    // 未削除のものに絞り込む
+                })
+                    .then((results) => results.filter((result) => result.deleteFlag === '0'));
+            }
+        }
+        catch (error) {
+            if (error.name === 'GMOServiceBadRequestError') {
+                // カードが存在しない場合このエラーになる
+                // ErrCode=E01&ErrInfo=E01240002
+                // tslint:disable-next-line:no-single-line-block-comment
+                /* istanbul ignore if: please write tests */
+                if (Array.isArray(error.errors) &&
+                    error.errors.length === 1 &&
+                    error.errors[0].info === 'E01240002') {
+                    // no op
+                    // 存在しないだけなので何もしない
                 }
                 else {
-                    throw error;
+                    throw new factory.errors.Argument('personId', error.errors[0].content);
                 }
             }
-            return creditCards;
-        });
+            else {
+                throw error;
+            }
+        }
+        return creditCards;
     }
 }
 exports.CreditCardRepo = CreditCardRepo;