@chevre/domain 21.37.0-alpha.15 → 21.37.0-alpha.16

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

@@ -33,7 +33,10 @@ async function main() {
         }
     )({
         member: await chevre.repository.Member.createInstance(mongoose.connection),
-        passport: await chevre.repository.Passport.createInstance(client),
+        passport: await chevre.repository.Passport.createInstance(
+            client,
+            { secret: 'xxx' }
+        ),
         projectMakesOffer: await chevre.repository.ProjectMakesOffer.createInstance(mongoose.connection),
         seller: await chevre.repository.Seller.createInstance(mongoose.connection),
         transaction: await chevre.repository.Transaction.createInstance(mongoose.connection)

package/lib/chevre/factory/transaction.d.ts

@@ -3,13 +3,10 @@ export type IPassportValidator = (params: {
     passport: factory.waiter.passport.IPassport;
 }) => boolean;
 export declare namespace moneyTransfer {
-    type IStartParams = factory.transaction.moneyTransfer.IStartParamsWithoutDetail & {
-        passportValidator?: IPassportValidator;
-    };
+    type IStartParams = factory.transaction.moneyTransfer.IStartParamsWithoutDetail & {};
 }
 export declare namespace placeOrder {
     type IStartParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
-        passportValidator?: IPassportValidator;
         broker?: factory.order.IBroker;
     };
     type IOrderURLGenerator = (order: factory.transaction.placeOrder.IOrderAsResult) => string;

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

@@ -1,5 +1,7 @@
+import * as jwt from 'jsonwebtoken';
 import type { RedisClientType } from 'redis';
 import * as factory from '../factory';
+import { IPassportValidator } from '../factory/transaction';
 export type IVerifiedPassport = factory.waiter.passport.IPassport & {
     /**
      * 許可証識別子(2024-07-06~)
@@ -7,13 +9,31 @@ export type IVerifiedPassport = factory.waiter.passport.IPassport & {
     identifier: string;
 };
 type ILockKey = IVerifiedPassport;
+interface IOptions {
+    secret: string;
+    passportValidator?: IPassportValidator;
+}
+type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail | factory.transaction.moneyTransfer.IStartParamsWithoutDetail) & {};
 /**
  * 取引許可証リポジトリ
  */
 export declare class PassportRepo {
     private readonly redisClient;
-    constructor(redisClient: RedisClientType);
+    private readonly options;
+    constructor(redisClient: RedisClientType, options: IOptions);
+    static CREATE_VERIFIED_PASSPORT(params: string | jwt.JwtPayload | undefined): IVerifiedPassport;
     static CREATE_REDIS_KEY(params: ILockKey): string;
-    lock(params: ILockKey): Promise<string>;
+    lock(params: ILockKey): Promise<void>;
+    /**
+     * 許可証トークンがあれば検証する
+     */
+    validatePassportTokenIfExist(params: Pick<IStartParams, 'object'>): Promise<{
+        passport?: IVerifiedPassport;
+        customerType?: string;
+    }>;
+    /**
+     * 暗号化された許可証を検証する
+     */
+    private verify;
 }
 export {};

package/lib/chevre/repo/passport.js

@@ -11,15 +11,49 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PassportRepo = void 0;
 const createDebug = require("debug");
+const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../factory");
-const debug = createDebug('chevre-domain:repo:transactionPassport');
+const debug = createDebug('chevre-domain:repo:passport');
 /**
  * 取引許可証リポジトリ
  */
 class PassportRepo {
-    constructor(redisClient) {
+    constructor(redisClient, options) {
         this.redisClient = redisClient;
+        this.options = options;
+    }
+    static CREATE_VERIFIED_PASSPORT(params) {
+        var _a;
+        if (typeof params === 'string' || params === undefined) {
+            throw new factory.errors.Argument('decoded must be an object');
+        }
+        if (typeof params.scope !== 'string' || params.scope === '') {
+            throw new factory.errors.ArgumentNull('scope');
+        }
+        if (typeof params.iat !== 'number') {
+            throw new factory.errors.Argument('iat', 'iat must be number');
+        }
+        if (typeof params.exp !== 'number') {
+            throw new factory.errors.Argument('exp', 'exp must be number');
+        }
+        if (typeof params.iss !== 'string' || params.iss === '') {
+            throw new factory.errors.ArgumentNull('iss');
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        if (typeof ((_a = params.issueUnit) === null || _a === void 0 ? void 0 : _a.identifier) !== 'string' || params.issueUnit.identifier === '') {
+            throw new factory.errors.Argument('issueUnit.identifier', 'issueUnit.identifier must be string');
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        if (typeof params.issueUnit.numberOfRequests !== 'number') {
+            throw new factory.errors.Argument('issueUnit.numberOfRequests', 'issueUnit.numberOfRequests must be number');
+        }
+        const identifier = `${params.issueUnit.identifier}:${params.issueUnit.numberOfRequests}`;
+        return Object.assign({ identifier, scope: params.scope, iat: params.iat, exp: params.exp, iss: params.iss, 
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            project: params.project, 
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            issueUnit: params.issueUnit }, (Array.isArray(params.aud)) ? { aud: params.aud } : undefined);
     }
     static CREATE_REDIS_KEY(params) {
         return `chvr:lockPassport:${params.identifier}`;
@@ -39,12 +73,62 @@ class PassportRepo {
                 .exec();
             debug('locked,', params.issueUnit.identifier, now, passportExpires, ttl, results);
             if (Array.isArray(results) && (results[0] === 1 || results[0] === true)) {
-                return key;
+                return;
             }
             else {
                 throw new factory.errors.AlreadyInUse('passport', [], 'passport already in use');
             }
         });
     }
+    /**
+     * 許可証トークンがあれば検証する
+     */
+    validatePassportTokenIfExist(params) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            let passport;
+            let customerType;
+            if (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.passport) === null || _b === void 0 ? void 0 : _b.token) === 'string') {
+                try {
+                    passport = yield this.verify({
+                        token: params.object.passport.token
+                        // secret: this.options.secret
+                    });
+                }
+                catch (error) {
+                    throw new factory.errors.Argument('Passport Token', `Invalid token: ${error.message}`);
+                }
+                // 許可証バリデーション
+                if (typeof this.options.passportValidator === 'function') {
+                    if (!this.options.passportValidator({ passport })) {
+                        throw new factory.errors.Argument('Passport Token', 'passportValidator requirement not satisfied');
+                    }
+                }
+                // カスタマータイプ決定(2023-11-20~)
+                // スコープのフォーマットは、Transaction:${TransactionType}:${sellerId}:${customerType}
+                const splittedScope = passport.scope.split(':');
+                // tslint:disable-next-line:no-magic-numbers
+                customerType = splittedScope[3];
+            }
+            return Object.assign(Object.assign({}, (typeof customerType === 'string') ? { customerType } : undefined), (passport !== undefined) ? { passport } : undefined);
+        });
+    }
+    /**
+     * 暗号化された許可証を検証する
+     */
+    verify(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                jwt.verify(params.token, this.options.secret, (err, decoded) => {
+                    if (err instanceof Error) {
+                        reject(err);
+                    }
+                    else {
+                        resolve(PassportRepo.CREATE_VERIFIED_PASSPORT(decoded));
+                    }
+                });
+            });
+        });
+    }
 }
 exports.PassportRepo = PassportRepo;

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

