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

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

@@ -1,12 +1,18 @@
 // 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';
 
+// tslint:disable-next-line:max-func-body-length
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
     const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
@@ -36,17 +42,13 @@ 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: 1,
+            paymentMethod: paymentMethodType,
+            issuedThrough: { id: paymentServiceId },
             method: '1',
             creditCard: {
+                retUrl: String(process.env.SECURE_TRAN_RET_URL),
                 cardNo: '4100000000000100',
                 expire: '2812',
                 cardPass: '123',
@@ -73,6 +75,68 @@ async function main() {
         transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
     });
     console.log(publishPaymentUrlResult);
+
+    // 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: 1,
+                        paymentMethodId: publishPaymentUrlResult.paymentMethodId,
+                        paymentMethod: paymentMethodType,
+                        issuedThrough: { id: paymentServiceId },
+                        method: '1',
+                        creditCard: {
+                            cardNo: '4100000000000100',
+                            expire: '2812',
+                            cardPass: '123',
+                            holderName: 'AA AA'
+                        }
+                    },
+                    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);
+
+                resolve();
+            } catch (error) {
+                reject(error);
+            }
+        });
+    });
 }
 
 main()

package/lib/chevre/service/assetTransaction/pay.d.ts

@@ -80,7 +80,7 @@ export type IInvalidatePaymentUrlOperation<T> = (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;
-export type IPublishPaymentUrlResult = CreditCardPayment.IAuthorizeResult & {
+export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransaction & {
     paymentMethodId: string;
     paymentUrl: string;
 };
@@ -99,6 +99,7 @@ export declare function invalidatePaymentUrl(params: factory.task.refund.IData):
 export declare function check(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<{
     result: MovieTicketPayment.ICheckResult;
 }>;
+export import IPaymentAgencyTransaction = CreditCardPayment.IPaymentAgencyTransaction;
 /**
  * 取引開始
  */
@@ -106,6 +107,7 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
     useCheckMovieTicketBeforePay: boolean;
     useCheckByIdentifierIfNotYet: boolean;
     searchTrade4accountId: boolean;
+    pendingPaymentAgencyTransaction?: CreditCardPayment.IPaymentAgencyTransaction;
 }): IStartOperation<factory.assetTransaction.pay.ITransaction>;
 /**
  * 取引確定

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;
@@ -40,14 +40,22 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, false)(repos);
-                const acsUrl = authorizeResult.execTranResult.acsUrl;
-                if (typeof acsUrl !== 'string' || acsUrl.length === 0) {
-                    throw new factory.errors.ServiceUnavailable('Payment URL unable to publish');
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false })(repos);
+                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,
@@ -138,7 +146,9 @@ function start(params, options) {
                 break;
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 transaction =
-                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), options.searchTrade4accountId)(repos);
+                    yield processAuthorizeCreditCard(params, transaction, String(paymentService === null || paymentService === void 0 ? void 0 : paymentService.id), Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+                        ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
+                        : undefined))(repos);
                 break;
             case factory.service.paymentService.PaymentServiceType.MovieTicket:
                 transaction =
@@ -292,20 +302,16 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
         })(repos);
     });
 }
-function processAuthorizeCreditCard(params, transaction, paymentServiceId, searchTrade4accountId) {
+function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, searchTrade4accountId)(repos);
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+            ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
+            : 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

@@ -256,16 +256,22 @@ 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, _b;
+        var _a;
         const transaction = yield repos.transaction.findInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id });
         const paymentServiceType = params.paymentServiceType;
         // 取引番号生成
         let transactionNumber;
+        let pendingPaymentAgencyTransaction;
         // リクエストでpaymentMethodIdを指定された場合、取引に保管されたpaymentMethodIdに一致すればそちらを適用(外部サイト決済対応)
         if (typeof params.object.paymentMethodId === 'string' && params.object.paymentMethodId.length > 0) {
-            const paymentMethodIdByTransaction = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
-            if (params.object.paymentMethodId === paymentMethodIdByTransaction) {
+            const paymentMethodByTransaction = transaction.object.paymentMethods;
+            if (params.object.paymentMethodId === (paymentMethodByTransaction === null || paymentMethodByTransaction === void 0 ? void 0 : paymentMethodByTransaction.paymentMethodId)) {
                 transactionNumber = params.object.paymentMethodId;
+                const { entryTranArgs, entryTranResult, execTranArgs, execTranResult } = paymentMethodByTransaction;
+                if (entryTranArgs !== undefined && entryTranResult !== undefined
+                    && execTranArgs !== undefined && execTranResult !== undefined) {
+                    pendingPaymentAgencyTransaction = { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
+                }
                 // 既に承認済であれば何もしない(2023-05-15~)
                 const existingCompletedAuthorizeActions = yield repos.action.searchByPurpose({
                     typeOf: factory.actionType.AuthorizeAction,
@@ -309,7 +315,7 @@ function authorize(params) {
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_b = transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                    : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
             },
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         };
@@ -328,11 +334,7 @@ function authorize(params) {
                 transactionNumber: transactionNumber,
                 location: params.location
             });
-            payTransaction = yield PayTransactionService.start(startParams, {
-                useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay,
-                useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
-                searchTrade4accountId: params.options.useSearchTrade4accountId
-            })(repos);
+            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ useCheckMovieTicketBeforePay: params.options.useCheckMovieTicketBeforePay, useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet, searchTrade4accountId: params.options.useSearchTrade4accountId }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos);
         }
         catch (error) {
             try {

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

@@ -11,29 +11,30 @@ 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 {
+    entryTranArgs: GMO.factory.credit.IEntryTranArgs;
+    entryTranResult: GMO.factory.credit.IEntryTranResult;
+    execTranArgs: GMO.factory.credit.IExecTranArgs;
+    execTranResult: GMO.factory.credit.IExecTranResult | GMO.factory.credit.IExecTran3dsResult;
+    secureTran2Result?: GMO.factory.credit.ISecureTran2Result;
+}
+type IAuthorizeResult = IPaymentAgencyTransaction & {
+    accountId: string;
+    paymentMethodId: string;
+};
 /**
  * クレジットカード決済承認
  */
-declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, searchTrade4accountId: boolean): (repos: {
+declare function authorize(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, options: {
+    searchTrade4accountId: boolean;
+    pendingPaymentAgencyTransaction?: IPaymentAgencyTransaction;
+}): (repos: {
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     person: PersonRepo;
     project: ProjectRepo;
-}) => Promise<{
-    accountId: string;
-    paymentMethodId: string;
-    entryTranArgs: GMO.factory.credit.IEntryTranArgs;
-    entryTranResult: GMO.factory.credit.IEntryTranResult;
-    execTranArgs: GMO.factory.credit.IExecTranArgs;
-    execTranResult: GMO.factory.credit.IExecTranResult;
-}>;
-interface IAuthorizeResult {
-    entryTranArgs: GMO.factory.credit.IEntryTranArgs;
-    entryTranResult: GMO.factory.credit.IEntryTranResult;
-    execTranArgs: GMO.factory.credit.IExecTranArgs;
-    execTranResult: GMO.factory.credit.IExecTranResult;
-}
+}) => Promise<IAuthorizeResult>;
 /**
  * クレジットカード決済中止
  */
