@chevre/domain 22.7.0-alpha.13 → 22.7.0-alpha.15

package/example/src/chevre/deleteDiscontinuedPeople.ts

@@ -0,0 +1,114 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { call as deletePerson } from '../../../lib/chevre/service/task/deletePerson';
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
+    const setting = await settingRepo.findOne({ project: { id: { $eq: '*' } } }, ['userPoolIdNew']);
+    if (typeof setting?.userPoolIdNew !== 'string') {
+        throw new chevre.factory.errors.NotFound('setting.userPoolIdNew');
+    }
+
+    const DISCONTINUE_PEOPLE_PROJECT = process.env.USE_DISCONTINUE_PEOPLE_PROJECT;
+
+    /**
+     * 1リクエストで生成するタスク数
+     */
+    const NUM_TASKS = 1;
+
+    if (typeof DISCONTINUE_PEOPLE_PROJECT === 'string' && DISCONTINUE_PEOPLE_PROJECT.length > 0) {
+        const ownershipInfoRepo = await chevre.repository.OwnershipInfo.createInstance(mongoose.connection);
+        const deletingOwnershipInfos = (await ownershipInfoRepo.projectFields({
+            limit: NUM_TASKS,
+            page: 1,
+            sort: { ownedFrom: chevre.factory.sortType.Ascending },
+            project: { id: { $eq: DISCONTINUE_PEOPLE_PROJECT } },
+            typeOfGood: {
+                // typeOf: { $eq: chevre.factory.permit.PermitType.Permit },
+                issuedThrough: {
+                    typeOf: {
+                        // $eq: chevre.factory.product.ProductType.PaymentCard
+                        $eq: chevre.factory.product.ProductType.EventService
+                    }
+                }
+            }
+        }));
+        console.log(deletingOwnershipInfos.length, 'deletingOwnershipInfos found');
+
+        if (deletingOwnershipInfos.length > 0) {
+            const runsAt: Date = new Date();
+            const userPoolId: string = setting.userPoolIdNew;
+
+            for (const deletingOwnershipInfo of deletingOwnershipInfos) {
+                const personId: string = (Array.isArray(deletingOwnershipInfo.ownedBy))
+                    ? deletingOwnershipInfo.ownedBy[0]?.id
+                    : deletingOwnershipInfo.ownedBy.id;
+
+                console.log(
+                    'deleting person...',
+                    personId, deletingOwnershipInfo.id, deletingOwnershipInfo.ownedFrom
+                );
+                await deletePerson({
+                    id: '',
+                    project: { typeOf: chevre.factory.organizationType.Project, id: DISCONTINUE_PEOPLE_PROJECT },
+                    name: chevre.factory.taskName.DeletePerson,
+                    status: chevre.factory.taskStatus.Ready,
+                    runsAt,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    data: {
+                        id: personId,
+                        agent: {
+                            id: DISCONTINUE_PEOPLE_PROJECT,
+                            typeOf: chevre.factory.organizationType.Project,
+                            name: 'example'
+                        },
+                        physically: true,
+                        userPoolId,
+                        project: { id: DISCONTINUE_PEOPLE_PROJECT },
+                        migrate: false,
+                        useUsernameAsGMOMemberId: true,
+                        executeBackground: true
+                    }
+                })(
+                    {
+                        connection: mongoose.connection,
+                        settings: new chevre.settings.Settings({
+                            abortedTasksWithoutReport: [],
+                            numTryConfirmReserveTransaction: 10,
+                            deliverOrderLimit: 1,
+                            coa: {
+                                timeout: 20000
+                            },
+                            gmo: {
+                                timeout: 5000,
+                                timeoutBackground: 5000,
+                                useFetch: true
+                            },
+                            movieticketReserve: {
+                                timeout: 1000,
+                                timeoutCheck: 1000,
+                                minIntervalBetweenPayAndRefund: 1000,
+                                credentialsExpireInSeconds: 1000
+                            },
+                            useExperimentalFeature: false
+                        }),
+                        credentials: <any>{}
+                    },
+                    {
+                        executeById: false,
+                        executeByName: true
+                    }
+                );
+            }
+        }
+    }
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/findJWTSetting.ts

@@ -0,0 +1,19 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const jwtSettingRepo = await chevre.repository.setting.JWT.createInstance(mongoose.connection);
+
+    const result = await jwtSettingRepo.findDefault();
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/credentials.d.ts

@@ -1,5 +1,4 @@
 import type { CustomSearchCredentials } from './credentials/customSearch';
