@chevre/domain 23.2.0-alpha.60 → 23.2.0-alpha.62

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -1,64 +1,52 @@
 "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.validateStartRequest = validateStartRequest;
 const jwt = require("jsonwebtoken");
 const factory = require("../../../../factory");
-function verifyMembershipToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let result;
-        const { issuer, secret, token } = params;
-        if (typeof token === 'string' && token.length > 0) {
-            try {
-                result = yield new Promise((resolve, reject) => {
-                    jwt.verify(token, secret, {
-                        issuer
-                        // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
-                    }, (err, decoded) => {
-                        if (err instanceof Error) {
-                            reject(err);
-                        }
-                        else {
-                            resolve(decoded);
-                        }
-                    });
+async function verifyMembershipToken(params) {
+    let result;
+    const { issuer, secret, token } = params;
+    if (typeof token === 'string' && token.length > 0) {
+        try {
+            result = await new Promise((resolve, reject) => {
+                jwt.verify(token, secret, {
+                    issuer
+                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+                }, (err, decoded) => {
+                    if (err instanceof Error) {
+                        reject(err);
+                    }
+                    else {
+                        resolve(decoded);
+                    }
                 });
+            });
+        }
+        catch (error) {
+            // JWTエラーをハンドリング
+            if (error instanceof jwt.TokenExpiredError) {
+                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
             }
-            catch (error) {
-                // JWTエラーをハンドリング
-                if (error instanceof jwt.TokenExpiredError) {
-                    throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
-                }
-                else if (error instanceof jwt.JsonWebTokenError) {
-                    throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
-                }
-                throw error;
+            else if (error instanceof jwt.JsonWebTokenError) {
+                throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
             }
+            throw error;
         }
-        else {
-            throw new factory.errors.ArgumentNull('memberOfToken');
-        }
-        return result;
-    });
+    }
+    else {
+        throw new factory.errors.ArgumentNull('memberOfToken');
+    }
+    return result;
 }
 function validateStartRequest(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const clientId = (_a = params.clientUser) === null || _a === void 0 ? void 0 : _a.client_id;
+    return async (repos) => {
+        const clientId = params.clientUser?.client_id;
         if (typeof clientId !== 'string' || clientId.length === 0) {
             throw new factory.errors.ArgumentNull('client_id');
         }
         let projectMakesOffer;
-        projectMakesOffer = (yield repos.projectMakesOffer.search({
+        projectMakesOffer = (await repos.projectMakesOffer.search({
             limit: 1,
             page: 1,
             offeredBy: { id: { $eq: params.project.id } },
@@ -67,7 +55,7 @@ function validateStartRequest(params) {
         if (projectMakesOffer === undefined) {
             throw new factory.errors.Argument('project', 'project makes no offers');
         }
-        const seller = (yield repos.seller.projectFields({
+        const seller = (await repos.seller.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -77,9 +65,9 @@ function validateStartRequest(params) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
         // support non-array(2024-10-19~)
-        const sellerMakesOffer = (_b = seller.makesOffer) === null || _b === void 0 ? void 0 : _b.find(({ availableAtOrFrom }) => {
-            return (Array.isArray(availableAtOrFrom) && (availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.some(({ id }) => id === clientId)))
-                || (!Array.isArray(availableAtOrFrom) && (availableAtOrFrom === null || availableAtOrFrom === void 0 ? void 0 : availableAtOrFrom.id) === clientId);
+        const sellerMakesOffer = seller.makesOffer?.find(({ availableAtOrFrom }) => {
+            return (Array.isArray(availableAtOrFrom) && availableAtOrFrom?.some(({ id }) => id === clientId))
+                || (!Array.isArray(availableAtOrFrom) && availableAtOrFrom?.id === clientId);
         });
         if (sellerMakesOffer === undefined) {
             throw new factory.errors.Argument('seller', 'seller makes no offers');
@@ -88,7 +76,7 @@ function validateStartRequest(params) {
         const { customerType } = params;
         if (typeof customerType === 'string') {
             // 適用カスタマータイプが存在すれば検証(存在しなければあらゆるカスタマータイプを受け入れる)
-            const eligibleCustomerTypeByProject = projectMakesOffer === null || projectMakesOffer === void 0 ? void 0 : projectMakesOffer.eligibleCustomerType;
+            const eligibleCustomerTypeByProject = projectMakesOffer?.eligibleCustomerType;
             if (Array.isArray(eligibleCustomerTypeByProject)) {
                 const isCustomerTypeEligible = eligibleCustomerTypeByProject.some(({ codeValue }) => codeValue === customerType);
                 if (!isCustomerTypeEligible) {
@@ -105,7 +93,7 @@ function validateStartRequest(params) {
             }
         }
         // IAM存在検証(2024-02-06~)
-        const iamMember = (yield repos.member.searchCustomerMembers({
+        const iamMember = (await repos.member.searchCustomerMembers({
             limit: 1,
             page: 1,
             project: { id: seller.project.id },
@@ -121,10 +109,10 @@ function validateStartRequest(params) {
         // メンバーシップトークン検証(2024-01-31~)
         let memeberOfPayload;
         // 適用メンバーシップについてはproject.makesOfferを参照(2025-01-13~)
-        const validMemberProgramIdentifier = (_c = projectMakesOffer.validForMemberTier) === null || _c === void 0 ? void 0 : _c.isTierOf.identifier;
+        const validMemberProgramIdentifier = projectMakesOffer.validForMemberTier?.isTierOf.identifier;
         if (typeof validMemberProgramIdentifier === 'string') {
             // メンバープログラムと発行者を参照(2025-01-16~)
-            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
+            const memberProgram = (await repos.memberProgram.projectMemberPrograms({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
@@ -133,16 +121,19 @@ function validateStartRequest(params) {
             if (memberProgram === undefined) {
                 throw new factory.errors.NotFound('MemberProgram');
             }
-            const issuer = yield repos.issuer.findByIdentifier({
+            const issuer = await repos.issuer.findByIdentifier({
                 project: { id: params.project.id },
                 identifier: memberProgram.hostingOrganization.identifier
             });
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory.errors.NotFound('issuer.tokenSecret');
             }
-            memeberOfPayload = yield verifyMembershipToken(Object.assign({ secret: issuer.tokenSecret, 
+            memeberOfPayload = await verifyMembershipToken({
+                secret: issuer.tokenSecret,
                 // issuer: issuer.identifier,
-                issuer: issuer.url }, (typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined));
+                issuer: issuer.url, // identifier -> url(2025-05-11~)
+                ...(typeof params.memberOfToken === 'string') ? { token: params.memberOfToken } : undefined
+            });
         }
         // discontinue(2025-01-14~)
         // if (Array.isArray(iamMember.member.member)) {
@@ -156,7 +147,10 @@ function validateStartRequest(params) {
         //         });
         //     }
         // }
-        return Object.assign({ sellerMakesOffer,
-            seller }, (memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined);
-    });
+        return {
+            sellerMakesOffer,
+            seller,
+            ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined
+        };
+    };
 }

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

@@ -1,13 +1,4 @@
 "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.start = start;
 const factory = require("../../../factory");
@@ -17,11 +8,16 @@ const validateStartRequest_1 = require("./start/validateStartRequest");
  * 取引開始
  */
 function start(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        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;
+    return async (repos) => {
+        const { passport, customerType } = await repos.passport.validatePassportTokenIfExist(params);
+        const { memeberOfPayload, sellerMakesOffer, seller } = await (0, validateStartRequest_1.validateStartRequest)({
+            project: { id: params.project.id },
+            seller: { id: params.seller.id },
+            ...(typeof 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 = sellerMakesOffer.eligibleTransactionDuration?.maxValue;
         if (typeof expiresInSeconds !== 'number') {
             throw new factory.errors.NotFound('eligibleTransactionDuration.maxValue');
         }
@@ -31,11 +27,11 @@ function start(params, options) {
         // lock passport(2024-07-05~)
         if (options.lockPassport && passport !== undefined) {
             try {
-                yield repos.passport.lock(passport);
+                await repos.passport.lock(passport);
             }
             catch (error) {
                 // in case already locked
-                const alreadyStartedTransaction = (yield repos.transaction.projectFields({
+                const alreadyStartedTransaction = (await repos.transaction.projectFields({
                     limit: 1, page: 1,
                     typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
@@ -53,8 +49,8 @@ function start(params, options) {
             }
         }
         if (transaction === undefined) {
-            transaction = yield repos.transaction.start(startParams);
+            transaction = await repos.transaction.start(startParams);
         }
         return transaction;
-    });
+    };
 }

package/lib/chevre/service/transaction/returnOrder/exportTasks/factory.js

@@ -11,12 +11,11 @@ const factory = require("../../../../factory");
 function createTasks(params, setting
 // settings: Settings
 ) {
-    var _a, _b, _c;
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
-    const confirmedStoragePeriodInDays = (_a = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _a === void 0 ? void 0 : _a.transactionConfirmedInDays;
-    const canceledStoragePeriodInDays = (_b = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _b === void 0 ? void 0 : _b.transactionCanceledInDays;
+    const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
+    const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
     if (typeof confirmedStoragePeriodInDays !== 'number') {
         throw new factory.errors.NotFound('setting.storage.confirmedStoragePeriodInDays');
     }
@@ -53,15 +52,23 @@ function createTasks(params, setting
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: Object.assign({ specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id, id: transaction.id, object: {
+            object: {
+                specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
+                id: transaction.id,
+                object: {
                     order: transaction.object.order
-                }, project: transaction.project, startDate: transaction.startDate, typeOf: transaction.typeOf }, (transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined)
+                },
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf,
+                ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
-            const returnOrderPotentialActions = (_c = transaction.potentialActions) === null || _c === void 0 ? void 0 : _c.returnOrder;
+            const returnOrderPotentialActions = transaction.potentialActions?.returnOrder;
             if (Array.isArray(returnOrderPotentialActions)) {
                 // 返品タスク
                 const returnOrderTask = returnOrderPotentialActions.map((r) => {