@chevre/domain 21.20.0-alpha.1 → 21.20.0-alpha.3

package/example/src/chevre/transaction/processPlaceOrder.ts

@@ -1,11 +1,23 @@
 // tslint:disable:no-console
 import * as mongoose from 'mongoose';
+import * as readline from 'readline';
 import * as redis from 'redis';
 
 import { chevre } from '../../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 const CLIENT_ID = '51qbjcfr72h62m06vtv5kkhgje';
+const paymentMethodType = 'CreditCard';
+const paymentServiceId = '5f9a4fed4f3709000abe6415';
+// const paymentMethodType = 'PayPay';
+// const paymentServiceId = '60e9560176a391000b23e20b';
+const AMOUNT: number = 1;
+const creditCard: chevre.factory.paymentMethod.paymentCard.creditCard.IUncheckedCardRaw = {
+    cardNo: '4100000000000100',
+    expire: '2812',
+    cardPass: '123',
+    holderName: 'AA AA'
+};
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -37,21 +49,14 @@ async function main() {
         project: { id: project.id },
         agent: { id: CLIENT_ID },
         object: {
-            // accountId?: string;
-            // additionalProperty?: IPropertyValue<string>[];
-            amount: 1,
-            // description?: string;
-            // name?: string;
-            paymentMethod: 'PayPay',
-            // paymentMethodId?: string;
             typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
-            issuedThrough: { id: '60e9560176a391000b23e20b' },
+            amount: AMOUNT,
+            paymentMethod: paymentMethodType,
+            issuedThrough: { id: paymentServiceId },
             method: '1',
             creditCard: {
-                cardNo: '4100000000000100',
-                expire: '2812',
-                cardPass: '123',
-                holderName: 'AA AA'
+                ...creditCard,
+                retUrl: String(process.env.SECURE_TRAN_RET_URL)
             }
         },
         purpose: { id: transaction.id, typeOf: transaction.typeOf },
@@ -60,9 +65,6 @@ async function main() {
             typeOf: chevre.factory.creativeWorkType.WebApplication,
             id: CLIENT_ID
         }
-        // options: {
-        //     use3DS: true
-        // }
     })({
         assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
         paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
@@ -75,55 +77,62 @@ async function main() {
     });
     console.log(publishPaymentUrlResult);
 
-    const authorizeResult = await (await chevre.service.payment.any.createService()).authorize({
-        project: { id: project.id },
-        agent: { id: CLIENT_ID },
-        object: {
-            // accountId?: string;
-            // additionalProperty?: IPropertyValue<string>[];
-            amount: 1,
-            // description?: string;
-            // name?: string;
-            paymentMethod: 'PayPay',
-            paymentMethodId: publishPaymentUrlResult.paymentMethodId,
-            typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
-            issuedThrough: { id: '60e9560176a391000b23e20b' },
-            method: '1',
-            creditCard: {
-                cardNo: '4100000000000100',
-                expire: '2812',
-                cardPass: '123',
-                holderName: 'AA AA'
+    // wait callback...
+    await new Promise<void>((resolve, reject) => {
+        const rl = readline.createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        rl.question('callback received?:\n', async () => {
+            try {
+                const authorizeResult = await (await chevre.service.payment.any.createService()).authorize({
+                    project: { id: project.id },
+                    agent: { id: CLIENT_ID },
+                    object: {
+                        typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
+                        amount: AMOUNT,
+                        paymentMethodId: publishPaymentUrlResult.paymentMethodId,
+                        paymentMethod: paymentMethodType,
+                        issuedThrough: { id: paymentServiceId },
+                        method: '1',
+                        creditCard
+                    },
+                    purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                    paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
+                    location: {
+                        typeOf: chevre.factory.creativeWorkType.WebApplication,
+                        id: CLIENT_ID
+                    },
+                    options: {
+                        useCancelPayTransactionOnFailed: false,
+                        useCheckMovieTicketBeforePay: false,
+                        useCheckByIdentifierIfNotYet: false,
+                        useSearchTrade4accountId: false
+                    }
+                })({
+                    accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
+                    action: await chevre.repository.Action.createInstance(mongoose.connection),
+                    assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
+                    event: await chevre.repository.Event.createInstance(mongoose.connection),
+                    paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
+                    paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
+                    paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
+                    person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
+                    product: await chevre.repository.Product.createInstance(mongoose.connection),
+                    project: await chevre.repository.Project.createInstance(mongoose.connection),
+                    task: await chevre.repository.Task.createInstance(mongoose.connection),
+                    transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
+                    transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+                });
+                console.log('payment authorized.', authorizeResult.result);
+
+                resolve();
+            } catch (error) {
+                reject(error);
             }
-        },
-        purpose: { id: transaction.id, typeOf: transaction.typeOf },
-        paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
-        location: {
-            typeOf: chevre.factory.creativeWorkType.WebApplication,
-            id: CLIENT_ID
-        },
-        options: {
-            useCancelPayTransactionOnFailed: false,
-            useCheckMovieTicketBeforePay: false,
-            useCheckByIdentifierIfNotYet: false,
-            useSearchTrade4accountId: false
-        }
-    })({
-        accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
-        action: await chevre.repository.Action.createInstance(mongoose.connection),
-        assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
-        event: await chevre.repository.Event.createInstance(mongoose.connection),
-        paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
-        paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),
-        paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
-        person: await chevre.repository.Person.createInstance({ userPoolId: '' }),
-        product: await chevre.repository.Product.createInstance(mongoose.connection),
-        project: await chevre.repository.Project.createInstance(mongoose.connection),
-        task: await chevre.repository.Task.createInstance(mongoose.connection),
-        transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
-        transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
+        });
     });
-    console.log(authorizeResult);
 }
 
 main()

package/lib/chevre/service/assetTransaction/pay.js

@@ -23,7 +23,7 @@ const potentialActions_1 = require("./pay/potentialActions");
  */
 function publishPaymentUrl(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
         // 金額をfix
         const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
@@ -41,13 +41,21 @@ function publishPaymentUrl(params) {
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false })(repos);
-                const acsUrl = authorizeResult.execTranResult.acsUrl;
-                if (typeof acsUrl !== 'string' || acsUrl.length === 0) {
-                    throw new factory.errors.ServiceUnavailable('Payment URL unable to publish');
+                let paymentUrl;
+                // 3DS拡張(2024-01-02~)
+                const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
+                if (typeof retUrl === 'string' && retUrl.length > 0) {
+                    paymentUrl = authorizeResult.execTranResult.redirectUrl;
+                }
+                else {
+                    paymentUrl = authorizeResult.execTranResult.acsUrl;
+                }
+                if (typeof paymentUrl !== 'string' || paymentUrl.length === 0) {
+                    throw new factory.errors.ServiceUnavailable(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
                 }
                 result = {
                     paymentMethodId: transactionNumber,
-                    paymentUrl: acsUrl,
+                    paymentUrl,
                     entryTranArgs: authorizeResult.entryTranArgs,
                     entryTranResult: authorizeResult.entryTranResult,
                     execTranArgs: authorizeResult.execTranArgs,
@@ -301,15 +309,9 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
             : undefined))(repos);
         return saveAuthorizeResult({
             id: transaction.id,
-            update: {
-                'object.accountId': authorizeResult.accountId,
-                'object.paymentMethod.accountId': authorizeResult.accountId,
-                'object.paymentMethod.paymentMethodId': authorizeResult.paymentMethodId,
-                'object.entryTranArgs': authorizeResult.entryTranArgs,
-                'object.entryTranResult': authorizeResult.entryTranResult,
-                'object.execTranArgs': authorizeResult.execTranArgs,
-                'object.execTranResult': authorizeResult.execTranResult
-            }
+            update: Object.assign({ 'object.accountId': authorizeResult.accountId, 'object.paymentMethod.accountId': authorizeResult.accountId, 'object.paymentMethod.paymentMethodId': authorizeResult.paymentMethodId, 'object.entryTranArgs': authorizeResult.entryTranArgs, 'object.entryTranResult': authorizeResult.entryTranResult, 'object.execTranArgs': authorizeResult.execTranArgs, 'object.execTranResult': authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined)
+                ? { 'object.secureTran2Result': authorizeResult.secureTran2Result }
+                : undefined)
         })(repos);
     });
 }

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