-import type { JWTCredentials } from './credentials/jwt';
 import type { LINENotifyCredentials } from './credentials/lineNotify';
 import type { SendGridCredentials } from './credentials/sendGrid';
 /**
@@ -10,10 +9,6 @@ export declare namespace credentials {
     namespace CustomSearch {
         function createInstance(...params: ConstructorParameters<typeof CustomSearchCredentials>): Promise<CustomSearchCredentials>;
     }
-    type JWT = JWTCredentials;
-    namespace JWT {
-        function createInstance(...params: ConstructorParameters<typeof JWTCredentials>): Promise<JWTCredentials>;
-    }
     type LINENotify = LINENotifyCredentials;
     namespace LINENotify {
         function createInstance(...params: ConstructorParameters<typeof LINENotifyCredentials>): Promise<LINENotifyCredentials>;

package/lib/chevre/credentials.js

@@ -28,19 +28,6 @@ var credentials;
         }
         CustomSearch.createInstance = createInstance;
     })(CustomSearch = credentials.CustomSearch || (credentials.CustomSearch = {}));
-    let JWT;
-    (function (JWT) {
-        let cred;
-        function createInstance(...params) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (cred === undefined) {
-                    cred = (yield Promise.resolve().then(() => require('./credentials/jwt'))).JWTCredentials;
-                }
-                return new cred(...params);
-            });
-        }
-        JWT.createInstance = createInstance;
-    })(JWT = credentials.JWT || (credentials.JWT = {}));
     let LINENotify;
     (function (LINENotify) {
         let cred;

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

@@ -71,8 +71,21 @@ interface IWaiterSettings {
     passportIssuers: string[];
     secret: string;
 }
+export interface IJWTSetting {
+    /**
+     * トークン生成鍵
+     */
+    secret: string;
+    /**
+     * トークン検証時の発行者リスト
+     */
+    issuers: string[];
+    version: string;
+    payloadTypPrefix: string;
+}
 export interface ISetting {
     defaultSenderEmail?: string;
+    jwt?: IJWTSetting;
     onEventChanged?: IOnEventChanged;
     onOrderStatusChanged: IOnOrderStatusChanged;
     onReservationStatusChanged?: IOnReservationStatusChanged;

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

@@ -8,6 +8,7 @@ const modelName = 'Setting';
 exports.modelName = modelName;
 const schemaDefinition = {
     defaultSenderEmail: String,
+    jwt: mongoose_1.SchemaTypes.Mixed,
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     onEventChanged: mongoose_1.SchemaTypes.Mixed,
     onOrderStatusChanged: mongoose_1.SchemaTypes.Mixed,

package/lib/chevre/repo/setting/jwt.d.ts

@@ -0,0 +1,10 @@
+import type { Connection } from 'mongoose';
+import { IJWTSetting } from '../mongoose/schemas/setting';
+/**
+ * JWT設定リポジトリ
+ */
+export declare class JWTSettingRepo {
+    private readonly settingModel;
+    constructor(connection: Connection);
+    findDefault(): Promise<IJWTSetting>;
+}

package/lib/chevre/repo/setting/jwt.js

@@ -0,0 +1,56 @@
+"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.JWTSettingRepo = void 0;
+const factory = require("../../factory");
+const setting_1 = require("../mongoose/schemas/setting");
+/**
+ * JWT設定リポジトリ
+ */
+class JWTSettingRepo {
+    constructor(connection) {
+        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+    }
+    findDefault() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const andQuery = [{ 'project.id': { $eq: '*' } }];
+            const filterQuery = { $and: andQuery };
+            const projection = {
+                _id: 0,
+                // id: { $toString: '$_id' },
+                jwt: 1
+            };
+            const jwtSetting = yield this.settingModel.findOne(filterQuery, projection)
+                .lean()
+                .exec();
+            if (jwtSetting === null || jwtSetting.jwt === undefined) {
+                throw new factory.errors.NotFound('setting.jwt');
+            }
+            const { secret, version, payloadTypPrefix, issuers } = jwtSetting.jwt;
+            if (typeof secret !== 'string' || secret.length === 0) {
+                throw new factory.errors.NotFound('setting.jwt.secret');
+            }
+            if (typeof version !== 'string' || version.length === 0) {
+                throw new factory.errors.NotFound('setting.jwt.version');
+            }
+            if (typeof payloadTypPrefix !== 'string' || payloadTypPrefix.length === 0) {
+                throw new factory.errors.NotFound('setting.jwt.payloadTypPrefix');
+            }
+            if (!Array.isArray(issuers)) {
+                throw new factory.errors.NotFound('setting.jwt.issuers');
+            }
+            return {
+                secret, version, payloadTypPrefix, issuers
+            };
+        });
+    }
+}
+exports.JWTSettingRepo = JWTSettingRepo;

