@chevre/domain 21.30.0-alpha.37 → 21.30.0-alpha.38

package/example/src/chevre/findReservationByCode.ts

@@ -19,6 +19,7 @@ async function main() {
     const authorizationRepo = await chevre.repository.Code.createInstance(mongoose.connection);
     const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
     const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
+    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
 
     await (await chevre.service.reserve.createService()).verifyToken4reservation({
         project: { id: project.id },
@@ -29,7 +30,8 @@ async function main() {
         }
     })({
         authorization: authorizationRepo,
-        order: orderRepo
+        order: orderRepo,
+        ticket: ticketRepo
     });
     console.log('verified.');
 

package/example/src/chevre/findValidAuthorization.ts

@@ -4,13 +4,14 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
-const CODE = '33357ca4-55cb-4b36-8d82-af8e445c53c7';
+const CODE = '85de7dc1-3761-4317-80d6-b36bf0b2788f';
 // const ID = '6631d754c20be0772c217b90';
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const authorizationRepo = await chevre.repository.Code.createInstance(mongoose.connection);
+    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
 
     const result = await authorizationRepo.findValidOneByCode({
         project,
@@ -29,9 +30,11 @@ async function main() {
         code: CODE,
         expiresIn: 18000,
         issuer: 'https://example.com',
-        audience: 'https://example.com'
+        audience: 'https://example.com',
+        useJti: true
     })({
-        authorization: authorizationRepo
+        authorization: authorizationRepo,
+        ticket: ticketRepo
     });
     console.log('token:', token);
 }

package/example/src/chevre/playAroundTicket.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const TICKET_TOKEN = 'xxx';
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
+    const tickets = await ticketRepo.search(
+        {
+            limit: 1,
+            page: 1,
+            sort: { dateIssued: chevre.factory.sortType.Descending },
+            project: {
+                id: { $eq: project.id }
+            },
+            ticketToken: { $eq: TICKET_TOKEN }
+        }
+    );
+    console.log('tickets:', tickets);
+    console.log(tickets.length, 'tickets found');
+
+    const issueResult = await ticketRepo.issueByTicketToken({
+        ticketToken: TICKET_TOKEN,
+        project: { id: project.id }
+    });
+    console.log('issueResult:', issueResult);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -129,6 +129,7 @@ async function main() {
                                 paymentServiceProvider: await chevre.repository.PaymentServiceProvider.createInstance(mongoose.connection),
                                 product: await chevre.repository.Product.createInstance(mongoose.connection),
                                 task: await chevre.repository.Task.createInstance(mongoose.connection),
+                                ticket: await chevre.repository.Ticket.createInstance(mongoose.connection),
                                 transactionNumber: await chevre.repository.TransactionNumber.createInstance(client),
                                 transactionProcess:
                                     await chevre.repository.TransactionProcess.createInstance(client, { lockExpiresInSeconds: 120 }),

package/lib/chevre/repo/mongoose/schemas/ticket.d.ts

@@ -0,0 +1,5 @@
+import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
+declare const modelName = "Ticket";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
+export { modelName, indexes, createSchema };

package/lib/chevre/repo/mongoose/schemas/ticket.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSchema = exports.indexes = exports.modelName = void 0;
+const mongoose_1 = require("mongoose");
+const writeConcern_1 = require("../writeConcern");
+const settings_1 = require("../../../settings");
+const modelName = 'Ticket';
+exports.modelName = modelName;
+const schemaDefinition = {
+    project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
+    typeOf: { type: String, required: true },
+    ticketToken: { type: String, required: true },
+    dateIssued: { type: Date, required: true }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'tickets',
+    id: true,
+    read: 'primary',
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { dateIssued: 1 },
+        { name: 'searchByDateIssued' }
+    ],
+    [
+        { 'project.id': 1, dateIssued: 1 },
+        { name: 'searchByProjectId' }
+    ],
+    [
+        { ticketToken: 1, dateIssued: 1 },
+        { name: 'searchByTicketToken' }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * チケットスキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

package/lib/chevre/repo/ticket.d.ts

@@ -0,0 +1,52 @@
+import type { Connection, FilterQuery } from 'mongoose';
+import * as factory from '../factory';
+interface ITicket {
+    /**
+     * チケットID(jti)
+     */
+    id: string;
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
+    typeOf: 'Ticket';
+    ticketToken: string;
+    dateIssued: Date;
+}
+type IIssueParams = Pick<ITicket, 'ticketToken'> & {
+    project: {
+        id: string;
+    };
+};
+interface ISearchConditions {
+    limit?: number;
+    page?: number;
+    sort?: {
+        dateIssued?: factory.sortType;
+    };
+    project?: {
+        id?: {
+            $eq?: string;
+        };
+    };
+    id?: {
+        $eq?: string;
+    };
+    ticketToken?: {
+        $eq?: string;
+    };
+}
+/**
+ * チケットリポジトリ
+ */
+export declare class TicketRepo {
+    private readonly ticketModel;
+    constructor(connection: Connection);
+    static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<ITicket>[];
+    /**
+     * 承認コードからチケットを発行する
+     */
+    issueByTicketToken(params: IIssueParams): Promise<Pick<ITicket, 'id'>>;
+    search(params: ISearchConditions): Promise<ITicket[]>;
+}
+export {};

package/lib/chevre/repo/ticket.js

@@ -0,0 +1,79 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TicketRepo = void 0;
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const ticket_1 = require("./mongoose/schemas/ticket");
+/**
+ * チケットリポジトリ
+ */
+class TicketRepo {
+    constructor(connection) {
+        this.ticketModel = connection.model(ticket_1.modelName, (0, ticket_1.createSchema)());
+    }
+    static CREATE_MONGO_CONDITIONS(params) {
+        var _a, _b, _c, _d;
+        const andConditions = [];
+        const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            andConditions.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const idEq = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$eq;
+        if (typeof idEq === 'string') {
+            andConditions.push({ _id: { $eq: idEq } });
+        }
+        const ticketTokenEq = (_d = params.ticketToken) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof ticketTokenEq === 'string') {
+            andConditions.push({ ticketToken: { $eq: ticketTokenEq } });
+        }
+        return andConditions;
+    }
+    /**
+     * 承認コードからチケットを発行する
+     */
+    issueByTicketToken(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ticketToken, project } = params;
+            const creatingTicket = {
+                dateIssued: new Date(),
+                project: { id: project.id, typeOf: factory.organizationType.Project },
+                ticketToken,
+                typeOf: 'Ticket'
+            };
+            const doc = yield this.ticketModel.create(creatingTicket);
+            return { id: doc.id };
+        });
+    }
+    search(params) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = TicketRepo.CREATE_MONGO_CONDITIONS(params);
+            const query = this.ticketModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
+            // __v: 0,
+            // createdAt: 0,
+            // updatedAt: 0
+            });
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.dateIssued) !== undefined) {
+                query.sort({ dateIssued: params.sort.dateIssued });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()
+                .then((docs) => docs.map((doc) => doc.toObject()));
+        });
+    }
+}
+exports.TicketRepo = TicketRepo;