@@ -2,6 +2,7 @@ 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 { PassportRepo } from '../../repo/passport';
 import type { MongoRepository as ProductRepo } from '../../repo/product';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as SellerRepo } from '../../repo/seller';
@@ -9,11 +10,12 @@ import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { IStartedTransaction, MongoRepository as TransactionRepo } from '../../repo/transaction';
 import type { RedisRepository as TransactionNumberRepo } from '../../repo/transactionNumber';
-import { IPassportValidator as IWaiterPassportValidator, moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
+import { moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
     order: OrderRepo;
+    passport: PassportRepo;
     product: ProductRepo;
     project: ProjectRepo;
     seller: SellerRepo;
@@ -31,7 +33,6 @@ export type IConfirmOperation<T> = (repos: {
     action: ActionRepo;
     transaction: TransactionRepo;
 }) => Promise<T>;
-export type IPassportValidator = IWaiterPassportValidator;
 export type IStartParams = MoneyTransferFactory.IStartParams;
 /**
  * 取引開始

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

@@ -19,7 +19,6 @@ const order_1 = require("../../factory/order");
 const factory_1 = require("./moneyTransfer/exportTasks/factory");
 const factory_2 = require("./moneyTransfer/factory");
 const potentialActions_1 = require("./moneyTransfer/potentialActions");
-const validation_1 = require("./validation");
 const MoneyTransferAssetTransactionService = require("../assetTransaction/moneyTransfer");
 const CodeService = require("../code");
 /**
@@ -28,7 +27,7 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const { passport } = yield (0, validation_1.validateWaiterPassport)(params);
+        const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
         const sellers = yield repos.seller.search({
             limit: 1,
             page: 1,

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

@@ -6,10 +6,10 @@ import type { IStartedTransaction, MongoRepository as TransactionRepo } from '..
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     member: MemberRepo;
+    passport: PassportRepo;
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     transaction: TransactionRepo;
-    passport: PassportRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 type IStartParams = PlaceOrderFactory.IStartParams;

package/lib/chevre/service/transaction/placeOrderInProgress/start.js

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
-const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
-const validation_1 = require("../validation");
 const factory_1 = require("./start/factory");
 const validateStartRequest_1 = require("./validation/validateStartRequest");
 /**
@@ -21,7 +19,7 @@ const validateStartRequest_1 = require("./validation/validateStartRequest");
 function start(params, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const { passport, customerType } = yield (0, validation_1.validateWaiterPassport)(params);
+        const { passport, customerType } = yield repos.passport.validatePassportTokenIfExist(params);
         const { memeberOfPayload, sellerMakesOffer, seller } = yield (0, validateStartRequest_1.validateStartRequest)(Object.assign(Object.assign(Object.assign({ project: { id: params.project.id }, seller: { id: params.seller.id } }, (typeof (passport === null || passport === void 0 ? void 0 : passport.scope) === 'string') ? { customerType } : undefined), (params.object.clientUser !== undefined) ? { clientUser: params.object.clientUser } : undefined), (typeof params.agent.memberOfToken === 'string') ? { memberOfToken: params.agent.memberOfToken } : undefined))(repos);
         const expiresInSeconds = (_a = sellerMakesOffer.eligibleTransactionDuration) === null || _a === void 0 ? void 0 : _a.maxValue;
         if (typeof expiresInSeconds !== 'number') {
@@ -52,16 +50,8 @@ function start(params, options) {
                 }
             }
         }
-        try {
-            if (transaction === undefined) {
-                transaction = yield repos.transaction.start(startParams);
-            }
-        }
-        catch (error) {
-            if (yield (0, errorHandler_1.isMongoError)(error)) {
-                // no op
-            }
-            throw error;
+        if (transaction === undefined) {
+            transaction = yield repos.transaction.start(startParams);
         }
         return transaction;
     });

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.37.0-alpha.15"
+  "version": "21.37.0-alpha.16"
 }

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

@@ -1,11 +0,0 @@
-import * as factory from '../../factory';
-import { IPassportValidator } from '../../factory/transaction';
-import type { IVerifiedPassport } from '../../repo/passport';
-type IStartParams = (factory.transaction.placeOrder.IStartParamsWithoutDetail | factory.transaction.moneyTransfer.IStartParamsWithoutDetail) & {
-    passportValidator?: IPassportValidator;
-};
-declare function validateWaiterPassport(params: IStartParams): Promise<{
-    passport: IVerifiedPassport | undefined;
-    customerType?: string;
-}>;
-export { validateWaiterPassport };

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

@@ -1,101 +0,0 @@
-"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.validateWaiterPassport = void 0;
-/**
- * 取引バリデーション
- */
-const jwt = require("jsonwebtoken");
-const factory = require("../../factory");
-function createPassport(params) {
-    var _a;
-    if (typeof params === 'string' || params === undefined) {
-        throw new factory.errors.Argument('decoded must be an object');
-    }
-    // eslint-disable-next-line no-magic-numbers
-    if (typeof params.scope !== 'string' || params.scope.length === 0) {
-        throw new factory.errors.ArgumentNull('scope');
-    }
-    if (typeof params.iat !== 'number') {
-        throw new factory.errors.Argument('iat', 'iat must be number');
-    }
-    if (typeof params.exp !== 'number') {
-        throw new factory.errors.Argument('exp', 'exp must be number');
-    }
-    // eslint-disable-next-line no-magic-numbers
-    if (typeof params.iss !== 'string' || params.iss.length === 0) {
-        throw new factory.errors.ArgumentNull('iss');
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, no-magic-numbers
-    if (typeof ((_a = params.issueUnit) === null || _a === void 0 ? void 0 : _a.identifier) !== 'string' || params.issueUnit.identifier.length === 0) {
-        throw new factory.errors.Argument('issueUnit.identifier', 'issueUnit.identifier must be string');
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    if (typeof params.issueUnit.numberOfRequests !== 'number') {
-        throw new factory.errors.Argument('issueUnit.numberOfRequests', 'issueUnit.numberOfRequests must be number');
-    }
-    const identifier = `${params.issueUnit.identifier}:${params.issueUnit.numberOfRequests}`;
-    return Object.assign({ identifier, scope: params.scope, iat: params.iat, exp: params.exp, iss: params.iss, 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        project: params.project, 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        issueUnit: params.issueUnit }, (Array.isArray(params.aud)) ? { aud: params.aud } : undefined);
-}
-/**
- * 暗号化された許可証を検証する
- */
-function verify(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            jwt.verify(params.token, params.secret, (err, decoded) => {
-                if (err instanceof Error) {
-                    reject(err);
-                }
-                else {
-                    const passport = createPassport(decoded);
-                    resolve(passport);
-                }
-            });
-        });
-    });
-}
-function validateWaiterPassport(params) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        let passport;
-        let customerType;
-        // WAITER許可証トークンがあれば検証する
-        if (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.passport) === null || _b === void 0 ? void 0 : _b.token) === 'string') {
-            try {
-                passport = yield verify({
-                    token: params.object.passport.token,
-                    secret: params.object.passport.secret
-                });
-            }
-            catch (error) {
-                throw new factory.errors.Argument('Passport Token', `Invalid token: ${error.message}`);
-            }
-            // 許可証バリデーション
-            if (typeof params.passportValidator === 'function') {
-                if (!params.passportValidator({ passport: passport })) {
-                    throw new factory.errors.Argument('Passport Token', 'Invalid passport');
-                }
-            }
-            // カスタマータイプ決定(2023-11-20~)
-            // スコープのフォーマットは、Transaction:${TransactionType}:${sellerId}:${customerType}
-            const splittedScope = passport.scope.split(':');
-            // tslint:disable-next-line:no-magic-numbers
-            customerType = splittedScope[3];
-        }
-        return Object.assign(Object.assign({}, (typeof customerType === 'string') ? { customerType } : undefined), { passport });
-    });
-}
-exports.validateWaiterPassport = validateWaiterPassport;