@chevre/domain 21.20.0-alpha.6 → 21.20.0-alpha.7

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

@@ -40,7 +40,7 @@ function publishPaymentUrl(params) {
         let result;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
-                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false })(repos);
+                const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, { searchTrade4accountId: false, processPublishPaymentUrl: true })(repos);
                 let paymentUrl;
                 // 3DS拡張(2024-01-02~)
                 const retUrl = (_c = params.object.paymentMethod.creditCard) === null || _c === void 0 ? void 0 : _c.retUrl;
@@ -304,7 +304,7 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
 }
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
+        const authorizeResult = yield CreditCardPayment.authorize(params, paymentServiceId, Object.assign({ processPublishPaymentUrl: false, searchTrade4accountId: options.searchTrade4accountId }, (options.pendingPaymentAgencyTransaction !== undefined)
             ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
             : undefined))(repos);
         return saveAuthorizeResult({

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

@@ -257,12 +257,13 @@ 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;
@@ -272,6 +273,8 @@ function authorize(params) {
                     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
@@ -303,11 +306,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
@@ -321,7 +325,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 }
         };
@@ -329,12 +333,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,
@@ -369,17 +373,19 @@ function authorize(params) {
             throw error;
         }
         // アクションを完了
-        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: params.object });
+        const result = (0, factory_1.createAuthorizeResult)({ payTransaction, object: authorizeObject });
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
 exports.authorize = authorize;
 function validatePaymentMethodByTransaction(params) {
-    var _a;
+    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.entryTranArgs) === null || _a === void 0 ? void 0 : _a.amount;
+    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');
@@ -388,9 +394,9 @@ function validatePaymentMethodByTransaction(params) {
     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を上書きするか？
+    // 決済方法区分検証
+    if (paymentMethodTypeByObject !== paymentMethodTypeByTransaction) {
+        throw new factory.errors.Argument('object.paymentMethod', 'paymentMethod must match the target of the paymentUrl');
     }
 }
 function validateFromLocation(params) {

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

@@ -26,6 +26,10 @@ 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;

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

@@ -76,7 +76,8 @@ function authorize(params, paymentServiceId, options) {
                     callbackType3ds,
                     orderId: orderId,
                     availableChannel: availableChannel,
-                    object: params.object.paymentMethod
+                    object: params.object.paymentMethod,
+                    processPublishPaymentUrl: options.processPublishPaymentUrl
                 })();
             }
         }
@@ -137,7 +138,7 @@ function processAuthorizeCreditCard(params) {
         }
         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);

package/package.json

@@ -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.6"
+  "version": "21.20.0-alpha.7"
 }