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

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

@@ -11,6 +11,13 @@ 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() {
@@ -43,16 +50,13 @@ async function main() {
         agent: { id: CLIENT_ID },
         object: {
             typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
-            amount: 1,
+            amount: AMOUNT,
             paymentMethod: paymentMethodType,
             issuedThrough: { id: paymentServiceId },
             method: '1',
             creditCard: {
-                retUrl: String(process.env.SECURE_TRAN_RET_URL),
-                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 },
@@ -61,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),
@@ -90,17 +91,12 @@ async function main() {
                     agent: { id: CLIENT_ID },
                     object: {
                         typeOf: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment,
-                        amount: 1,
+                        amount: AMOUNT,
                         paymentMethodId: publishPaymentUrlResult.paymentMethodId,
                         paymentMethod: paymentMethodType,
                         issuedThrough: { id: paymentServiceId },
                         method: '1',
-                        creditCard: {
-                            cardNo: '4100000000000100',
-                            expire: '2812',
-                            cardPass: '123',
-                            holderName: 'AA AA'
-                        }
+                        creditCard
                     },
                     purpose: { id: transaction.id, typeOf: transaction.typeOf },
                     paymentServiceType: chevre.factory.service.paymentService.PaymentServiceType.CreditCard,
@@ -129,7 +125,7 @@ async function main() {
                     transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
                     transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)
                 });
-                console.log(authorizeResult);
+                console.log('payment authorized.', authorizeResult.result);
 
                 resolve();
             } catch (error) {

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,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 {
@@ -32,8 +30,6 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    person: PersonRepo;
-    project: ProjectRepo;
 }) => Promise<IAuthorizeResult>;
 /**
  * クレジットカード決済中止
@@ -42,7 +38,6 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
 }) => Promise<void>;
 /**
  * クレジットカード決済
@@ -53,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>;
 /**
@@ -65,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,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') {
@@ -69,13 +69,13 @@ function authorize(params, paymentServiceId, options) {
             }
             else {
                 authorizeResult = yield processAuthorizeCreditCard({
-                    projectSettings: project.settings,
+                    // projectSettings: project.settings,
                     shopId: shopId,
                     shopPass: shopPass,
                     orderId: orderId,
                     availableChannel: availableChannel,
                     object: params.object.paymentMethod
-                })(repos);
+                })();
             }
         }
         catch (error) {
@@ -108,8 +108,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,21 +117,21 @@ 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~)
@@ -156,8 +156,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,
@@ -179,8 +179,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 +188,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,

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.351.0-alpha.2",
+    "@chevre/factory": "4.351.0-alpha.3",
     "@cinerino/sdk": "5.6.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.3.0-alpha.0",
@@ -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.2"
+  "version": "21.20.0-alpha.3"
 }