@chevre/domain 22.6.0-alpha.30 → 22.6.0-alpha.32

package/lib/chevre/repo/credentials.js

@@ -20,15 +20,19 @@ class CredentialsRepo {
     }
     save(credentials) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { access_token, expired_at } = credentials;
+            if (typeof this.options.expireInSeconds !== 'number' || this.options.expireInSeconds <= 0) {
+                // expireInSeconds:0に設定すれば保管しない
+                return;
+            }
+            // const { access_token, expired_at } = credentials;
             if (typeof credentials.access_token !== 'string') {
                 throw new Error('access_token must be string');
             }
-            if (typeof credentials.expired_at !== 'string') {
-                throw new Error('expired_at must be string');
-            }
+            // if (typeof credentials.expired_at !== 'string') {
+            //     throw new Error('expired_at must be string');
+            // }
             const key = this.createKey();
-            const value = JSON.stringify({ access_token, expired_at });
+            const value = JSON.stringify(credentials);
             const multi = this.redisClient.multi();
             yield multi.set(key, value)
                 // .expireAt(key, Number(expired_at))

package/lib/chevre/repository.d.ts

@@ -16,6 +16,7 @@ import type { AuthorizationRepo } from './repo/authorization';
 import type { CategoryCodeRepo } from './repo/categoryCode';
 import type { CommentRepo } from './repo/comment';
 import type { CreativeWorkRepo } from './repo/creativeWork';
+import type { CredentialsRepo } from './repo/credentials';
 import type { CustomerRepo } from './repo/customer';
 import type { CustomerTypeRepo } from './repo/customerType';
 import type { EmailMessageRepo } from './repo/emailMessage';
@@ -134,6 +135,10 @@ export type CreativeWork = CreativeWorkRepo;
 export declare namespace CreativeWork {
     function createInstance(...params: ConstructorParameters<typeof CreativeWorkRepo>): Promise<CreativeWorkRepo>;
 }
+export type Credentials = CredentialsRepo;
+export declare namespace Credentials {
+    function createInstance(...params: ConstructorParameters<typeof CredentialsRepo>): Promise<CredentialsRepo>;
+}
 export type Customer = CustomerRepo;
 export declare namespace Customer {
     function createInstance(...params: ConstructorParameters<typeof CustomerRepo>): Promise<CustomerRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Role = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.Interface = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = void 0;
+exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.Interface = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -219,6 +219,19 @@ var CreativeWork;
     }
     CreativeWork.createInstance = createInstance;
 })(CreativeWork = exports.CreativeWork || (exports.CreativeWork = {}));