package/lib/chevre/repository.d.ts

@@ -56,6 +56,7 @@ import type { RedisRepository as ServiceOutputIdentifierRepo } from './repo/serv
 import type { StockHolderRepository as StockHolderRepo } from './repo/stockHolder';
 import type { MongoRepository as TaskRepo } from './repo/task';
 import type { MongoRepository as TelemetryRepo } from './repo/telemetry';
+import type { TicketRepo } from './repo/ticket';
 import type { MongoRepository as TransactionRepo } from './repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from './repo/transactionNumber';
 import type { TransactionProcessRepository } from './repo/transactionProcess';
@@ -321,6 +322,10 @@ export type Telemetry = TelemetryRepo;
 export declare namespace Telemetry {
     function createInstance(...params: ConstructorParameters<typeof TelemetryRepo>): Promise<TelemetryRepo>;
 }
+export type Ticket = TicketRepo;
+export declare namespace Ticket {
+    function createInstance(...params: ConstructorParameters<typeof TicketRepo>): Promise<TicketRepo>;
+}
 export type Transaction = TransactionRepo;
 export declare namespace Transaction {
     function createInstance(...params: ConstructorParameters<typeof TransactionRepo>): Promise<TransactionRepo>;

package/lib/chevre/repository.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = 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.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = 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.Telemetry = exports.Task = exports.StockHolder = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -789,6 +789,19 @@ var Telemetry;
     }
     Telemetry.createInstance = createInstance;
 })(Telemetry = exports.Telemetry || (exports.Telemetry = {}));