package/lib/chevre/repository.d.ts

@@ -60,6 +60,7 @@ import type { SellerPaymentAcceptedRepo } from './repo/sellerPaymentAccepted';
 import type { ServiceOutputRepo } from './repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from './repo/serviceOutputIdentifier';
 import type { SettingRepo } from './repo/setting';
+import type { JWTSettingRepo } from './repo/setting/jwt';
 import type { StockHolderRepo } from './repo/stockHolder';
 import type { TaskRepo } from './repo/task';
 import type { TelemetryRepo } from './repo/telemetry';
@@ -345,6 +346,12 @@ export type Setting = SettingRepo;
 export declare namespace Setting {
     function createInstance(...params: ConstructorParameters<typeof SettingRepo>): Promise<SettingRepo>;
 }
+export declare namespace setting {
+    type JWT = JWTSettingRepo;
+    namespace JWT {
+        function createInstance(...params: ConstructorParameters<typeof JWTSettingRepo>): Promise<JWTSettingRepo>;
+    }
+}
 export type StockHolder = StockHolderRepo;
 export declare namespace StockHolder {
     function createInstance(...params: ConstructorParameters<typeof StockHolderRepo>): Promise<StockHolderRepo>;

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.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.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -841,6 +841,22 @@ var Setting;
     }
     Setting.createInstance = createInstance;
 })(Setting = exports.Setting || (exports.Setting = {}));
+var setting;
+(function (setting) {
+    let JWT;
+    (function (JWT) {
+        let repo;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (repo === undefined) {
+                    repo = (yield Promise.resolve().then(() => require('./repo/setting/jwt'))).JWTSettingRepo;
+                }
+                return new repo(...params);
+            });
+        }
+        JWT.createInstance = createInstance;
+    })(JWT = setting.JWT || (setting.JWT = {}));
+})(setting = exports.setting || (exports.setting = {}));
 var StockHolder;
 (function (StockHolder) {
     let repo;

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

@@ -134,7 +134,7 @@ export declare function start(params: factory.assetTransaction.pay.IStartParamsW
     checkedAction: {
         id: string;
     };
-}): IStartOperation<factory.assetTransaction.pay.ITransaction>;
+}): IStartOperation<Pick<factory.assetTransaction.pay.ITransaction, 'id' | 'object'>>;
 /**
  * 取引確定
  */

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

@@ -408,23 +408,18 @@ function processAuthorizeMovieTicket(params, transaction, paymentServiceId,
 // useCheckByIdentifierIfNotYet: boolean,
 options) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const { accountsReceivablesByServiceType } = yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