+var Credentials;
+(function (Credentials) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/credentials'))).CredentialsRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    Credentials.createInstance = createInstance;
+})(Credentials = exports.Credentials || (exports.Credentials = {}));
 var Customer;
 (function (Customer) {
     let repo;

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

@@ -8,6 +8,7 @@ import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { CredentialsRepo } from '../../repo/credentials';
 import type { EventRepo } from '../../repo/event';
 import type { OrderRepo } from '../../repo/order';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
@@ -20,6 +21,7 @@ import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
@@ -49,6 +51,7 @@ export type IExportTasksOperation<T> = (repos: {
 }) => Promise<T>;
 export type ICheckOperation<T> = (repos: {
     action: ActionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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

@@ -22,7 +22,6 @@ const onPaymentStatusChanged_1 = require("./onPaymentStatusChanged");
 function onRefund(refundAction) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
         const aciton4inform = (0, factory_1.optimizeAction4inform)(refundAction);
         const potentialActions = refundAction.potentialActions;
         const now = new Date();
@@ -37,38 +36,52 @@ function onRefund(refundAction) {
             const informPayment = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.informPayment;
             // 手数料決済があれば処理
             // CreditCardIFのみ(2023-06-29~)
-            const paymentServiceType = (_a = refundAction.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
+            const firstObject = refundAction.object[0];
+            const paymentServiceType = firstObject === null || firstObject === void 0 ? void 0 : firstObject.typeOf;
             if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                const refundFee = (_b = refundAction.object[0]) === null || _b === void 0 ? void 0 : _b.refundFee;
+                const refundFee = firstObject === null || firstObject === void 0 ? void 0 : firstObject.refundFee;
                 if (typeof refundFee === 'number' && refundFee > 0) {
                     // purpose.typeOf:PlaceOrderは外部決済URL無効化における返金アクションのみなので、手数料決済から除外してよい(2024-03-19~)
                     // purpose.typeOf:Orderは決済カード承認時着券の取消なので、手数料決済から除外してよい
                     // 手数料決済は注文返品による返金アクションからしか発生しないはず(2024-06-13~)
                     if (refundAction.purpose.typeOf === factory.actionType.ReturnAction) {
-                        const payReturnFeeObject = refundAction.object.map((o) => {
-                            return {
-                                typeOf: o.typeOf,
-                                id: o.id,
+                        const payReturnFeeObject = [{
+                                typeOf: firstObject.typeOf,
+                                id: firstObject.id,
                                 paymentMethod: {
-                                    accountId: o.paymentMethod.accountId,
-                                    additionalProperty: o.paymentMethod.additionalProperty,
-                                    name: o.paymentMethod.name,
-                                    paymentMethodId: o.paymentMethod.paymentMethodId,
+                                    accountId: firstObject.paymentMethod.accountId,
+                                    additionalProperty: firstObject.paymentMethod.additionalProperty,
+                                    name: firstObject.paymentMethod.name,
+                                    paymentMethodId: firstObject.paymentMethod.paymentMethodId,
                                     totalPaymentDue: {
                                         typeOf: 'MonetaryAmount',
                                         currency: factory.priceCurrency.JPY,
                                         value: refundFee
                                     },
-                                    typeOf: o.paymentMethod.typeOf
+                                    typeOf: firstObject.paymentMethod.typeOf
                                 }
-                            };
-                        });
+                            }];
+                        // const payReturnFeeObject: factory.action.trade.pay.IObject = refundAction.object.map((o) => {
+                        //     return {
+                        //         typeOf: o.typeOf,
+                        //         id: o.id,
+                        //         paymentMethod: {
+                        //             accountId: o.paymentMethod.accountId,
+                        //             additionalProperty: o.paymentMethod.additionalProperty,
+                        //             name: o.paymentMethod.name,
+                        //             paymentMethodId: o.paymentMethod.paymentMethodId,
+                        //             totalPaymentDue: {
+                        //                 typeOf: 'MonetaryAmount',
+                        //                 currency: factory.priceCurrency.JPY,
+                        //                 value: refundFee
+                        //             },
+                        //             typeOf: o.paymentMethod.typeOf
+                        //         }
+                        //     };
+                        // });
                         const payReturnFeeAction = {
-                            // project: refundAction.project,
                             typeOf: factory.actionType.PayAction,
                             object: payReturnFeeObject,
-                            // agent: refundAction.project,
-                            // recipient: refundAction.agent, // 返金者は販売者のはず
                             purpose: refundAction.purpose,
                             potentialActions: {
                                 add2report: true,

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

@@ -9,6 +9,7 @@ import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../repo/
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../repo/confirmationNumber';
+import type { CredentialsRepo } from '../../repo/credentials';
 import type { EventRepo } from '../../repo/event';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
@@ -78,6 +79,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     confirmationNumber: ConfirmationNumberRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -35,6 +36,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
 }): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.d.ts

@@ -1,4 +1,5 @@
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -8,6 +9,7 @@ import { Settings } from '../../../settings';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
     action: ActionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -31,12 +31,15 @@ function checkMovieTicket(params) {
                 serviceOutput: { reservationFor: serviceOutput.reservationFor } // 最適化(2024-03-15~)
             };
         });
-        const optimizedCheckObject = params.object.map(({ id, typeOf, paymentMethod, seller }) => {
-            return {
+        const firstObject = params.object.shift(); // object.length:1なのでこれでok
+        if (firstObject === undefined) {
+            throw new factory.errors.ArgumentNull('object');
+        }
+        const { id, typeOf, paymentMethod, seller } = firstObject;
+        const optimizedCheckObject = [{
                 id, typeOf, seller, movieTickets,
                 paymentMethod: { typeOf: paymentMethod.typeOf } // 最適化(2024-03-15~)
-            };
-        });
+            }];
         const paymentMethodType = (_b = optimizedCheckObject[0]) === null || _b === void 0 ? void 0 : _b.paymentMethod.typeOf; // 決済方法区分
         const paymentServiceId = (_c = optimizedCheckObject[0]) === null || _c === void 0 ? void 0 : _c.id;
         const actionAttributes = Object.assign(Object.assign({ project: params.project, typeOf: factory.actionType.CheckAction, agent: params.agent, object: optimizedCheckObject }, (typeof ((_d = params.purpose) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { purpose: params.purpose } : undefined), (typeof ((_e = params.sameAs) === null || _e === void 0 ? void 0 : _e.id) === 'string')
@@ -53,10 +56,7 @@ function checkMovieTicket(params) {
             if (eventIds.length !== 1) {
                 throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
             }
-            const screeningEvent = yield repos.event.projectEventFieldsById({ id: eventIds[0] }, [
-                'typeOf', 'project', 'coaInfo', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier'
-            ] // optimize projection(2024-07-19~)
-            );
+            const screeningEvent = yield repos.event.projectEventFieldsById({ id: eventIds[0] }, ['typeOf', 'project', 'coaInfo', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier']);
             const sellerId = (_f = optimizedCheckObject[0]) === null || _f === void 0 ? void 0 : _f.seller.id;
             const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },
@@ -86,10 +86,7 @@ function checkMovieTicket(params) {
             }
             throw errors[0];
         }
-        const result = {
-        // purchaseNumberAuthIn: processPurchaseNumberAuthResult.purchaseNumberAuthIn, // discontinue(2024-06-10~)
-        // purchaseNumberAuthResult: processPurchaseNumberAuthResult.purchaseNumberAuthResult // discontinue(2024-06-10~)
-        };
+        const result = {};
         yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
         return { result: processPurchaseNumberAuthResult };
     });

package/lib/chevre/service/payment/movieTicket/factory.js

@@ -74,22 +74,18 @@ function createSeatInfoSyncIn(params) {
     };
 }
 exports.createSeatInfoSyncIn = createSeatInfoSyncIn;
-function createStartingPayAction(params
-// seatInfoSyncIn: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn
-) {
-    // const instrument: factory.action.trade.pay.IInstrument = {
-    //     typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket
-    //     // seatInfoSyncIn // discontinue(2024-06-10~)
-    // };
-    return Object.assign(Object.assign({}, params), { object: params.object.map((o) => {
-            const movieTicketsWithMaskedAccessCode = (Array.isArray(o.movieTickets))
-                ? o.movieTickets.map((movieTicket) => {
-                    return Object.assign(Object.assign({}, movieTicket), { accessCode: '****' // accessCodeを隠蔽(2023-02-08~)
-                     });
-                })
-                : [];
-            return Object.assign(Object.assign({}, o), { movieTickets: movieTicketsWithMaskedAccessCode });
-        }) });
+function createStartingPayAction(params) {
+    const firstObject = params.object.shift();
+    if (firstObject === undefined) {
+        throw new factory.errors.ArgumentNull('object');
+    }
+    const movieTicketsWithMaskedAccessCode = (Array.isArray(firstObject.movieTickets))
+        ? firstObject.movieTickets.map((movieTicket) => {
+            return Object.assign(Object.assign({}, movieTicket), { accessCode: '****' // accessCodeを隠蔽(2023-02-08~)
+             });
+        })
+        : [];
+    return Object.assign(Object.assign({}, params), { object: [Object.assign(Object.assign({}, firstObject), { movieTickets: movieTicketsWithMaskedAccessCode })] });
 }
 exports.createStartingPayAction = createStartingPayAction;
 function processPurchaseNumberAuthResult2checkRecipe(params) {

package/lib/chevre/service/payment/movieTicket/payMovieTicket.d.ts

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -10,6 +11,7 @@ import { Settings } from '../../../settings';
 interface IPayOperationRepos {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/movieTicket/payMovieTicket.js

@@ -61,7 +61,8 @@ function payMovieTicket(params) {
                     clientId: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientId),
                     clientSecret: String((_h = availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.clientSecret),
                     scopes: [],
-                    state: ''
+                    state: '',
+                    credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
                 });
                 const seatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
                 processSeatInfoSyncResult = yield processSeatInfoSync({ seatInfoSyncIn })({ seatService });

package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.d.ts

@@ -1,3 +1,4 @@
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { IMinimizedIndividualEvent } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -26,6 +27,7 @@ interface ICheckByIdentifierParams {
     paymentServiceId: string;
 }
 declare function processPurchaseNumberAuth(params: ICheckByIdentifierParams): (repos: {
+    credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
 }, settings: Settings) => Promise<ICheckResult>;

package/lib/chevre/service/payment/movieTicket/processPurchaseNumberAuth.js

@@ -77,7 +77,8 @@ function processPurchaseNumberAuth(params) {
             clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
             clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
             scopes: [],
-            state: ''
+            state: '',
+            credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
         });
         const authService = new surfrock.service.auth.AuthService({
             endpoint: String(availableChannel.serviceUrl),

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.d.ts

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
@@ -7,6 +8,7 @@ import { Settings } from '../../../settings';
 interface IRefundOperationRepos {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;
     task: TaskRepo;
 }

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -78,7 +78,8 @@ function refundMovieTicket(params) {
             clientId: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientId),
             clientSecret: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientSecret),
             scopes: [],
-            state: ''
+            state: '',
+            credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
         });
         const seatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
         let seatInfoSyncCancelIn;

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -1,4 +1,5 @@
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -13,6 +14,7 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
     id?: string;
 }): (repos: {
     action: ActionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/movieTicket/voidTransaction.d.ts

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
@@ -7,6 +8,7 @@ import { Settings } from '../../../settings';
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -5,6 +5,7 @@ import type { AcceptedOfferRepo } from '../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../repo/accountingReport';
 import type { ActionRepo } from '../repo/action';
 import type { AssetTransactionRepo } from '../repo/assetTransaction';
+import type { CredentialsRepo } from '../repo/credentials';
 import type { EventRepo } from '../repo/event';
 import type { OrderRepo } from '../repo/order';
 import type { PaymentServiceRepo } from '../repo/paymentService';
@@ -32,10 +33,7 @@ export declare function fixOrderAsPurpose(params: {
 }) => Promise<Pick<factory.order.IOrder, "typeOf" | "orderNumber" | "confirmationNumber"> & {
     acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
 }>;
-/**
- * 決済確定
- */
-export declare function pay(params: factory.task.pay.IData & {
+export declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
     sameAs?: {
         /**
          * 実行元タスクID
@@ -44,10 +42,19 @@ export declare function pay(params: factory.task.pay.IData & {
         typeOf: 'Task';
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}) => Promise<factory.action.trade.pay.IAttributes>;
+/**
+ * 決済確定
+ */
+export declare function pay(payActionAttributes: factory.action.trade.pay.IAttributes): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
+    credentials: CredentialsRepo;
     event: EventRepo;
     order: OrderRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
@@ -60,6 +67,7 @@ export declare function pay(params: factory.task.pay.IData & {
 export declare function voidPayment(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -77,6 +85,7 @@ export declare function refund(params: factory.task.refund.IData & {
 }): (repos: {
     action: ActionRepo;
     accountingReport: AccountingReportRepo;
+    credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

package/lib/chevre/service/payment.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.refund = exports.voidPayment = exports.pay = exports.fixOrderAsPurpose = void 0;
+exports.refund = exports.voidPayment = exports.pay = exports.payTask2payActionAttributes = exports.fixOrderAsPurpose = void 0;
 const factory = require("../factory");
 const CreditCardPaymentService = require("./payment/creditCard");
 const FaceToFacePaymentService = require("./payment/faceToFace");
@@ -96,21 +96,25 @@ function payTask2payActionAttributes(params) {
         }
     });
 }
+exports.payTask2payActionAttributes = payTask2payActionAttributes;
 /**
  * 決済確定
  */
-function pay(params) {
+function pay(
+// params: factory.task.pay.IData & {
+//     sameAs?: {
+//         /**
+//          * 実行元タスクID
+//          */
+//         id: string;
+//         typeOf: 'Task';
+//     };
+// }
+payActionAttributes) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+        // let payActionAttributes: factory.action.trade.pay.IAttributes;
+        // payActionAttributes = await payTask2payActionAttributes(params)(repos);
         var _a;
-        let payActionAttributes;
-        // if (params.purpose.typeOf === factory.actionType.ReturnAction) {
-        //     // タスクにPayActionそのものが指定されていればそのまま処理
-        //     payActionAttributes = params;
-        // } else {
-        //     // 最適化されたタスクに対応(2024-01-19~)
-        //     payActionAttributes = await payTask2payActionAttributes(params)(repos);
-        // }
-        payActionAttributes = yield payTask2payActionAttributes(params)(repos);
         const paymentServiceType = (_a = payActionAttributes.object[0]) === null || _a === void 0 ? void 0 : _a.typeOf;
         switch (paymentServiceType) {
             case factory.service.paymentService.PaymentServiceType.FaceToFace:

package/lib/chevre/service/task/authorizePayment.js

@@ -16,6 +16,7 @@ const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
+const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -45,6 +46,10 @@ function call(params) {
         let callResult;
         const actionRepo = new action_1.ActionRepo(connection);
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        const paymentServiceId = params.data.object.issuedThrough.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
             yield (0, any_1.authorize)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
              }))({
@@ -53,6 +58,10 @@ function call(params) {
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo(redisClient),
+                credentials: new credentials_1.CredentialsRepo(redisClient, {
+                    scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                    expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+                }),
                 event: new event_1.EventRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),

package/lib/chevre/service/task/checkMovieTicket.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
+const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -23,7 +24,7 @@ const pay_1 = require("../assetTransaction/pay");
  */
 function call(params) {
     return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -33,9 +34,17 @@ function call(params) {
         }
         const actionRepo = new action_1.ActionRepo(connection);
         const transactionProcessRepo = new transactionProcess_1.TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
+        const paymentServiceId = (_a = params.data.object[0]) === null || _a === void 0 ? void 0 : _a.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         try {
             yield (0, pay_1.check)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } }))({
                 action: actionRepo,
+                credentials: new credentials_1.CredentialsRepo(redisClient, {
+                    scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                    expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+                }),
                 event: new event_1.EventRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
@@ -45,7 +54,7 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (yield actionRepo.searchBySameAs(Object.assign({ sameAs: { id: { $eq: params.id } }, typeOf: { $eq: factory.actionType.CheckAction } }, (typeof ((_a = params.data.purpose) === null || _a === void 0 ? void 0 : _a.id) === 'string')
+            const action = (yield actionRepo.searchBySameAs(Object.assign({ sameAs: { id: { $eq: params.id } }, typeOf: { $eq: factory.actionType.CheckAction } }, (typeof ((_b = params.data.purpose) === null || _b === void 0 ? void 0 : _b.id) === 'string')
                 ? { purpose: { id: { $eq: params.data.purpose.id } } }
                 : undefined))).shift();
             if (typeof (action === null || action === void 0 ? void 0 : action.id) === 'string') {
@@ -57,7 +66,7 @@ function call(params) {
         }
         finally {
             // 取引プロセスロック解除
-            if (typeof ((_b = params.data.purpose) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
+            if (typeof ((_c = params.data.purpose) === null || _c === void 0 ? void 0 : _c.id) === 'string') {
                 yield transactionProcessRepo.unlock({ typeOf: params.data.purpose.typeOf, id: params.data.purpose.id });
             }
         }

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

@@ -10,10 +10,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const factory = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const paymentService_1 = require("../../repo/paymentService");
@@ -27,13 +29,36 @@ const payment_1 = require("../payment");
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, payment_1.pay)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+    return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        if (redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        let payActionAttributes;
+        payActionAttributes = yield (0, payment_1.payTask2payActionAttributes)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
          }))({
+            acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
+            assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            order: new order_1.OrderRepo(connection)
+        });
+        const paymentServiceId = (_a = payActionAttributes.object.at(0)) === null || _a === void 0 ? void 0 : _a.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
+        yield (0, payment_1.pay)(
+        // {
+        //     ...params.data,
+        //     sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
+        // }
+        payActionAttributes)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+            credentials: new credentials_1.CredentialsRepo(redisClient, {
+                scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+            }),
             event: new event_1.EventRepo(connection),
             order: new order_1.OrderRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),

package/lib/chevre/service/task/refund.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -27,6 +28,7 @@ const payment_1 = require("../payment");
  */
 function call(params) {
     return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
@@ -38,9 +40,17 @@ function call(params) {
         else {
             data = params;
         }
+        const paymentServiceId = (_a = data.object.at(0)) === null || _a === void 0 ? void 0 : _a.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         yield (0, payment_1.refund)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            credentials: new credentials_1.CredentialsRepo(redisClient, {
+                scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+            }),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

package/lib/chevre/service/task/voidPayment.js

@@ -10,8 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
+const factory = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
@@ -23,10 +25,21 @@ const payment_1 = require("../payment");
  * タスク実行関数
  */
 function call(data) {
-    return ({ connection, settings }) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection, redisClient, settings }) => __awaiter(this, void 0, void 0, function* () {
+        if (redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        const paymentServiceId = data.object.object.id;
+        const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
+        const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''
+            && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         yield (0, payment_1.voidPayment)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            credentials: new credentials_1.CredentialsRepo(redisClient, {
+                scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
+                expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
+            }),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),

package/lib/chevre/settings.d.ts

@@ -31,6 +31,25 @@ interface IOnEventChanged {
     informEvent?: factory.project.IInformParams[];
     informEvent2agg?: factory.project.IInformParams[];
 }
+interface ISurfrockSettings {
+    /**
+     * 着券時タイムアウト
+     */
+    timeout: number;
+    /**
+     * 認証時タイムアウト
+     */
+    timeoutCheck: number;
+    /**
+     * 決済と返金の最小間隔(ms)
+     */
+    minIntervalBetweenPayAndRefund: number;
+    /**
+     * surfrockクライアント認証情報保管期限
+     * 0の場合、保管しない
+     */
+    credentialsExpireInSeconds?: number;
+}
 interface IOptions {
     onOrderStatusChanged: IOnOrderStatusChanged;
     onEventChanged: IOnEventChanged;
@@ -65,20 +84,7 @@ interface IOptions {
         timeoutBackground: number;
         useFetch: boolean;
     };
-    movieticketReserve: {
-        /**
-         * 着券時タイムアウト
-         */
-        timeout: number;
-        /**
-         * 認証時タイムアウト
-         */
-        timeoutCheck: number;
-        /**
-         * 決済と返金の最小間隔(ms)
-         */
-        minIntervalBetweenPayAndRefund: number;
-    };
+    movieticketReserve: ISurfrockSettings;
     useAssetTransactionSyncProcessing: boolean;
     useExperimentalFeature: boolean;
     useNotificationUseAction?: boolean;
@@ -124,20 +130,7 @@ declare class Settings {
         timeoutBackground: number;
         useFetch: boolean;
     };
-    readonly movieticketReserve: {
-        /**
-         * 着券時タイムアウト
-         */
-        timeout: number;
-        /**
-         * 認証時タイムアウト
-         */
-        timeoutCheck: number;
-        /**
-         * 決済と返金の最小間隔(ms)
-         */
-        minIntervalBetweenPayAndRefund: number;
-    };
+    readonly movieticketReserve: ISurfrockSettings;
     readonly useAssetTransactionSyncProcessing: boolean;
     readonly useExperimentalFeature: boolean;
     readonly useNotificationUseAction: boolean;

package/package.json

@@ -11,12 +11,12 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.389.0-alpha.19",
+    "@chevre/factory": "4.389.0-alpha.20",
     "@cinerino/sdk": "10.16.0-alpha.9",
     "@motionpicture/coa-service": "9.6.0-alpha.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
-    "@surfrock/sdk": "1.3.0",
+    "@surfrock/sdk": "1.4.0-alpha.0",
     "cdigit": "2.6.7",
     "debug": "^3.2.7",
     "google-libphonenumber": "^3.2.18",
@@ -108,5 +108,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.6.0-alpha.30"
+  "version": "22.6.0-alpha.32"
 }