@@ -237,7 +237,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,
@@ -266,6 +267,11 @@ function authorize(params) {
         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
+                });
                 transactionNumber = params.object.paymentMethodId;
                 const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
                 if (entryTranArgs !== undefined && entryTranResult !== undefined
@@ -368,6 +374,25 @@ function authorize(params) {
     });
 }
 exports.authorize = authorize;
+function validatePaymentMethodByTransaction(params) {
+    var _a;
+    const paymentServiceIdByObject = params.object.issuedThrough.id;
+    const amountByObject = params.object.amount;
+    const paymentServiceIdByTransaction = params.paymentMethodByTransaction.issuedThrough.id;
+    const amountByTransaction = (_a = params.paymentMethodByTransaction.entryTranArgs) === null || _a === void 0 ? void 0 : _a.amount;
+    // 決済サービス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 (params.paymentMethodByTransaction.paymentMethod !== undefined) {
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO params.objectを上書きするか？
+    }
+}
 function validateFromLocation(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;

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

@@ -7,26 +7,14 @@ 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';
-export interface IExecTran3dsResult {
-    /**
-     * ACS呼出判定
-     */
-    acs: string;
-    /**
-     * 3DSサーバーへのリダイレクトURL
-     * 3DS2.0認証初期化へのURL
-     */
-    redirectUrl?: string;
-}
 interface IPaymentAgencyTransaction {
     entryTranArgs: GMO.factory.credit.IEntryTranArgs;
     entryTranResult: GMO.factory.credit.IEntryTranResult;
     execTranArgs: GMO.factory.credit.IExecTranArgs;
-    execTranResult: GMO.factory.credit.IExecTranResult | IExecTran3dsResult;
+    execTranResult: GMO.factory.credit.IExecTranResult | GMO.factory.credit.IExecTran3dsResult;
+    secureTran2Result?: GMO.factory.credit.ISecureTran2Result;
 }
 type IAuthorizeResult = IPaymentAgencyTransaction & {
     accountId: string;
@@ -42,8 +30,6 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
-    project: ProjectRepo;
 }) => Promise<IAuthorizeResult>;
 /**
  * クレジットカード決済中止
@@ -52,7 +38,6 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<void>;
 /**
  * クレジットカード決済
@@ -63,7 +48,6 @@ 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>;
 /**
@@ -75,7 +59,6 @@ declare function refundCreditCard(params: factory.task.refund.IData, requirePayA
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     task: TaskRepo;
 }) => Promise<import("@chevre/factory/lib/action/trade/refund").IAction>;
 interface IGMOInfo {

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

@@ -20,19 +20,20 @@ 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');
 /**
  * クレジットカード決済承認
  */
 function authorize(params, paymentServiceId, options) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const project = yield repos.project.findById({
-            id: params.project.id,
-            inclusion: ['settings'],
-            exclusion: []
-        });
+        // const project = <Pick<factory.project.IProject, 'settings'>>await repos.project.findById({
+        //     id: params.project.id,
+        //     inclusion: ['settings'],
+        //     exclusion: []
+        // });
+        var _a, _b, _c, _d, _e;
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
@@ -57,9 +58,25 @@ function authorize(params, paymentServiceId, options) {
         let authorizeResult;
         let searchTradeResult;
         try {
-            authorizeResult = yield processAuthorizeCreditCard(Object.assign({ projectSettings: project.settings, shopId: shopId, shopPass: shopPass, orderId: orderId, availableChannel: availableChannel, object: params.object.paymentMethod }, (options.pendingPaymentAgencyTransaction !== undefined)
-                ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
-                : undefined))(repos);
+            const pendingPaymentAgencyTransaction = options.pendingPaymentAgencyTransaction;
+            const redirectUrl = (_c = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _c === void 0 ? void 0 : _c.redirectUrl;
+            if (pendingPaymentAgencyTransaction !== undefined
+                && typeof redirectUrl === 'string' && redirectUrl.length > 0) {
+                authorizeResult = yield processAuthorizeCreditCard3ds({
+                    availableChannel,
+                    pendingPaymentAgencyTransaction
+                })();
+            }
+            else {
+                authorizeResult = yield processAuthorizeCreditCard({
+                    // projectSettings: project.settings,
+                    shopId: shopId,
+                    shopPass: shopPass,
+                    orderId: orderId,
+                    availableChannel: availableChannel,
+                    object: params.object.paymentMethod
+                })();
+            }
         }
         catch (error) {
             throw handleAuthorizeError(error);
@@ -75,8 +92,8 @@ function authorize(params, paymentServiceId, options) {
                     shopId: shopId,
                     shopPass: shopPass,
                     orderId: orderId,
-                    siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
-                    sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
+                    siteId: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
+                    sitePass: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass
                 });
                 debug('searchTrade processed. orderId:', orderId, 'execution time:', (Date.now() - startSearchTradeDate), 'ms');
             }
@@ -85,19 +102,13 @@ function authorize(params, paymentServiceId, options) {
                 debug('searchTrade throwed an error. orderId:', orderId, error);
             }
         }
