@chevre/domain 21.30.0-alpha.26 → 21.30.0-alpha.28

package/example/src/chevre/{findValidObjectByAuthorizationCode.ts → findValidAuthorization.ts}

@@ -5,24 +5,31 @@ import { chevre } from '../../../lib/index';
 
 const project = { id: String(process.env.PROJECT_ID) };
 const CODE = '33357ca4-55cb-4b36-8d82-af8e445c53c7';
+// const ID = '6631d754c20be0772c217b90';
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const codeRepo = await chevre.repository.Code.createInstance(mongoose.connection);
+    const authorizationRepo = await chevre.repository.Code.createInstance(mongoose.connection);
 
-    const result = await codeRepo.findValidOneByCode({
+    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({
         project,
         code: CODE,
-        expiresIn: 1800
+        expiresIn: 18000
     })({
-        authorization: codeRepo
+        authorization: authorizationRepo
     });
     console.log('token:', token);
 }

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

@@ -122,6 +122,7 @@ async function main() {
                                 accountingReport: await chevre.repository.AccountingReport.createInstance(mongoose.connection),
                                 action: await chevre.repository.Action.createInstance(mongoose.connection),
                                 assetTransaction: await chevre.repository.AssetTransaction.createInstance(mongoose.connection),
+                                authorization: await chevre.repository.Code.createInstance(mongoose.connection),
                                 event: await chevre.repository.Event.createInstance(mongoose.connection),
                                 paymentAccepted: await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection),
                                 paymentService: await chevre.repository.PaymentService.createInstance(mongoose.connection),

package/lib/chevre/credentials.d.ts

@@ -47,6 +47,14 @@ export declare const credentials: {
     };
     jwt: {
         secret: string;
+        /**
+         * トークン発行時の発行者
+         */
         issuer: string;
+        /**
+         * トークン検証時の発行者リスト
+         */
+        issuers: string[];
+        version: string;
     };
 };

package/lib/chevre/credentials.js

@@ -54,6 +54,19 @@ exports.credentials = {
     },
     jwt: {
         secret: process.env.TOKEN_SECRET,
-        issuer: process.env.RESOURCE_SERVER_IDENTIFIER
+        // RESOURCE_SERVER_IDENTIFIERとは分離して指定可能に拡張(2024-05-02~)
+        /**
+         * トークン発行時の発行者
+         */
+        issuer: (typeof process.env.TOKEN_ISSUER_BY_AUTHORIZATION === 'string')
+            ? process.env.TOKEN_ISSUER_BY_AUTHORIZATION
+            : process.env.RESOURCE_SERVER_IDENTIFIER,
+        /**
+         * トークン検証時の発行者リスト
+         */
+        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' // 追加(2024-05-02~)
     }
 };

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

@@ -6,9 +6,9 @@ type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' |
     id: string;
 };
 /**
- * 承認コードリポジトリ
+ * 承認リポジトリ
  */
-export declare class MongoRepository {
+export declare class AuthorizationRepo {
     private readonly authorizationModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.authorization.ISearchConditions): FilterQuery<factory.authorization.IAuthorization>[];
@@ -25,7 +25,7 @@ export declare class MongoRepository {
         expiresInSeconds: number;
     }[]): Promise<factory.authorization.IAuthorization[]>;
     /**
-     * コードで承認対象を検索する
+     * コードで有効な承認を参照する
      */
     findValidOneByCode(params: {
         project: {
@@ -33,6 +33,15 @@ export declare class MongoRepository {
         };
         code: ICode;
     }): Promise<IFindValidOneResult>;
+    /**
+     * 有効な承認を参照する
+     */
+    findValidOneById(params: {
+        project: {
+            id: string;
+        };
+        id: string;
+    }): Promise<Pick<IFindValidOneResult, 'object'>>;
     search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する

package/lib/chevre/repo/code.js

@@ -9,16 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = void 0;
+exports.AuthorizationRepo = void 0;
 const moment = require("moment");
 const uuid = require("uuid");
 const factory = require("../factory");
 const authorization_1 = require("./mongoose/schemas/authorization");
 const settings_1 = require("../settings");
 /**
- * 承認コードリポジトリ
+ * 承認リポジトリ
  */
-class MongoRepository {
+class AuthorizationRepo {
     constructor(connection) {
         this.authorizationModel = connection.model(authorization_1.modelName, (0, authorization_1.createSchema)());
     }
@@ -109,7 +109,7 @@ class MongoRepository {
         });
     }
     /**
-     * コードで承認対象を検索する
+     * コードで有効な承認を参照する
      */
     findValidOneByCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -130,10 +130,30 @@ class MongoRepository {
             return { id, object, typeOf };
         });
     }