-        // const payActionInObject: factory.assetTransaction.pay.IPayActionInObject = {
-        //     actionStatus: payAction.actionStatus,
-        //     id: payAction.id,
-        //     typeOf: payAction.typeOf
-        // };
-        return saveAuthorizeResult({
-            id: transaction.id,
-            update: {
-                // ↓discontinue(2024-06-14~)
-                // 'object.accountId': accountId,
-                // 'object.paymentMethod.accountId': accountId,
-                // 'object.payAction': payActionInObject, // 最適化(2024-04-09~)
-                // 認証レスポンスより計上金額を保管(2023-05-15~)
-                'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType
-            }
-        })(repos);
+        // const { accountsReceivablesByServiceType } = await MovieTicketPayment.authorize(
+        //     params, transaction, paymentServiceId, options
+        // )(repos, settings);
+        yield MovieTicketPayment.authorize(params, transaction, paymentServiceId, options)(repos, settings);
+        return transaction;
+        // discontinue(2024-12-17~)
+        // return saveAuthorizeResult({
+        //     id: transaction.id,
+        //     update: {
+        //         'object.accountsReceivablesByServiceType': accountsReceivablesByServiceType // 認証レスポンスより計上金額を保管(2023-05-15~)
+        //     }
+        // })(repos);
     });
 }
 function saveAuthorizeResult(params) {

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

@@ -1,11 +1,7 @@
-/**
- * 承認サービス
- */
-import * as jwt from 'jsonwebtoken';
 import type { ActionRepo } from '../repo/action';
 import type { AuthorizationRepo } from '../repo/authorization';
+import type { JWTSettingRepo } from '../repo/setting/jwt';
 import type { TicketRepo } from '../repo/ticket';
-import { JWTCredentials } from '../credentials/jwt';
 import * as factory from '../factory';
 type IToken = string;
 interface IPayload extends Pick<factory.clientUser.IClientUser, 'aud' | 'exp' | 'iat' | 'iss' | 'sub' | 'token_use' | 'typ' | 'version'> {
@@ -37,9 +33,8 @@ declare function getToken(params: {
     audience: string;
 }): (repos: {
     authorization: AuthorizationRepo;
+    jwtSetting: JWTSettingRepo;
     ticket: TicketRepo;
-}, credentials: {
-    jwt: JWTCredentials;
 }) => Promise<{
     token: IToken;
 }>;
@@ -53,9 +48,8 @@ declare function verifyToken(params: {
 }): (repos: {
     action?: ActionRepo;
     authorization: AuthorizationRepo;
+    jwtSetting: JWTSettingRepo;
     ticket: TicketRepo;
-}, credentials: {
-    jwt: JWTCredentials;
 }) => Promise<{
     authorizedObject: IAuthorizedObject;
 }>;

package/lib/chevre/service/code.js

@@ -14,18 +14,22 @@ exports.verifyToken = exports.getToken = void 0;
  * 承認サービス
  */
 const jwt = require("jsonwebtoken");
+// import { JWTCredentials } from '../credentials/jwt';
 const factory = require("../factory");
-// type IPayloadWithNoVersion = factory.authorization.IObject & {
-//     version?: never;
-//     typ?: never;
-// };
 const ALGORITHM = 'HS256';
 /**
  * コードをトークンに変換する
  */
 function getToken(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        const credentials = {
+            jwt: yield repos.jwtSetting.findDefault()
+        };
         if (typeof params.project.id !== 'string' || params.project.id.length === 0) {
             throw new factory.errors.ArgumentNull('project.id');
         }
@@ -46,8 +50,6 @@ function getToken(params) {
         // let typ: string = `${credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
         // jti必須化(2024-08-22~)
         // let jti: string | undefined;
-        // if (params.useJti) {
-        // }
         const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
         jti = id;
         // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
@@ -68,9 +70,7 @@ function getToken(params) {
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する
-            jwt.sign(payload, credentials.jwt.secret, Object.assign(Object.assign({ algorithm: ALGORITHM, 
-                // issuer: credentials.jwt.issuer,
-                issuer: params.issuer, expiresIn: params.expiresIn, subject }, (typeof params.audience === 'string') ? { audience: params.audience } : undefined), (typeof jti === 'string') ? { jwtid: jti } : undefined // 拡張(2024-05-08~)
+            jwt.sign(payload, credentials.jwt.secret, Object.assign(Object.assign({ algorithm: ALGORITHM, 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);
@@ -98,20 +98,6 @@ function payload2authorizeObject(params) {
             if (typeof payload.sub !== 'string' || payload.sub.length === 0) {
                 throw new factory.errors.Unauthorized(`invalid token [sub:${payload.sub}]`);
             }
-            // discontinue purposeTokenに対応(2024-07-10~)
-            // sskts.purposeTokenに対応
-            // let resourceTypeByPayload: string | undefined;
-            // if (typeof payload.typ === 'string') {
-            //     resourceTypeByPayload = payload.typ.split(`${credentials.jwt.payloadTypPrefix}:`)
-            //         .at(1);
-            // }
-            // if (resourceTypeByPayload === factory.transactionType.PlaceOrder) {
-            //     result = {
-            //         id: payload.sub,
-            //         typeOf: resourceTypeByPayload
-            //     };
-            // } else {
-            // }
             if (typeof payload.jti === 'string') {
                 // jtiに対応(2024-05-08~)
                 const ticket = (yield repos.ticket.projectFields({
@@ -147,7 +133,11 @@ function payload2authorizeObject(params) {
     });
 }
 function verifyToken(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         let payload;
         let action;
         if (repos.action !== undefined) {
@@ -163,6 +153,9 @@ function verifyToken(params) {
             action = yield repos.action.start(actionAttributes);
         }
         try {
+            const credentials = {
+                jwt: yield repos.jwtSetting.findDefault()
+            };
             // payload = await new Promise<IPayloadWithNoVersion | IPayload>((resolve, reject) => {
             payload = yield new Promise((resolve, reject) => {
                 jwt.verify(params.token, credentials.jwt.secret, Object.assign({ algorithms: [ALGORITHM], 

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

@@ -1,7 +1,7 @@
 import * as factory from '../../../../../factory';
-import type { JWTCredentials } from '../../../../../credentials/jwt';
 import type { ActionRepo } from '../../../../../repo/action';
 import type { AuthorizationRepo } from '../../../../../repo/authorization';
+import type { JWTSettingRepo } from '../../../../../repo/setting/jwt';
 import type { TicketRepo } from '../../../../../repo/ticket';
 /**
  * チケット化された適用メンバーシップをPermitに変換する
@@ -17,8 +17,7 @@ declare function requestedProgramMembershipUsed2permit(params: {
 }): (repos: {
     action: ActionRepo;
     authorization: AuthorizationRepo;
+    jwtSetting: JWTSettingRepo;
     ticket: TicketRepo;
-}, credentials: {
-    jwt: JWTCredentials;
 }) => Promise<factory.assetTransaction.reserve.IPermitIssuedThroughFaceToFace | factory.assetTransaction.reserve.IPermitIssuedThroughMembershipService | undefined>;
 export { requestedProgramMembershipUsed2permit };

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

@@ -17,7 +17,11 @@ const CodeService = require("../../../../code");
  */
 function requestedProgramMembershipUsed2permit(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         let programMembershipUsedAsPermit;
         const { programMembershipUsed, placeOrder } = params;
@@ -27,7 +31,7 @@ function requestedProgramMembershipUsed2permit(params) {
                 project: { id: params.project.id },
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                 token: String(programMembershipUsed)
-            })(repos, credentials);
+            })(repos);
             const permitOwnershipInfo = authorizedObject;
             if (Array.isArray(permitOwnershipInfo)) {
                 throw new factory.errors.NotImplemented('programMembershipUsed as an array not implemented');

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

@@ -1,6 +1,5 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
-import type { JWTCredentials } from '../../../../credentials/jwt';
 import type { ActionRepo } from '../../../../repo/action';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
@@ -17,6 +16,7 @@ import type { ProductOfferRepo } from '../../../../repo/productOffer';
 import type { ProjectRepo } from '../../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../../repo/setting';
+import type { JWTSettingRepo } from '../../../../repo/setting/jwt';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
 import type { TicketRepo } from '../../../../repo/ticket';
@@ -45,6 +45,7 @@ declare function processStartReserve4chevre(params: {
     stockHolder: StockHolderRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    jwtSetting: JWTSettingRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerCatalogItem: OfferCatalogItemRepo;
@@ -59,9 +60,7 @@ declare function processStartReserve4chevre(params: {
     task: TaskRepo;
     ticket: TicketRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<{
+}, settings: Settings) => Promise<{
     acceptedOffers4result: IResultAcceptedOffer[];
 }>;
 export { processStartReserve4chevre };

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

@@ -15,7 +15,11 @@ const ReserveTransactionService = require("../../../assetTransaction/reserve");
 const factory_1 = require("./factory");
 const requestedProgramMembershipUsed2permit_1 = require("./processStartReserve4chevre/requestedProgramMembershipUsed2permit");
 function processStartReserve4chevre(params, options) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
@@ -23,7 +27,7 @@ function processStartReserve4chevre(params, options) {
             // object: <IObjectWithDetail>action.object,
             acceptedOffers: params.acceptedOffers, event: { id: event.id }, transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
-        const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos, credentials);
+        const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 
             // discontinue preSearchedEvent(2024-07-17~)
             // preSearchedEvent: event,
@@ -43,7 +47,11 @@ function processStartReserve4chevre(params, options) {
 }
 exports.processStartReserve4chevre = processStartReserve4chevre;
 function validateObjectWithoutDetail(params, placeOrder) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         const objectWithoutDetail = params.object;
         if (Array.isArray(objectWithoutDetail.acceptedOffer)) {
@@ -53,7 +61,7 @@ function validateObjectWithoutDetail(params, placeOrder) {
                     project: { id: params.project.id },
                     programMembershipUsed: (_b = (_a = acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed,
                     placeOrder: { id: placeOrder.id }
-                })(repos, credentials);
+                })(repos);
                 // 適用メンバーシップがあればacceptedOfferを強制的に上書き
                 if (programMembershipUsedAsPermit !== undefined) {
                     acceptedOffer = Object.assign(Object.assign({}, acceptedOffer), { itemOffered: Object.assign(Object.assign({}, acceptedOffer.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_c = acceptedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput), { typeOf: factory.reservationType.EventReservation, programMembershipUsed: programMembershipUsedAsPermit }) }) });

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

@@ -1,6 +1,5 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { JWTCredentials } from '../../../credentials/jwt';
 import type { ActionRepo } from '../../../repo/action';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
@@ -19,6 +18,7 @@ import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { ProjectRepo } from '../../../repo/project';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
 import type { SettingRepo } from '../../../repo/setting';
+import type { JWTSettingRepo } from '../../../repo/setting/jwt';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
@@ -30,6 +30,7 @@ interface IAuthorizeRepos {
     authorization: AuthorizationRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    jwtSetting: JWTSettingRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -49,9 +50,7 @@ interface IAuthorizeRepos {
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
-type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<T>;
+type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction<factory.service.webAPI.Identifier>;
 type IObjectWithoutDetail = factory.action.authorize.offer.eventService.IObjectWithoutDetail;
 interface IAuthorizeOptions {

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

@@ -20,7 +20,11 @@ const searchOffersByIds_1 = require("./searchOffersByIds");
  * 興行オファー承認
  */
 function authorize(params, options) {
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { noOfferSpecified } = options;
         const { transaction, event } = yield validateCreateRequest(params)(repos);
@@ -42,7 +46,7 @@ function authorize(params, options) {
         const action = yield repos.action.start(actionAttributes);
         try {
             const processStartReserveResult = yield (0, processStartReserve4chevre_1.processStartReserve4chevre)(Object.assign({ acceptedOffers, event,
-                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined), options)(repos, settings, credentials);
+                transactionNumber, transaction, availableAtOrFrom: { id: params.store.id }, ticketOffers, unitPriceOffers, validateEvent: params.validateEvent === true, validateEventOfferPeriod: params.validateEventOfferPeriod === true }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined), options)(repos, settings);
             acceptedOffers4result = processStartReserveResult.acceptedOffers4result;
             // add orderInTransaction(2024-01-15~)
             if (!noOfferSpecified) {

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

@@ -27,7 +27,7 @@ export declare function creatPayTransactionStartParams(params: {
 export declare function createMovieTicket(params: factory.action.trade.pay.IMovieTicket): factory.action.trade.pay.IMovieTicket;
 export declare function createAuthorizeResult(params: {
     object: factory.action.authorize.paymentMethod.any.IObjectIncludingPaymentMethodDetails;
-    payTransaction: factory.assetTransaction.pay.ITransaction;
+    payTransaction: Pick<factory.assetTransaction.pay.ITransaction, 'object'>;
     permit?: Pick<factory.ownershipInfo.IPermitAsGood, 'identifier'>;
 }): factory.action.authorize.paymentMethod.any.IResult;
 /**

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

@@ -3,7 +3,6 @@
  */
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
-import type { JWTCredentials } from '../../credentials/jwt';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -15,6 +14,7 @@ import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
 import type { ProductRepo } from '../../repo/product';
 import type { SellerPaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted';
+import type { JWTSettingRepo } from '../../repo/setting/jwt';
 import type { TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { TransactionRepo } from '../../repo/transaction';
@@ -81,6 +81,7 @@ interface IAuthorizeRepos {
     confirmationNumber: ConfirmationNumberRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
+    jwtSetting: JWTSettingRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
@@ -91,9 +92,7 @@ interface IAuthorizeRepos {
     transactionNumber: TransactionNumberRepo;
     transactionProcess: TransactionProcessRepo;
 }
-type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<T>;
+type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
 interface IPublishPaymentUrlRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -313,7 +313,11 @@ function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPay
  */
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos, settings, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos, settings
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
@@ -380,7 +384,7 @@ function authorize(params) {
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
         const { accountId } = yield fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
-        })(repos, credentials);
+        })(repos);
         const authorizeObjectIncludingPaymentMethodDetails = 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 { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
@@ -458,7 +462,11 @@ exports.authorize = authorize;
  * 承認しようとしているobjectからaccountIdを決定する
  */
 function fixAccountIdIfPossible(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // let accountId = params.object?.accountId;
         let accountId = '';
@@ -470,7 +478,7 @@ function fixAccountIdIfPossible(params) {
                 project: { id: params.project.id },
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
-            })(repos, credentials);
+            })(repos);
             const paymentCardOwnershipInfo = authorizedObject;
             if (Array.isArray(paymentCardOwnershipInfo)) {
                 throw new factory.errors.NotImplemented('fromLocation as an array not implemented');

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

@@ -22,6 +22,7 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const product_1 = require("../../repo/product");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const jwt_1 = require("../../repo/setting/jwt");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
@@ -32,13 +33,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return ({ connection, redisClient, credentials, settings }, options) => __awaiter(this, void 0, void 0, function* () {
+    return ({ connection, redisClient, settings }, options) => __awaiter(this, void 0, void 0, function* () {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        if (credentials.jwt === undefined) {
-            throw new factory.errors.Argument('settings', 'jwtCredentials required');
-        }
+        // if (credentials.jwt === undefined) {
+        //     throw new factory.errors.Argument('settings', 'jwtCredentials required');
+        // }
         // 遅延実行(executeByName)には対応しない
         if (!options.executeById) {
             return;
@@ -63,6 +64,7 @@ function call(params) {
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0
                 }),
                 event: new event_1.EventRepo(connection),
+                jwtSetting: new jwt_1.JWTSettingRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
@@ -72,7 +74,9 @@ function call(params) {
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient),
                 transactionProcess: transactionProcessRepo
-            }, settings, { jwt: credentials.jwt });
+            }, settings
+            // { jwt: credentials.jwt }
+            );
         }
         catch (error) {
             let throwsError = true;

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

@@ -1,6 +1,5 @@
 import type { Connection } from 'mongoose';
 import type { RedisClientType } from 'redis';
-import { JWTCredentials } from '../credentials/jwt';
 import { LINENotifyCredentials } from '../credentials/lineNotify';
 import { SendGridCredentials } from '../credentials/sendGrid';
 import * as factory from '../factory';
@@ -9,7 +8,6 @@ import type { IExecutableTask, IExecutableTaskKeys, TaskRepo } from '../repo/tas
 import { Settings } from '../settings';
 import { AggregationSettings } from '../settings/aggregation';
 interface ICredentialSettings {
-    jwt?: JWTCredentials;
     sendGrid: SendGridCredentials;
 }
 interface IExecuteSettings {

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

@@ -1,4 +1,3 @@
-import { JWTCredentials } from '../../credentials/jwt';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
@@ -8,6 +7,7 @@ import type { ProductRepo } from '../../repo/product';
 import type { ProjectRepo } from '../../repo/project';
 import type { SellerRepo } from '../../repo/seller';
 import type { SettingRepo } from '../../repo/setting';
+import type { JWTSettingRepo } from '../../repo/setting/jwt';
 import type { TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
@@ -16,6 +16,7 @@ import { moneyTransfer as MoneyTransferFactory } from '../../factory/transaction
 export interface IStartOperationRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
+    jwtSetting: JWTSettingRepo;
     order: OrderRepo;
     passport: PassportRepo;
     product: ProductRepo;
@@ -26,9 +27,7 @@ export interface IStartOperationRepos {
     transactionNumber: TransactionNumberRepo;
     assetTransaction: AssetTransactionRepo;
 }
-export type IStartOperation<T> = (repos: IStartOperationRepos, credentials: {
-    jwt: JWTCredentials;
-}) => Promise<T>;
+export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export type ITaskAndTransactionOperation<T> = (repos: {
     setting: SettingRepo;
     task: TaskRepo;
@@ -47,14 +46,13 @@ export declare function start(params: IStartParams): IStartOperation<IStartedTra
 export type IAuthorizeOperation<T> = (repos: {
     action: ActionRepo;
     authorization: AuthorizationRepo;
+    jwtSetting: JWTSettingRepo;
     order: OrderRepo;
     product: ProductRepo;
     project: ProjectRepo;
     ticket: TicketRepo;
     transaction: TransactionRepo;
     assetTransaction: AssetTransactionRepo;
-}, credentials: {
-    jwt: JWTCredentials;
 }) => Promise<T>;
 /**
  * 取引確定

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

@@ -27,7 +27,11 @@ const CodeService = require("../code");
  * 通貨転送資産取引サービスを利用して転送取引を開始する
  */
 function start(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
         const sellers = yield repos.seller.projectFields({
             limit: 1,
@@ -55,7 +59,7 @@ function start(params) {
             transaction = yield repos.transaction.start(startParams);
             yield authorizePaymentCard({
                 transaction: Object.assign(Object.assign({}, transaction), { object: startParams.object, seller: startParams.seller, agent: startParams.agent, project: startParams.project, typeOf: startParams.typeOf })
-            })(repos, credentials);
+            })(repos);
         }
         catch (error) {
             throw error;
@@ -65,7 +69,11 @@ function start(params) {
 }
 exports.start = start;
 function authorizePaymentCard(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const transaction = params.transaction;
         const fromLocation = transaction.object.fromLocation;
@@ -96,7 +104,7 @@ function authorizePaymentCard(params) {
                             : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
                     }, price: 0, priceCurrency: factory.priceCurrency.JPY }, (typeof transaction.object.description === 'string') ? { description: transaction.object.description } : undefined),
                 purpose: { typeOf: transaction.typeOf, id: transaction.id }
-            })(repos, credentials);
+            })(repos);
         }
         else {
             throw new factory.errors.NotImplemented('Withdraw transaction not implemented');
@@ -161,7 +169,11 @@ function fixToLocation(params) {
  * 口座取引は、出金取引あるいは転送取引のどちらかを選択できます
  */
 function processAuthorizePaymentCard(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
@@ -196,7 +208,7 @@ function processAuthorizePaymentCard(params) {
                 recipient: recipient,
                 transaction: transaction,
                 transactionNumber
-            })(repos, credentials);
+            })(repos);
             // アクションにchevre取引情報を保管
             yield repos.action.findByIdAndUpdate({
                 id: action.id,
@@ -277,7 +289,11 @@ function createAuthorizeMoneyTransferOfferActionAttributes(params) {
 }
 function processMoneyTransferTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         let pendingTransaction;
         const transaction = params.transaction;
@@ -305,7 +321,7 @@ function processMoneyTransferTransaction(params) {
             throw new factory.errors.NotImplemented('Withdraw transaction not implemented');
         }
         else if (params.object.fromLocation !== undefined && params.object.itemOffered.toLocation !== undefined) {
-            const { fromLocation } = yield validateFromLocation({ id: params.project.id }, params.object.fromLocation, { id: issuedThroughId })(repos, credentials);
+            const { fromLocation } = yield validateFromLocation({ id: params.project.id }, params.object.fromLocation, { id: issuedThroughId })(repos);
             const { toLocation } = yield validateToLocation({ id: params.project.id }, {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: params.object.itemOffered.toLocation.identifier,
@@ -371,7 +387,11 @@ function processMoneyTransferTransaction(params) {
 }
 // tslint:disable-next-line:max-func-body-length
 function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
         let fromLocation = fromLocationBeforeStart;
         // トークン化されたペイメントカード情報でリクエストされた場合、実ペイメントカード情報へ変換する
@@ -380,7 +400,7 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 project: { id: project.id },
                 agent: { id: project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
-            })(repos, credentials);
+            })(repos);
             const paymentCardOwnershipInfo = authorizedObject;
             if (Array.isArray(paymentCardOwnershipInfo)) {
                 throw new factory.errors.NotImplemented('fromLocation as an array not implemented');

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.391.0-alpha.2",
+    "@chevre/factory": "4.391.0-alpha.3",
     "@cinerino/sdk": "10.19.0-alpha.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.7.0-alpha.13"
+  "version": "22.7.0-alpha.15"
 }

package/example/src/chevre/findValidAuthorization.ts

@@ -1,56 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-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.Authorization.createInstance(mongoose.connection);
-    const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
-
-    const result = await authorizationRepo.findValidOneByCode({
-        project,
-        code: CODE
-    });
-    console.log('result:', result);
-
-    // const result = await authorizationRepo.findValidOneById({
-    //     project,
-    //     id: ID
-    // });
-    // console.log('result:', result);
-
-    const token = await (await chevre.service.code.createService()).getToken({
-        agent: { id: 'xxx', typeOf: chevre.factory.personType.Person },
-        project,
-        code: CODE,
-        expiresIn: 18000,
-        issuer: 'https://example.com',
-        audience: 'https://example.com'
-    })(
-        {
-            authorization: authorizationRepo,
-            ticket: ticketRepo
-        },
-        {
-            jwt: await chevre.credentials.JWT.createInstance({
-                secret: <string>process.env.TOKEN_SECRET,
-                issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
-                    ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
-                    : [],
-                version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
-                payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
-            })
-        }
-    );
-    console.log('token:', token);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/credentials/jwt.d.ts

@@ -1,23 +0,0 @@
-interface IOptions {
-    secret: string;
-    /**
-     * トークン検証時の発行者リスト
-     */
-    issuers: string[];
-    version: string;
-    payloadTypPrefix: string;
-}
-/**
- * トークン認証情報
- */
-declare class JWTCredentials {
-    readonly secret: string;
-    /**
-     * トークン検証時の発行者リスト
-     */
-    readonly issuers: string[];
-    readonly version: string;
-    readonly payloadTypPrefix: string;
-    constructor(options: IOptions);
-}
-export { JWTCredentials };

package/lib/chevre/credentials/jwt.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JWTCredentials = void 0;
-/**
- * トークン認証情報
- */
-class JWTCredentials {
-    constructor(options) {
-        this.version = '2024-05-02'; // 追加(2024-05-02~)
-        this.payloadTypPrefix = 'chevre';
-        const { secret, issuers, version, payloadTypPrefix } = options;
-        this.issuers = issuers;
-        this.payloadTypPrefix = payloadTypPrefix;
-        this.secret = secret;
-        this.version = version;
-    }
-}
-exports.JWTCredentials = JWTCredentials;