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

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

@@ -64,6 +64,8 @@ declare function refundCreditCard(params: factory.task.refund.IData, requirePayA
 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

@@ -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') {
@@ -72,6 +72,8 @@ function authorize(params, paymentServiceId, options) {
                     // projectSettings: project.settings,
                     shopId: shopId,
                     shopPass: shopPass,
+                    returnUrls3ds,
+                    callbackType3ds,
                     orderId: orderId,
                     availableChannel: availableChannel,
                     object: params.object.paymentMethod
@@ -136,6 +138,17 @@ 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) {
+            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,
@@ -166,7 +179,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);
         }
@@ -573,21 +586,7 @@ function processChangeTransaction(params) {
 }
 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 +601,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/transaction/returnOrder/preStart.d.ts

@@ -0,0 +1,32 @@
+import * as factory from '../../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { MongoRepository as EventRepo } from '../../../repo/event';
+import type { MongoRepository as MerchantReturnPolicyRepo } from '../../../repo/merchantReturnPolicy';
+import type { MongoRepository as OfferRepo } from '../../../repo/offer';
+import type { MongoRepository as OfferItemConditionRepo } from '../../../repo/offerItemCondition';
+import type { MongoRepository as OrderRepo } from '../../../repo/order';
+import type { MongoRepository as ProjectRepo } from '../../../repo/project';
+import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
+import type { MongoRepository as SellerRepo } from '../../../repo/seller';
+interface IPreStartOperationRepos {
+    acceptedOffer: AcceptedOfferRepo;
+    event: EventRepo;
+    merchantReturnPolicy: MerchantReturnPolicyRepo;
+    offer: OfferRepo;
+    offerItemCondition: OfferItemConditionRepo;
+    order: OrderRepo;
+    project: ProjectRepo;
+    reservation: ReservationRepo;
+    seller: SellerRepo;
+}
+type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
+type IFixedSeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+/**
+ * 返品取引開始前処理
+ */
+declare function preStart(params: factory.transaction.returnOrder.IStartParamsWithoutDetail): IPreStartOperation<{
+    transactionObject: factory.transaction.returnOrder.IObject;
+    seller: IFixedSeller;
+    expiresInSeconds: number;
+}>;
+export { preStart };