@@ -87,4 +88,4 @@ declare function searchGMOTrade(params: {
     shopId: string;
     shopPass: string;
 }): Promise<GMO.factory.credit.ISearchTradeResult>;
-export { IAuthorizeResult, getGMOInfoFromSeller, authorize, payCreditCard, refundCreditCard, searchGMOTrade, voidTransaction };
+export { IAuthorizeResult, IPaymentAgencyTransaction, getGMOInfoFromSeller, authorize, payCreditCard, refundCreditCard, searchGMOTrade, voidTransaction };

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

@@ -25,9 +25,10 @@ const debug = createDebug('chevre-domain:service:payment');
 /**
  * クレジットカード決済承認
  */
-function authorize(params, paymentServiceId, searchTrade4accountId) {
+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;
+        var _a, _b, _c, _d, _e;
         const project = yield repos.project.findById({
             id: params.project.id,
             inclusion: ['settings'],
@@ -57,18 +58,30 @@ function authorize(params, paymentServiceId, searchTrade4accountId) {
         let authorizeResult;
         let searchTradeResult;
         try {
-            authorizeResult = yield processAuthorizeCreditCard({
-                projectSettings: project.settings,
-                shopId: shopId,
-                shopPass: shopPass,
-                orderId: orderId,
-                availableChannel: availableChannel,
-                object: params.object.paymentMethod
-            })(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
+                })(repos);
+            }
         }
         catch (error) {
             throw handleAuthorizeError(error);
         }
+        const searchTrade4accountId = (options === null || options === void 0 ? void 0 : options.searchTrade4accountId) === true;
         if (searchTrade4accountId) {
             try {
                 const creditCardService = new GMO.service.Credit({ endpoint: String(availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
@@ -79,8 +92,8 @@ function authorize(params, paymentServiceId, searchTrade4accountId) {
                     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');
             }
@@ -89,18 +102,12 @@ function authorize(params, paymentServiceId, searchTrade4accountId) {
                 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) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         // GMOオーソリ取得
@@ -109,25 +116,13 @@ function processAuthorizeCreditCard(params) {
         let execTranArgs;
         let execTranResult;
         const creditCardService = new GMO.service.Credit({ endpoint: String(params.availableChannel.serviceUrl) }, { timeout: credentials_1.credentials.gmo.timeout });
-        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: (_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
-        };
-        entryTranResult = yield creditCardService.entryTran(entryTranArgs);
         const creditCard = params.object.creditCard;
         let memberId = creditCard.memberId;
         const cardSeq = creditCard.cardSeq;
         if (typeof memberId === 'string' && memberId.length > 0 && typeof cardSeq === 'number') {
             // 特殊なプロジェクトのみユーザーネームに自動変換(新旧会員互換性維持対応)
             // memberIdはPersonIDが指定されてくる想定
-            const useUsernameAsGMOMemberId = ((_c = params.projectSettings) === null || _c === void 0 ? void 0 : _c.useUsernameAsGMOMemberId) === true;
+            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 });
@@ -138,28 +133,83 @@ function processAuthorizeCreditCard(params) {
                 }
             }
         }
-        execTranArgs = {
-            accessId: entryTranResult.accessId,
-            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,
-            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: params.availableChannel.credentials?.siteId,
+                // sitePass: params.availableChannel.credentials?.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: (_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);
+            execTranArgs = {
+                accessId: entryTranResult.accessId,
+                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,
+                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.0",
+    "@chevre/factory": "4.351.0-alpha.2",
     "@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.0"
+  "version": "21.20.0-alpha.2"
 }