+    /**
+     * 有効な承認を参照する
+     */
+    findValidOneById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const now = new Date();
+            const doc = yield this.authorizationModel.findOne({
+                'project.id': { $eq: params.project.id },
+                _id: { $eq: String(params.id) },
+                validFrom: { $lte: now },
+                validUntil: { $gte: now }
+            }, { object: 1, _id: 0 })
+                .lean() // projection的にleanで十分
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.authorizationModel.modelName);
+            }
+            return doc;
+        });
+    }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
+            const conditions = AuthorizationRepo.CREATE_MONGO_CONDITIONS(params);
             const query = this.authorizationModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
                 __v: 0,
                 createdAt: 0,
@@ -193,4 +213,4 @@ class MongoRepository {
         });
     }
 }
-exports.MongoRepository = MongoRepository;
+exports.AuthorizationRepo = AuthorizationRepo;

package/lib/chevre/repository.d.ts

@@ -13,7 +13,7 @@ import type { MongoRepository as AggregateReservationRepo } from './repo/aggrega
 import type { MongoRepository as AggregationRepo } from './repo/aggregation';
 import type { MongoRepository as AssetTransactionRepo } from './repo/assetTransaction';
 import type { MongoRepository as CategoryCodeRepo } from './repo/categoryCode';
-import type { MongoRepository as CodeRepo } from './repo/code';
+import type { AuthorizationRepo } from './repo/code';
 import type { MongoRepository as CommentRepo } from './repo/comment';
 import type { MongoRepository as CreativeWorkRepo } from './repo/creativeWork';
 import type { MongoRepository as CustomerRepo } from './repo/customer';
@@ -112,9 +112,9 @@ export type CategoryCode = CategoryCodeRepo;
 export declare namespace CategoryCode {
     function createInstance(...params: ConstructorParameters<typeof CategoryCodeRepo>): Promise<CategoryCodeRepo>;
 }
-export type Code = CodeRepo;
+export type Code = AuthorizationRepo;
 export declare namespace Code {
-    function createInstance(...params: ConstructorParameters<typeof CodeRepo>): Promise<CodeRepo>;
+    function createInstance(...params: ConstructorParameters<typeof AuthorizationRepo>): Promise<AuthorizationRepo>;
 }
 export type Comment = CommentRepo;
 export declare namespace Comment {

package/lib/chevre/repository.js

@@ -173,7 +173,7 @@ var Code;
     function createInstance(...params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (repo === undefined) {
-                repo = (yield Promise.resolve().then(() => require('./repo/code'))).MongoRepository;
+                repo = (yield Promise.resolve().then(() => require('./repo/code'))).AuthorizationRepo;
             }
             return new repo(...params);
         });

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

@@ -1,12 +1,24 @@
 import type { MongoRepository as ActionRepo } from '../repo/action';
-import type { MongoRepository as AuthorizationRepo } from '../repo/code';
+import type { AuthorizationRepo } from '../repo/code';
 import * as factory from '../factory';
-export type IToken = string;
-export type ICode = string;
+type IToken = string;
+type ICode = string;
+interface IPayload {
+    sub: string;
+    token_use: string;
+    iss: string;
+    exp: number;
+    version: string;
+    'chevre:typeOf': factory.authorization.IAuthorization['typeOf'];
+}
+type IPayloadWithNoVersion = factory.authorization.IObject & {
+    version?: never;
+    'chevre:typeOf'?: never;
+};
 /**
  * コードをトークンに変換する
  */