+var Ticket;
+(function (Ticket) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/ticket'))).TicketRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    Ticket.createInstance = createInstance;
+})(Ticket = exports.Ticket || (exports.Ticket = {}));
 var Transaction;
 (function (Transaction) {
     let repo;

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

@@ -1,5 +1,6 @@
 import type { MongoRepository as ActionRepo } from '../repo/action';
 import type { AuthorizationRepo, ICode } from '../repo/code';
+import type { TicketRepo } from '../repo/ticket';
 import * as factory from '../factory';
 type IToken = string;
 interface IPayload {
@@ -9,6 +10,7 @@ interface IPayload {
     iss: string;
     exp: number;
     version: string;
+    jti?: string;
     typ: string;
 }
 type IPayloadWithNoVersion = factory.authorization.IObject & {
@@ -32,8 +34,13 @@ declare function getToken(params: {
      * jtw.payload.aud
      */
     audience: string;
+    /**
+     * payload.jtiを使用するかどうか
+     */
+    useJti: boolean;
 }): (repos: {
     authorization: AuthorizationRepo;
+    ticket: TicketRepo;
 }) => Promise<IToken>;
 declare function verifyToken(params: {
     project: {
@@ -45,5 +52,6 @@ declare function verifyToken(params: {
 }): (repos: {
     action?: ActionRepo;
     authorization: AuthorizationRepo;
+    ticket: TicketRepo;
 }) => Promise<factory.authorization.IObject | import("@chevre/factory/lib/action/authorize/offer/eventService").IPurpose>;
 export { IToken, ICode, IPayload, IPayloadWithNoVersion, getToken, verifyToken };

package/lib/chevre/service/code.js

@@ -33,23 +33,35 @@ function getToken(params) {
             project: { id: params.project.id },
             code: params.code
         });
+        if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
+            throw new factory.errors.ArgumentNull('issuer');
+        }
+        let subject = authorization.id;
+        let typ = `${credentials_1.credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
+        let jti;
+        if (params.useJti) {
+            const { id } = yield repos.ticket.issueByTicketToken({
+                project: { id: params.project.id },
+                ticketToken: params.code
+            });
+            jti = id;
+            // ロール承認の場合、subjectはクライアントID,typはメンバータイプ
+            if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {
+                subject = authorization.object.member.id;
+                typ = `${credentials_1.credentials.jwt.payloadTypPrefix}:${authorization.object.member.typeOf}`;
+            }
+        }
         const isAuthorize4order = authorization.object.typeOf === factory.order.OrderType.Order;
         const payload = Object.assign(Object.assign({}, (settings_1.USE_TOKEN_WITH_NO_VERSION && isAuthorize4order) ? authorization.object : undefined), { 
             // sub: authorization.id, // 拡張(2024-05-01~)
-            token_use: 'access', version: credentials_1.credentials.jwt.version, 
-            // 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
-            typ: `${credentials_1.credentials.jwt.payloadTypPrefix}:${authorization.typeOf}` //  拡張(2024-05-07~)
+            token_use: 'access', version: credentials_1.credentials.jwt.version, // 拡張(2024-05-02~)
+            typ //  拡張(2024-05-07~)
          });
-        if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
-            throw new factory.errors.ArgumentNull('issuer');
-        }
         return new Promise((resolve, reject) => {
             // 所有権を暗号化する
-            jwt.sign(payload, credentials_1.credentials.jwt.secret, Object.assign({ algorithm: ALGORITHM, 
+            jwt.sign(payload, credentials_1.credentials.jwt.secret, Object.assign(Object.assign({ algorithm: ALGORITHM, 
                 // issuer: credentials.jwt.issuer,
-                issuer: params.issuer, expiresIn: params.expiresIn, subject: authorization.id }, (typeof params.audience === 'string')
-                ? { audience: params.audience }
-                : undefined // 拡張(2024-05-02~)
+                issuer: params.issuer, expiresIn: params.expiresIn, subject }, (typeof params.audience === 'string') ? { audience: params.audience } : undefined), (typeof jti === 'string') ? { jwtid: jti } : undefined // 拡張(2024-05-08~)
             ), (err, encoded) => {
                 if (err instanceof Error) {
                     reject(err);
@@ -68,6 +80,7 @@ function getToken(params) {
 }
 exports.getToken = getToken;
 function verifyToken(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let result;
         let payload;
@@ -134,8 +147,26 @@ function verifyToken(params) {
                     typeOf: resourceTypeByPayload
                 };
             }
+            else if (typeof payload.jti === 'string') {
+                // jtiに対応(2024-05-08~)
+                const ticket = (yield repos.ticket.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: params.project.id } },
+                    id: { $eq: payload.jti }
+                })).shift();
+                if (ticket === undefined) {
+                    throw new factory.errors.NotFound('Ticket');
+                }
+                // 承認を参照
+                const { object } = yield repos.authorization.findValidOneByCode({
+                    project: { id: params.project.id },
+                    code: ticket.ticketToken
+                });
+                result = object;
+            }
             else {
-                // 基本的には承認を参照
+                // 基本的にはsubで承認を参照
                 const { object } = yield repos.authorization.findValidOneById({
                     project: { id: params.project.id },
                     id: payload.sub

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -18,6 +18,7 @@ import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLi
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import type { TicketRepo } from '../../../repo/ticket';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
@@ -40,6 +41,7 @@ interface IAuthorizeRepos {
     reservation: ReservationRepo;
     seat: SeatRepo;
     task: TaskRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }

package/lib/chevre/service/offer/event/processStartReserve4chevre.d.ts

@@ -16,6 +16,7 @@ import type { RedisRepository as OfferRateLimitRepo } from '../../../repo/rateLi
 import type { MongoRepository as ReservationRepo } from '../../../repo/reservation';
 import type { StockHolderRepository as StockHolderRepo } from '../../../repo/stockHolder';
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
+import type { TicketRepo } from '../../../repo/ticket';
 declare function processStartReserve4chevre(params: {
     acceptedOffer: factory.action.authorize.offer.eventService.IAcceptedOffer<factory.service.webAPI.Identifier.Chevre>[];
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
@@ -48,6 +49,7 @@ declare function processStartReserve4chevre(params: {
     reservation: ReservationRepo;
     seat: SeatRepo;
     task: TaskRepo;
+    ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{
     acceptedOffers4result: factory.action.authorize.offer.eventService.IResultAcceptedOffer[];

package/lib/chevre/service/offer/event/processStartReserve4chevre.js

@@ -62,7 +62,7 @@ function validateObjectWithoutDetail(params) {
                         project: params.project,
                         agent: params.project,
                         token: String(programMembershipUsed)
-                    })({ action: repos.action, authorization: repos.authorization });
+                    })(repos);
                     if (Array.isArray(permitOwnershipInfo)) {
                         throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');
                     }

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

@@ -12,6 +12,7 @@ import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/p
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as PaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
+import type { TicketRepo } from '../../repo/ticket';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 import type { TransactionProcessRepository } from '../../repo/transactionProcess';
@@ -64,6 +65,7 @@ interface IAuthorizeRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     product: ProductRepo;
     task: TaskRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
     transactionProcess: TransactionProcessRepository;

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

@@ -333,7 +333,7 @@ function authorize(params) {
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object,
             project: { id: transaction.project.id }
-        })({ action: repos.action, authorization: repos.authorization });
+        })(repos);
         const authorizeObject = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
         // 承認アクションを開始する
         const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;

package/lib/chevre/service/reserve/verifyToken4reservation.d.ts

@@ -1,6 +1,7 @@
 import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
+import type { TicketRepo } from '../../repo/ticket';
 /**
  * 予約使用のためのチケットトークンを検証する
  */
@@ -26,4 +27,5 @@ export declare function verifyToken4reservation(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
     order: OrderRepo;
+    ticket: TicketRepo;
 }) => Promise<void>;

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -25,7 +25,7 @@ function verifyToken4reservation(params) {
                 project: params.project,
                 agent: params.agent,
                 token
-            })({ authorization: repos.authorization });
+            })(repos);
         }
         else if (typeof ticketToken === 'string' && ticketToken.length > 0) {
             const findValidOneByCodeResult = yield repos.authorization.findValidOneByCode({

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

@@ -21,6 +21,7 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
+const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const transactionProcess_1 = require("../../repo/transactionProcess");
@@ -52,6 +53,7 @@ function call(params) {
                 paymentServiceProvider: new paymentServiceProvider_1.MongoRepository(settings.connection),
                 product: new product_1.MongoRepository(settings.connection),
                 task: new task_1.MongoRepository(settings.connection),
+                ticket: new ticket_1.TicketRepo(settings.connection),
                 transaction: new transaction_1.MongoRepository(settings.connection),
                 transactionNumber: new transactionNumber_1.RedisRepository(settings.redisClient),
                 transactionProcess: transactionProcessRepo

package/lib/chevre/service/transaction/moneyTransfer.d.ts

@@ -7,6 +7,7 @@ import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
+import type { TicketRepo } from '../../repo/ticket';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
 import { IPassportValidator as IWaiterPassportValidator, moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
@@ -17,6 +18,7 @@ export interface IStartOperationRepos {
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
     assetTransaction: AssetTransactionRepo;
@@ -43,6 +45,7 @@ export type IAuthorizeOperation<T> = (repos: {
     order: OrderRepo;
     product: ProductRepo;
     project: ProjectRepo;
+    ticket: TicketRepo;
     transaction: TransactionRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -377,10 +377,7 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 project: { id: project.id },
                 agent: { id: project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
-            })({
-                action: repos.action,
-                authorization: repos.authorization
-            });
+            })(repos);
             if (Array.isArray(paymentCardOwnershipInfo)) {
                 throw new factory.errors.NotImplemented('fromLocation as an array not implemented');
             }

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.30.0-alpha.37"
+  "version": "21.30.0-alpha.38"
 }