@chevre/domain 21.18.0-alpha.24 → 21.18.0-alpha.25

package/lib/chevre/credentials.d.ts

@@ -35,9 +35,6 @@ export declare const credentials: {
     sendGrid: {
         apiKey: string | undefined;
     };
-    hub: {
-        clientId: string;
-    };
     jwt: {
         secret: string;
         issuer: string;

package/lib/chevre/credentials.js

@@ -41,9 +41,10 @@ exports.credentials = {
     sendGrid: {
         apiKey: process.env.SENDGRID_API_KEY
     },
-    hub: {
-        clientId: process.env.HUB_CLIENT_ID
-    },
+    // discontinue(2023-12-12~)
+    // hub: {
+    //     clientId: <string>process.env.HUB_CLIENT_ID
+    // },
     jwt: {
         secret: process.env.TOKEN_SECRET,
         issuer: process.env.RESOURCE_SERVER_IDENTIFIER

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

@@ -156,7 +156,7 @@ export declare class MongoRepository {
      * sskts専用オファー保管
      */
     saveManyByIdentifier(params: {
-        attributes: factory.unitPriceOffer.IUnitPriceOffer;
+        attributes: Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
         upsert?: boolean;
     }[]): Promise<void>;
     /**

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

@@ -44,5 +44,5 @@ export declare function coaTicket2offer(params: {
     ticketResult: COA.factory.master.ITicketResult;
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
     defaultMembershipType?: factory.categoryCode.ICategoryCode;
-}): factory.unitPriceOffer.IUnitPriceOffer;
+}): Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
 export {};

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

@@ -340,7 +340,9 @@ function coaTicket2offer(params) {
             ? params.ticketResult.ticketNameEng
             : ''
     };
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, id: '', identifier: identifier, name: offerName, description: {
+    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
+        // id: '',
+        identifier: identifier, name: offerName, description: {
             ja: '',
             en: ''
         }, alternateName: {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -3,14 +3,7 @@ type IProcessingOrder = factory.order.IOrder & {
     acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
     orderStatus: factory.orderStatus.OrderProcessing;
 };
-type IOrderWithToken = IProcessingOrder & {
-    token?: string;
-};
-declare function getOrderWithToken(params: {
-    order: IProcessingOrder;
-    expiresIn: number;
-}): Promise<IOrderWithToken>;
-declare function createInformTasks(order: IOrderWithToken): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: IProcessingOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
     order: factory.order.IOrder & {
         acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
@@ -27,4 +20,4 @@ declare function createConfirmRegisterServiceActionObjectByOrder(params: {
     };
 }): factory.action.interact.confirm.registerService.IObject[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-export { IExternalOrder, getOrderWithToken, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };
+export { IExternalOrder, createInformTasks, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder, createConfirmRegisterServiceActionObjectByOrder };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -1,61 +1,14 @@
 "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());
-    });
-};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = exports.getOrderWithToken = void 0;
+exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = void 0;
 const google_libphonenumber_1 = require("google-libphonenumber");
-const jwt = require("jsonwebtoken");
 const util_1 = require("util");
-const credentials_1 = require("../../../../credentials");
 const factory = require("../../../../factory");
 const order_1 = require("../../../../factory/order");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
 const settings_1 = require("../../../../settings");
 const informOrder = (_a = settings_1.settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-function getOrderWithToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof credentials_1.credentials.hub.clientId !== 'string') {
-            return params.order;
-        }
-        // 最適化(2023-01-31~)
-        const order4token = {
-            typeOf: params.order.typeOf,
-            orderNumber: params.order.orderNumber
-        };
-        const token = yield new Promise((resolve, reject) => {
-            // 所有権を暗号化する
-            jwt.sign(order4token, credentials_1.credentials.jwt.secret, {
-                audience: [credentials_1.credentials.hub.clientId],
-                issuer: credentials_1.credentials.jwt.issuer,
-                expiresIn: params.expiresIn
-            }, (err, encoded) => {
-                if (err instanceof Error) {
-                    reject(err);
-                }
-                else {
-                    if (typeof encoded !== 'string') {
-                        reject(new factory.errors.ServiceUnavailable('order cannot be signed unexpectedly'));
-                    }
-                    else {
-                        resolve(encoded);
-                    }
-                }
-            });
-        });
-        return Object.assign(Object.assign({}, params.order), { 
-            // 注文トークンを情報付加
-            token });
-    });
-}
-exports.getOrderWithToken = getOrderWithToken;
 const ASTERISK_CHARACTER = '*';
 function createInformTasks(order) {
     const taskRunsAt = new Date();
@@ -95,7 +48,7 @@ function createInformTasks(order) {
 exports.createInformTasks = createInformTasks;
 function creteOrder4inform(order) {
     // 冗長な個人情報をmask
-    return Object.assign(Object.assign({ 
+    return Object.assign({ 
         // whitelistで作成する(2022-07-19~)
         project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
         // mask
@@ -112,7 +65,7 @@ function creteOrder4inform(order) {
             return Object.assign(Object.assign({}, p), (typeof p.accountId === 'string' && p.accountId.length > 0)
                 ? { accountId: ASTERISK_CHARACTER.repeat(p.accountId.length) }
                 : undefined);
-        }) }, (typeof order.token === 'string') ? { token: order.token } : undefined), (typeof order.id === 'string') ? { id: order.id } : undefined);
+        }) }, (typeof order.id === 'string') ? { id: order.id } : undefined);
 }
 function createConfirmReservationActionObject4ChevreByOrder(params) {
     const chevreReservationNumbers = params.order.acceptedOffers.filter((o) => {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -19,7 +19,6 @@ const order_1 = require("../../../factory/order");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
-const TOKEN_EXPIRES_IN = 604800;
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -41,9 +40,8 @@ function onOrderProcessing(params) {
         };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                const orderWithToken = yield (0, factory_1.getOrderWithToken)({ order: params.order, expiresIn: TOKEN_EXPIRES_IN });
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(orderWithToken),
+                    ...(0, factory_1.createInformTasks)(params.order),
                     ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
                 ];
                 break;

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.347.0-alpha.2",
+    "@chevre/factory": "4.347.0-alpha.3",
     "@cinerino/sdk": "5.4.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.24"
+  "version": "21.18.0-alpha.25"
 }