@chevre/domain 21.20.0-alpha.2 → 21.20.0-alpha.22

package/lib/chevre/service/payment/any.js

@@ -79,7 +79,11 @@ function invalidatePaymentUrl(params) {
                         : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja),
                     id: transaction.seller.id
                 },
-                recipient: { typeOf: transaction.agent.typeOf, name: transaction.agent.name },
+                recipient: {
+                    typeOf: transaction.agent.typeOf,
+                    id: transaction.agent.id,
+                    name: transaction.agent.name
+                },
                 object: [{
                         typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
                         id: (_e = (_d = transaction.object.paymentMethods) === null || _d === void 0 ? void 0 : _d.issuedThrough) === null || _e === void 0 ? void 0 : _e.id,
@@ -193,7 +197,7 @@ function processVoidPayTransaction(params) {
                         }
                     }
                 }
-                yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+                yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             }
             catch (error) {
                 errors.push(error);
@@ -237,7 +241,8 @@ function publishPaymentUrl(params) {
             entryTranArgs: result.entryTranArgs,
             entryTranResult: result.entryTranResult,
             execTranArgs: result.execTranArgs,
-            execTranResult: result.execTranResult
+            execTranResult: result.execTranResult,
+            paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~)
         };
         yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
@@ -256,16 +261,24 @@ exports.publishPaymentUrl = publishPaymentUrl;
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         const paymentServiceType = params.paymentServiceType;
         // 取引番号生成
         let transactionNumber;
         let pendingPaymentAgencyTransaction;