-        return {
-            accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '',
-            paymentMethodId: orderId,
-            entryTranArgs: authorizeResult.entryTranArgs,
-            entryTranResult: authorizeResult.entryTranResult,
-            execTranArgs: authorizeResult.execTranArgs,
-            execTranResult: authorizeResult.execTranResult
-        };
+        return Object.assign({ accountId: (searchTradeResult !== undefined) ? searchTradeResult.cardNo : '', paymentMethodId: orderId, entryTranArgs: authorizeResult.entryTranArgs, entryTranResult: authorizeResult.entryTranResult, execTranArgs: authorizeResult.execTranArgs, execTranResult: authorizeResult.execTranResult }, (authorizeResult.secureTran2Result !== undefined) ? { secureTran2Result: authorizeResult.secureTran2Result } : undefined);
     });
 }
 exports.authorize = authorize;
 function processAuthorizeCreditCard(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    // tslint:disable-next-line:max-func-body-length
+    return () => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
         // GMOオーソリ取得
         let entryTranArgs;
@@ -105,67 +116,100 @@ function processAuthorizeCreditCard(params) {
         let execTranArgs;
         let execTranResult;
         const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-        const pendingPaymentAgencyTransaction = params.pendingPaymentAgencyTransaction;
-        if (pendingPaymentAgencyTransaction !== undefined) {
-            const redirectUrl = (_a = pendingPaymentAgencyTransaction === null || pendingPaymentAgencyTransaction === void 0 ? void 0 : pendingPaymentAgencyTransaction.execTranResult) === null || _a === void 0 ? void 0 : _a.redirectUrl;
-            if (typeof redirectUrl === 'string' && redirectUrl.length > 0) {
-                throw new factory.errors.NotImplemented('secureTran2 not implemented');
-                // return {
-                //     ...pendingPaymentAgencyTransaction
-                // };
-            }
-        }
-        entryTranArgs = {
-            shopId: params.shopId,
-            shopPass: params.shopPass,
-            orderId: params.orderId,
-            jobCd: GMO.utils.util.JobCd.Auth,
-            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
-        };
-        entryTranResult = yield creditCardService.entryTran(entryTranArgs);
         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 = ((_d = params.projectSettings) === null || _d === void 0 ? void 0 : _d.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;
+            //     }
+            // }
         }
-        execTranArgs = {
-            accessId: entryTranResult.accessId,
-            accessPass: entryTranResult.accessPass,
-            orderId: params.orderId,
-            method: params.object.method,
-            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,
-            token: creditCard.token,
-            memberId: memberId,
-            cardSeq: cardSeq,
-            seqMode: GMO.utils.util.SeqMode.Physics
-        };
-        execTranResult = yield creditCardService.execTran(execTranArgs);
-        return {
-            entryTranArgs,
-            entryTranResult,
-            execTranArgs,
-            execTranResult
-        };
+        const retUrl = creditCard === null || creditCard === void 0 ? void 0 : creditCard.retUrl;
+        // 3DS拡張(2024-01-02~)
+        if (typeof retUrl === 'string' && retUrl.length > 0) {
+            entryTranArgs = {
+                shopId: params.shopId,
+                shopPass: params.shopPass,
+                orderId: params.orderId,
+                jobCd: GMO.utils.util.JobCd.Auth,
+                amount: (typeof params.object.amount === 'number')
+                    ? params.object.amount
+                    : params.object.amount.value,
+                // siteId: params.availableChannel.credentials?.siteId,
+                // sitePass: params.availableChannel.credentials?.sitePass,
+                tdFlag: GMO.utils.util.TdFlag.Version2,
+                // tdTenantName: '',
+                tds2Type: GMO.utils.util.Tds2Type.Error
+            };
+            entryTranResult = yield creditCardService.entryTran(entryTranArgs);
+            execTranArgs = {
+                accessId: entryTranResult.accessId,
+                accessPass: entryTranResult.accessPass,
+                orderId: params.orderId,
+                method: params.object.method,
+                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,
+                token: creditCard.token,
+                memberId: memberId,
+                cardSeq: cardSeq,
+                seqMode: GMO.utils.util.SeqMode.Physics,
+                retUrl,
+                callbackType: GMO.utils.util.CallbackType.Get
+            };
+            execTranResult = yield creditCardService.execTran3ds(execTranArgs);
+        }
+        else {
+            entryTranArgs = {
+                shopId: params.shopId,
+                shopPass: params.shopPass,
+                orderId: params.orderId,
+                jobCd: GMO.utils.util.JobCd.Auth,
+                amount: (typeof params.object.amount === 'number')
+                    ? params.object.amount
+                    : params.object.amount.value,
+                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 = {
+                accessId: entryTranResult.accessId,
+                accessPass: entryTranResult.accessPass,
+                orderId: params.orderId,
+                method: params.object.method,
+                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,
+                token: creditCard.token,
+                memberId: memberId,
+                cardSeq: cardSeq,
+                seqMode: GMO.utils.util.SeqMode.Physics
+            };
+            execTranResult = yield creditCardService.execTran(execTranArgs);
+        }
+        return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
+    });
+}
+function processAuthorizeCreditCard3ds(params) {
+    return () => __awaiter(this, void 0, void 0, function* () {
+        const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
+        const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = params.pendingPaymentAgencyTransaction;
+        const { accessId, accessPass } = entryTranResult;
+        const secureTran2Result = yield creditCardService.secureTran2({ accessId, accessPass });
+        return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
     });
 }
 function handleAuthorizeError(error) {

package/package.json

@@ -10,10 +10,10 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.351.0-alpha.1",
+    "@chevre/factory": "4.351.0-alpha.3",
     "@cinerino/sdk": "5.6.0",
     "@motionpicture/coa-service": "9.2.0",
-    "@motionpicture/gmo-service": "5.2.0",
+    "@motionpicture/gmo-service": "5.3.0-alpha.0",
     "@sendgrid/mail": "6.4.0",
     "@surfrock/sdk": "1.2.0",
     "@waiter/domain": "6.4.0-alpha.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.20.0-alpha.1"
+  "version": "21.20.0-alpha.3"
 }