-export declare function getToken(params: {
+declare function getToken(params: {
     project: {
         id: string;
     };
@@ -15,7 +27,7 @@ export declare function getToken(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<IToken>;
-export declare function verifyToken(params: {
+declare function verifyToken(params: {
     project: {
         id: string;
     };
@@ -24,4 +36,6 @@ export declare function verifyToken(params: {
     audience?: string[];
 }): (repos: {
     action?: ActionRepo;
+    authorization: AuthorizationRepo;
 }) => Promise<factory.authorization.IObject>;
+export { IToken, ICode, IPayload, IPayloadWithNoVersion, getToken, verifyToken };

package/lib/chevre/service/code.js

@@ -35,7 +35,7 @@ function getToken(params) {
             // 所有権を暗号化する
             jwt.sign(Object.assign(Object.assign({}, authorization.object), { 
                 // sub: authorization.id, // 拡張(2024-05-01~)
-                token_use: 'access', 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
+                token_use: 'access', version: credentials_1.credentials.jwt.version, 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
              }), credentials_1.credentials.jwt.secret, {
                 issuer: credentials_1.credentials.jwt.issuer,
                 expiresIn: params.expiresIn,
@@ -60,6 +60,7 @@ exports.getToken = getToken;
 function verifyToken(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let result;
+        let payload;
         let action;
         if (repos.action !== undefined) {
             const actionAttributes = {
@@ -74,8 +75,11 @@ function verifyToken(params) {
             action = (yield repos.action.start(actionAttributes));
         }
         try {
-            result = yield new Promise((resolve, reject) => {
-                jwt.verify(params.token, credentials_1.credentials.jwt.secret, Object.assign({ issuer: credentials_1.credentials.jwt.issuer }, (Array.isArray(params.audience)) ? { audience: params.audience } : undefined), (err, decoded) => {
+            payload = yield new Promise((resolve, reject) => {
+                jwt.verify(params.token, credentials_1.credentials.jwt.secret, Object.assign({ 
+                    // 互換性維持のために複数対応(2024-05-02~)
+                    // issuer: credentials.jwt.issuer,
+                    issuer: credentials_1.credentials.jwt.issuers }, (Array.isArray(params.audience)) ? { audience: params.audience } : undefined), (err, decoded) => {
                     if (err instanceof Error) {
                         reject(err);
                     }
@@ -101,7 +105,21 @@ function verifyToken(params) {
             throw error;
         }
         if (repos.action !== undefined && action !== undefined) {
-            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+            yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: payload });
+        }
+        // token.payloadが承認のケースに対応(2024-05-02~)
+        if (typeof payload.version === 'string') {
+            if (typeof payload.sub !== 'string' || payload.sub.length === 0) {
+                throw new factory.errors.Unauthorized(`invalid token [sub:${payload.sub}]`);
+            }
+            const { object } = yield repos.authorization.findValidOneById({
+                project: { id: params.project.id },
+                id: payload.sub
+            });
+            result = object;
+        }
+        else {
+            result = payload;
         }
         return result;
     });

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

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { AuthorizationRepo } from '../../../repo/code';
 import type { MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -22,6 +23,7 @@ import type { RedisRepository as TransactionNumberRepo } from '../../../repo/tra
 interface IAuthorizeRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    authorization: AuthorizationRepo;
     event: EventRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;

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

@@ -1,6 +1,7 @@
 import * as factory from '../../../factory';
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
+import type { AuthorizationRepo } from '../../../repo/code';
 import type { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../../repo/event';
 import type { MongoRepository as OfferRepo } from '../../../repo/offer';
 import type { MongoRepository as OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -32,6 +33,7 @@ declare function processStartReserve4chevre(params: {
     stockHoldUntilDaysAfterEventEnd: number;
 }): (repos: {
     action: ActionRepo;
+    authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;
     event: EventRepo;
     offer: OfferRepo;

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 });
+                    })({ action: repos.action, authorization: repos.authorization });
                     if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
                         throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
                     }

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

@@ -5,6 +5,7 @@ import * as factory from '../../factory';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as PaymentServiceRepo } from '../../repo/paymentService';
 import type { MongoRepository as PaymentServiceProviderRepo } from '../../repo/paymentServiceProvider';
@@ -56,6 +57,7 @@ interface IAuthorizeRepos {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    authorization: AuthorizationRepo;
     event: EventRepo;
     paymentAccepted: PaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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 });
+        })({ action: repos.action, authorization: repos.authorization });
         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/findByCode.d.ts

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ReservationRepo } from '../../repo/reservation';
 type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;

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

@@ -1,5 +1,5 @@
 import * as factory from '../../factory';
-import type { MongoRepository as AuthorizationRepo } from '../../repo/code';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 /**
  * 予約使用のためのチケットトークンを検証する

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

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

package/lib/chevre/service/task/authorizePayment.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 code_1 = require("../../repo/code");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -44,6 +45,7 @@ function call(params) {
                 accountingReport: new accountingReport_1.MongoRepository(settings.connection),
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+                authorization: new code_1.AuthorizationRepo(settings.connection),
                 event: new event_1.MongoRepository(settings.connection),
                 paymentAccepted: new sellerPaymentAccepted_1.MongoRepository(settings.connection),
                 paymentService: new paymentService_1.MongoRepository(settings.connection),

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

@@ -30,7 +30,7 @@ function call(data) {
             acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
-            code: new code_1.MongoRepository(settings.connection),
+            code: new code_1.AuthorizationRepo(settings.connection),
             event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),

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

@@ -1,6 +1,7 @@
 import * as factory from '../../factory';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { AuthorizationRepo } from '../../repo/code';
 import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
@@ -11,6 +12,7 @@ import type { RedisRepository as TransactionNumberRepo } from '../../repo/transa
 import { IPassportValidator as IWaiterPassportValidator, moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
     action: ActionRepo;
+    authorization: AuthorizationRepo;
     order: OrderRepo;
     product: ProductRepo;
     project: ProjectRepo;
@@ -37,6 +39,7 @@ export type IStartParams = MoneyTransferFactory.IStartParams;
 export declare function start(params: IStartParams): IStartOperation<factory.transaction.moneyTransfer.ITransaction>;
 export type IAuthorizeOperation<T> = (repos: {
     action: ActionRepo;
+    authorization: AuthorizationRepo;
     order: OrderRepo;
     product: ProductRepo;
     project: ProjectRepo;

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

@@ -377,7 +377,10 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 project: { id: project.id },
                 agent: { id: project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
-            })({ action: repos.action });
+            })({
+                action: repos.action,
+                authorization: repos.authorization
+            });
             if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
                 throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
             }

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.d.ts

@@ -1,5 +1,5 @@
 import type { MongoRepository as ActionRepo } from '../../../repo/action';
-import type { MongoRepository as CodeRepo } from '../../../repo/code';
+import type { AuthorizationRepo } from '../../../repo/code';
 import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
@@ -11,7 +11,7 @@ import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
     action: ActionRepo;
-    authorization: CodeRepo;
+    authorization: AuthorizationRepo;
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;

package/lib/chevre/service/transaction/placeOrderInProgress/publishCode.d.ts

@@ -1,4 +1,4 @@
-import type { MongoRepository as CodeRepo } from '../../../repo/code';
+import type { AuthorizationRepo } from '../../../repo/code';
 declare function publishCode(params: {
     project: {
         id: string;
@@ -9,6 +9,6 @@ declare function publishCode(params: {
     validFrom: Date;
     expiresInSeconds: number;
 }): (repos: {
-    authorization: CodeRepo;
+    authorization: AuthorizationRepo;
 }) => Promise<string>;
 export { publishCode };

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.26"
+  "version": "21.30.0-alpha.28"
 }