+        let creditCard = params.object.creditCard;
         // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
         if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
             const paymentMethodByTransaction = transaction.object.paymentMethods;
             if (params.object.paymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
+                // 検証強化(2024-01-04~)
+                validatePaymentMethodByTransaction({
+                    object: params.object,
+                    paymentMethodByTransaction
+                });
+                // creditCardを決済URL発行時の情報で上書き(2024-01-08~)
+                creditCard = (_a = paymentMethodByTransaction.paymentMethod) === null || _a === void 0 ? void 0 : _a.creditCard;
                 transactionNumber = params.object.paymentMethodId;
                 const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
                 if (entryTranArgs !== undefined && entryTranResult !== undefined
@@ -297,11 +310,12 @@ function authorize(params) {
             const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
+        const authorizeObject = Object.assign(Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined);
         // 承認アクションを開始する
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AuthorizeAction,
-            object: Object.assign(Object.assign({}, params.object), { paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }),
+            object: authorizeObject,
             agent: {
                 typeOf: transaction.agent.typeOf,
                 id: transaction.agent.id
@@ -315,7 +329,7 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+                    : String((_b = transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
             },
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         };
@@ -323,12 +337,12 @@ function authorize(params) {
         let payTransaction;
         try {
             const { accountId } = yield validateFromLocation({
-                object: params.object,
+                object: authorizeObject,
                 project: { id: transaction.project.id }
             })({ action: repos.action });
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
                 accountId,
-                object: params.object,
+                object: authorizeObject,
                 paymentServiceType,
                 transaction: transaction,
                 transactionNumber: transactionNumber,
@@ -363,11 +377,33 @@ function authorize(params) {
             throw error;
         }
         // アクションを完了
-        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: params.object });
-        return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
+        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        return { id: action.id };
     });
 }
 exports.authorize = authorize;
+function validatePaymentMethodByTransaction(params) {
+    var _a, _b;
+    const paymentServiceIdByObject = params.object.issuedThrough.id;
+    const amountByObject = params.object.amount;
+    const paymentMethodTypeByObject = params.object.paymentMethod;
+    const paymentServiceIdByTransaction = params.paymentMethodByTransaction.issuedThrough.id;
+    const amountByTransaction = (_a = params.paymentMethodByTransaction.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+    const paymentMethodTypeByTransaction = (_b = params.paymentMethodByTransaction.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+    // 決済サービスID検証
+    if (paymentServiceIdByObject !== paymentServiceIdByTransaction) {
+        throw new factory.errors.Argument('object.issuedThrough.id', 'issuedThrough.id must match the target of the paymentUrl');
+    }
+    // 金額検証
+    if (amountByObject !== amountByTransaction) {
+        throw new factory.errors.Argument('object.amount', 'amount must match the target of the paymentUrl');
+    }
+    // 決済方法区分検証
+    if (paymentMethodTypeByObject !== paymentMethodTypeByTransaction) {
+        throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
+    }
+}
 function validateFromLocation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;

package/lib/chevre/service/payment/creditCard.d.ts

@@ -7,8 +7,6 @@ import type { MongoRepository as AccountingReportRepo } from '../../repo/account
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
-import type { CognitoRepository as PersonRepo } from '../../repo/person';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 interface IPaymentAgencyTransaction {
@@ -28,12 +26,14 @@ type IAuthorizeResult = IPaymentAgencyTransaction & {
 declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, options: {
     searchTrade4accountId: boolean;
     pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
+    /**
+     * 決済URL発行処理かどうか
+     */
+    processPublishPaymentUrl: boolean;
 }): (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
-    project: ProjectRepo;
 }) => Promise<IAuthorizeResult>;
 /**
  * クレジットカード決済中止
@@ -42,7 +42,6 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<void>;
 /**
  * クレジットカード決済
@@ -53,24 +52,26 @@ declare function payCreditCard(params: factory.task.pay.IData): (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
 /**
  * クレジットカード返金
  */
-declare function refundCreditCard(params: factory.task.refund.IData, requirePayAction: boolean): (repos: {
+declare function refundCreditCard(params: factory.task.refund.IData, options: {
+    requirePayAction: boolean;
+}): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
 interface IGMOInfo {
     shopId: string;
     shopPass: string;
+    returnUrls3ds: string[];
+    callbackType3ds?: factory.service.paymentService.ICallbackType3ds;
 }
 declare function getGMOInfoFromSeller(params: {
     paymentMethodType: string;

package/lib/chevre/service/payment/creditCard.js

@@ -20,7 +20,7 @@ const credentials_1 = require("../../credentials");
 const factory = require("../../factory");
 const onPaid_1 = require("./any/onPaid");
 const onRefund_1 = require("./any/onRefund");
-const person2username_1 = require("./any/person2username");
+// import { person2username } from './any/person2username';
 const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
@@ -28,12 +28,12 @@ const debug = createDebug('chevre-domain:service:payment');
 function authorize(params, paymentServiceId, options) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // const project = <Pick<factory.project.IProject, 'settings'>>await repos.project.findById({
+        //     id: params.project.id,
+        //     inclusion: ['settings'],
+        //     exclusion: []
+        // });
         var _a, _b, _c, _d, _e;
-        const project = yield repos.project.findById({
-            id: params.project.id,
-            inclusion: ['settings'],
-            exclusion: []
-        });
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
@@ -48,7 +48,7 @@ function authorize(params, paymentServiceId, options) {
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const { shopId, shopPass } = yield getGMOInfoFromSeller({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
+        const { shopId, shopPass, returnUrls3ds, callbackType3ds } = yield getGMOInfoFromSeller({ paymentMethodType, seller: { id: sellerId }, paymentServiceId })(repos);
         // GMOオーダーIDはカスタム指定可能
         const orderId = params.transactionNumber;
         if (typeof orderId !== 'string') {
@@ -69,13 +69,16 @@ function authorize(params, paymentServiceId, options) {
             }
             else {
                 authorizeResult = yield processAuthorizeCreditCard({
-                    projectSettings: project.settings,
+                    // projectSettings: project.settings,
                     shopId: shopId,
                     shopPass: shopPass,
+                    returnUrls3ds,
+                    callbackType3ds,
                     orderId: orderId,
                     availableChannel: availableChannel,
-                    object: params.object.paymentMethod
-                })(repos);
+                    object: params.object.paymentMethod,
+                    processPublishPaymentUrl: options.processPublishPaymentUrl
+                })();
             }
         }
         catch (error) {
@@ -108,8 +111,8 @@ function authorize(params, paymentServiceId, options) {
 exports.authorize = authorize;
 function processAuthorizeCreditCard(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return () => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
         // GMOオーソリ取得
         let entryTranArgs;
         let entryTranResult;
@@ -117,25 +120,36 @@ function processAuthorizeCreditCard(params) {
         let execTranResult;
         const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
         const creditCard = params.object.creditCard;
-        let memberId = creditCard.memberId;
+        const memberId = creditCard.memberId;
         const cardSeq = creditCard.cardSeq;
         if (typeof memberId === 'string' && memberId.length > 0 && typeof cardSeq === 'number') {
+            // 決済承認時のuseUsernameAsGMOMemberId判定を廃止(2024-01-04~)
             // 特殊なプロジェクトのみユーザーネームに自動変換(新旧会員互換性維持対応)
             // memberIdはPersonIDが指定されてくる想定
-            const useUsernameAsGMOMemberId = ((_a = params.projectSettings) === null || _a === void 0 ? void 0 : _a.useUsernameAsGMOMemberId) === true;
-            if (useUsernameAsGMOMemberId) {
-                try {
-                    const customer = yield repos.person.findById({ userId: memberId });
-                    memberId = yield (0, person2username_1.person2username)(customer);
-                }
-                catch (error) {
-                    throw error;
-                }
-            }
+            // const useUsernameAsGMOMemberId = params.projectSettings?.useUsernameAsGMOMemberId === true;
+            // if (useUsernameAsGMOMemberId) {
+            //     try {
+            //         const customer = await repos.person.findById({ userId: memberId });
+            //         memberId = await person2username(customer);
+            //     } catch (error) {
+            //         throw error;
+            //     }
+            // }
         }
         const retUrl = creditCard === null || creditCard === void 0 ? void 0 : creditCard.retUrl;
         // 3DS拡張(2024-01-02~)
-        if (typeof retUrl === 'string' && retUrl.length > 0) {
+        if (params.processPublishPaymentUrl === true && typeof retUrl === 'string' && retUrl.length > 0) {
+            let returnUrlObject;
+            try {
+                returnUrlObject = new URL(retUrl);
+            }
+            catch (error) {
+                throw new factory.errors.Argument('object.creditCard.retUrl', 'retUrl unparsable');
+            }
+            const returnUrlShouldBeIncluded = `${returnUrlObject.origin}${returnUrlObject.pathname}`;
+            if (!params.returnUrls3ds.includes(returnUrlShouldBeIncluded)) {
+                throw new factory.errors.Argument('object.creditCard.retUrl', 'invalid returnUrl');
+            }
             entryTranArgs = {
                 shopId: params.shopId,
                 shopPass: params.shopPass,
@@ -156,8 +170,8 @@ function processAuthorizeCreditCard(params) {
                 accessPass: entryTranResult.accessPass,
                 orderId: params.orderId,
                 method: params.object.method,
-                // siteId: params.availableChannel.credentials?.siteId,
-                // sitePass: params.availableChannel.credentials?.sitePass,
+                siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
+                sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass,
                 cardNo: creditCard.cardNo,
                 cardPass: creditCard.cardPass,
                 expire: creditCard.expire,
@@ -166,7 +180,7 @@ function processAuthorizeCreditCard(params) {
                 cardSeq: cardSeq,
                 seqMode: GMO.utils.util.SeqMode.Physics,
                 retUrl,
-                callbackType: GMO.utils.util.CallbackType.Get
+                callbackType: (params.callbackType3ds === 'GET') ? GMO.utils.util.CallbackType.Get : GMO.utils.util.CallbackType.Post
             };
             execTranResult = yield creditCardService.execTran3ds(execTranArgs);
         }
@@ -179,8 +193,8 @@ function processAuthorizeCreditCard(params) {
                 amount: (typeof params.object.amount === 'number')
                     ? params.object.amount
                     : params.object.amount.value,
-                siteId: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.siteId,
-                sitePass: (_c = params.availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.sitePass
+                siteId: (_c = params.availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                sitePass: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
             };
             entryTranResult = yield creditCardService.entryTran(entryTranArgs);
             execTranArgs = {
@@ -188,8 +202,8 @@ function processAuthorizeCreditCard(params) {
                 accessPass: entryTranResult.accessPass,
                 orderId: params.orderId,
                 method: params.object.method,
-                siteId: (_d = params.availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                sitePass: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass,
+                siteId: (_e = params.availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
+                sitePass: (_f = params.availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass,
                 cardNo: creditCard.cardNo,
                 cardPass: creditCard.cardPass,
                 expire: creditCard.expire,
@@ -281,31 +295,28 @@ function voidTransaction(params) {
         // オーソリ取消
         // 現時点では、ここで失敗したらオーソリ取消をあきらめる
         // GMO混雑エラーはここでも発生する(取消処理でも混雑エラーが発生することは確認済)
-        try {
-            const searchTradeResult = yield creditCardService.searchTrade({
+        // try {
+        // } catch (error) {
+        //     // no op
+        // }
+        const searchTradeResult = yield creditCardService.searchTrade({
+            shopId: shopId,
+            shopPass: shopPass,
+            orderId: paymentMethodId,
+            siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+            sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+        });
+        // 仮売上であれば取消
+        if (searchTradeResult.status === GMO.utils.util.JobCd.Auth) {
+            yield creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,
-                orderId: paymentMethodId,
-                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                accessId: searchTradeResult.accessId,
+                accessPass: searchTradeResult.accessPass,
+                jobCd: GMO.utils.util.JobCd.Void,
+                siteId: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
+                sitePass: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass
             });
-            debug('searchTradeResult:', searchTradeResult);
-            // 仮売上であれば取消
-            if (searchTradeResult.status === GMO.utils.util.JobCd.Auth) {
-                const alterTranResult = yield creditCardService.alterTran({
-                    shopId: shopId,
-                    shopPass: shopPass,
-                    accessId: searchTradeResult.accessId,
-                    accessPass: searchTradeResult.accessPass,
-                    jobCd: GMO.utils.util.JobCd.Void,
-                    siteId: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
-                    sitePass: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass
-                });
-                debug('alterTran processed', alterTranResult);
-            }
-        }
-        catch (error) {
-            // no op
         }
     });
 }
@@ -434,7 +445,7 @@ function processAlterTran(params) {
 /**
  * クレジットカード返金
  */
-function refundCreditCard(params, requirePayAction) {
+function refundCreditCard(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         const paymentMethodType = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.typeOf;
@@ -442,7 +453,7 @@ function refundCreditCard(params, requirePayAction) {
         const paymentServiceId = (_c = params.object[0]) === null || _c === void 0 ? void 0 : _c.id;
         // 本アクションに対応するPayActionを取り出す(Cinerino側で決済していた時期に関してはpayActionが存在しないので注意)
         let payAction;
-        if (requirePayAction) {
+        if (options.requirePayAction) {
             payAction = yield repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
             if (payAction === undefined) {
                 throw new factory.errors.NotFound('PayAction');
@@ -491,7 +502,6 @@ function processChangeTransaction(params) {
         const alterTranResult = [];
         const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
         // 取引状態参照
-        debug('searching trade...', params.paymentMethodId);
         const searchTradeResult = yield creditCardService.searchTrade({
             shopId: params.shopId,
             shopPass: params.shopPass,
@@ -507,7 +517,7 @@ function processChangeTransaction(params) {
         let alreadyRefunded = false;
         // 決済時のGMO取引を確認できれば、既に返金済かどうかを判定
         if (typeof (creditCardSalesBefore === null || creditCardSalesBefore === void 0 ? void 0 : creditCardSalesBefore.tranId) === 'string') {
-            // // GMO取引状態に変更がなければ金額変更
+            // GMO取引状態に変更がなければ金額変更
             if (searchTradeResult.tranId !== creditCardSalesBefore.tranId) {
                 alreadyRefunded = true;
             }
@@ -523,71 +533,43 @@ function processChangeTransaction(params) {
             });
         }
         else {
-            // if (USE_GMO_CHANGE_TRAN) {
-            //     // 手数料0円であれば、決済取り消し(返品)処理
-            //     if (typeof params.refundFee === 'number' && params.refundFee > 0) {
-            //         debug('changeTran processing...');
-            //         const changeTranResult = await creditCardService.changeTran({
-            //             shopId: params.shopId,
-            //             shopPass: params.shopPass,
-            //             accessId: searchTradeResult.accessId,
-            //             accessPass: searchTradeResult.accessPass,
-            //             jobCd: GMO.utils.util.JobCd.Capture,
-            //             amount: params.refundFee,
-            //             siteId: params.availableChannel.credentials?.siteId,
-            //             sitePass: params.availableChannel.credentials?.sitePass
-            //         });
-            //         debug('changeTran processed.');
-            //         alterTranResult.push(changeTranResult);
-            //     } else {
-            //         debug('alterTran processing...');
-            //         alterTranResult.push(await creditCardService.alterTran({
-            //             shopId: params.shopId,
-            //             shopPass: params.shopPass,
-            //             accessId: searchTradeResult.accessId,
-            //             accessPass: searchTradeResult.accessPass,
-            //             jobCd: GMO.utils.util.JobCd.Void,
-            //             siteId: params.availableChannel.credentials?.siteId,
-            //             sitePass: params.availableChannel.credentials?.sitePass
-            //         }));
-            //         debug('alterTran processed.');
-            //         debug('GMO alterTranResult is', alterTranResult);
-            //     }
-            // } else {
-            // }
-            // 手数料決済については、取消→即時売上の流れ
-            debug('alterTran processing...');
-            alterTranResult.push(yield creditCardService.alterTran({
-                shopId: params.shopId,
-                shopPass: params.shopPass,
-                accessId: searchTradeResult.accessId,
-                accessPass: searchTradeResult.accessPass,
-                jobCd: GMO.utils.util.JobCd.Void,
-                siteId: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.siteId,
-                sitePass: (_h = params.availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.sitePass
-            }));
-            debug('alterTran processed.');
+            try {
+                // 手数料決済については、取消→即時売上の流れ
+                debug('alterTran processing... searchTradeResult:', searchTradeResult);
+                alterTranResult.push(yield creditCardService.alterTran({
+                    shopId: params.shopId,
+                    shopPass: params.shopPass,
+                    accessId: searchTradeResult.accessId,
+                    accessPass: searchTradeResult.accessPass,
+                    jobCd: GMO.utils.util.JobCd.Void,
+                    siteId: (_g = params.availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.siteId,
+                    sitePass: (_h = params.availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.sitePass
+                }));
+                debug('alterTran processed.');
+            }
+            catch (error) {
+                let throwsError = true;
+                // 未決済(3D 登録済)->取消をトライするとE01050004エラーとなるが、この場合何もする必要はない(2024-01-09~)
+                if (error.name === 'GMOServiceBadRequestError') {
+                    // 会員が存在しない場合このエラーになる
+                    if (Array.isArray(error.errors) && error.errors.length === 1 && error.errors[0].info === 'E01050004') {
+                        if (searchTradeResult.status === GMO.utils.util.Status.Authenticated) {
+                            debug('status:', searchTradeResult.status, 'nothing to do');
+                            throwsError = false;
+                        }
+                    }
+                }
+                if (throwsError) {
+                    throw error;
+                }
+            }
         }
         return alterTranResult;
     });
 }
 function getGMOInfoFromSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const sellers = <Pick<factory.seller.ISeller, 'paymentAccepted' | 'project'>[]>await repos.seller.search(
-        //     {
-        //         limit: 1,
-        //         page: 1,
-        //         id: { $eq: String(params.seller.id) }
-        //     },
-        //     ['paymentAccepted', 'project'],
-        //     []
-        // );
-        // const seller = sellers.shift();
-        // if (seller === undefined) {
-        //     throw new factory.errors.NotFound(factory.organizationType.Corporation);
-        // }
-        var _a, _b;
-        // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === params.paymentMethodType);
+        var _a, _b, _c, _d;
         const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
             seller: { id: params.seller.id },
             codeValue: params.paymentMethodType
@@ -602,33 +584,20 @@ function getGMOInfoFromSeller(params) {
             provider: { id: { $eq: params.seller.id } },
             id: { $eq: params.paymentServiceId }
         });
-        // const paymentServices = <factory.service.paymentService.IService[]>await repos.product.search(
-        //     {
-        //         limit: 1,
-        //         page: 1,
-        //         project: { id: { $eq: seller.project.id } },
-        //         typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
-        //         // serviceType: { codeValue: { $eq: params.paymentMethodType } },
-        //         id: { $eq: params.paymentServiceId }
-        //     },
-        //     [],
-        //     []
-        // );
         const paymentService = paymentServices.shift();
         if (paymentService === undefined) {
             throw new factory.errors.NotFound('PaymentService');
         }
         const provider = paymentService.provider;
-        // const provider = paymentService.provider?.find((p) => p.id === params.seller.id);
-        // if (provider === undefined) {
-        //     throw new factory.errors.NotFound('PaymentService provider');
-        // }
         const shopId = (_a = provider.credentials) === null || _a === void 0 ? void 0 : _a.shopId;
         const shopPass = (_b = provider.credentials) === null || _b === void 0 ? void 0 : _b.shopPass;
         if (typeof shopId !== 'string' || typeof shopPass !== 'string') {
             throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
         }
-        return { shopId, shopPass };
+        const returnUrls3dsSetting = (_c = provider.credentials) === null || _c === void 0 ? void 0 : _c.returnUrls3ds;
+        const returnUrls3ds = (Array.isArray(returnUrls3dsSetting)) ? returnUrls3dsSetting : [];
+        const callbackType3ds = (_d = provider.credentials) === null || _d === void 0 ? void 0 : _d.callbackType3ds;
+        return { shopId, shopPass, returnUrls3ds, callbackType3ds };
     });
 }
 exports.getGMOInfoFromSeller = getGMOInfoFromSeller;

package/lib/chevre/service/payment/faceToFace.d.ts

@@ -5,24 +5,20 @@ import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
-import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
-    project: ProjectRepo;
 }) => Promise<void>;
 declare function payFaceToFace(params: factory.task.pay.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/pay").IAction>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
 export { payFaceToFace, refundFaceToFace, voidTransaction };

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.d.ts

@@ -1,7 +1,6 @@
 import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
-import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import * as factory from '../../../factory';
 interface ICheckResult {
     purchaseNumberAuthIn: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthIn;
@@ -19,6 +18,5 @@ interface ICheckByIdentifierParams {
 declare function checkByIdentifier(params: ICheckByIdentifierParams): (repos: {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<ICheckResult>;
 export { ICheckByIdentifierParams, ICheckResult, checkByIdentifier };

package/lib/chevre/service/payment/movieTicket/checkByIdentifier.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkByIdentifier = void 0;
 const surfrock = require("@surfrock/sdk");
 const moment = require("moment-timezone");
+// import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 const credentials_1 = require("../../../credentials");
 const factory = require("../../../factory");
 const getCredentials_1 = require("./getCredentials");

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -3,7 +3,6 @@ import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
-import type { MongoRepository as ProjectRepo } from '../../../repo/project';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, useCheckMovieTicketBeforePay: boolean, useCheckByIdentifierIfNotYet: boolean): (repos: {
     action: ActionRepo;
@@ -11,7 +10,6 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;