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

package/example/src/chevre/eventOffer/publishEventOfferToken.ts

@@ -0,0 +1,98 @@
+// tslint:disable:no-console
+import { sign } from 'jsonwebtoken';
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventOfferRepo = await chevre.repository.EventOffer.createInstance(mongoose.connection);
+    const issuerRepo = await chevre.repository.Issuer.createInstance(mongoose.connection);
+
+    const eventOffer = (await eventOfferRepo.findEventOffers(
+        {
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            id: { $eq: '691e5bb3929e69df1ec6e9a6' }
+        },
+        ['offeredBy', 'identifier', 'itemOffered']
+    )).shift();
+    if (eventOffer === undefined) {
+        throw new chevre.factory.errors.NotFound(chevre.factory.offerType.Offer);
+    }
+
+    const issuerIdentifier = eventOffer.offeredBy?.identifier;
+    if (typeof issuerIdentifier !== 'string') {
+        throw new chevre.factory.errors.NotFound('eventOffer.offeredBy?.identifier');
+    }
+
+    // const tier = (await memberProgramRepo.projectMemberProgramTiers(
+    //     {
+    //         limit: 1,
+    //         page: 1,
+    //         project: { id: { $eq: project.id } },
+    //         identifier: { $eq: tierIdentifier }
+    //     }
+    // )).shift();
+    // if (tier === undefined) {
+    //     throw new chevre.factory.errors.NotFound('MemberProgramTier');
+    // }
+
+    const { url, tokenSecret } = await issuerRepo.findByIdentifier({
+        identifier: issuerIdentifier,
+        project: { id: project.id }
+    });
+    if (typeof tokenSecret !== 'string') {
+        throw new chevre.factory.errors.NotFound('issuer.tokenSecret');
+    }
+
+    const payload: chevre.factory.assetTransaction.reserve.IEventOfferTokenPayload = {
+        identifier: eventOffer.identifier,
+        validFrom: moment()
+            .format('YYYY-MM-DDTHH:mm:ssZ'),
+        validThrough: moment()
+            .add(1, 'hour')
+            .format('YYYY-MM-DDTHH:mm:ssZ'),
+        eligibleQuantity: {
+            maxValue: 1
+        },
+        itemOffered: {
+            id: 'xxx'
+        }
+    };
+
+    const token = await new Promise<string>((resolve, reject) => {
+        // 所有権を暗号化する
+        sign(
+            payload,
+            tokenSecret,
+            {
+                // algorithm: jwtSetting.algorithm,
+                issuer: url,
+                expiresIn: 1800
+                // subject,
+            },
+            (err, encoded) => {
+                if (err instanceof Error) {
+                    reject(err);
+                } else {
+                    if (typeof encoded !== 'string') {
+                        reject(new Error('cannot be signed unexpectedly'));
+                    } else {
+                        resolve(encoded);
+                    }
+                }
+            }
+        );
+    });
+    console.log(token);
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -16,9 +16,10 @@ export declare class AuthorizationRepo {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.authorization.ISearchConditions): FilterQuery<factory.authorization.IAuthorization>[];
     /**
-     * コードを発行する
+     * 承認を発行する
+     * コードが自動生成されます
      */
-    publish(params: IPublishParams[]): Promise<factory.authorization.IAuthorization[]>;
+    issueAuthorization(params: IPublishParams[]): Promise<factory.authorization.IAuthorization[]>;
     /**
      * コードで有効な承認を参照する
      */

package/lib/chevre/repo/authorization.js

@@ -111,9 +111,10 @@ class AuthorizationRepo {
         return andConditions;
     }
     /**
-     * コードを発行する
+     * 承認を発行する
+     * コードが自動生成されます
      */
-    publish(params) {
+    issueAuthorization(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const saveParams = params.map(({ project, object, validFrom, expiresInSeconds, audience, author, issuedBy }) => {
                 const code = uuid.v4();
@@ -144,7 +145,7 @@ class AuthorizationRepo {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
             const { id, object, typeOf, audience, issuedBy } = doc;
-            return Object.assign(Object.assign({ id, object, typeOf }, (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string') ? { issuedBy } : undefined), (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
+            return Object.assign({ id, object, typeOf, issuedBy }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
         });
     }
     /**
@@ -217,14 +218,21 @@ class AuthorizationRepo {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.length > 0) {
                 const docs = params.map(({ project, code, object, validFrom, expiresInSeconds, audience, author, issuedBy }) => {
+                    // issuedByは必須化(2025-11-21~)
+                    if (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) !== 'string') {
+                        throw new factory.errors.ArgumentNull('issuedBy?.id');
+                    }
                     const validUntil = moment(validFrom)
                         .add(expiresInSeconds, 'seconds')
                         .toDate();
-                    return Object.assign(Object.assign({ project, typeOf: 'Authorization', author,
+                    return Object.assign({ project, typeOf: 'Authorization', author,
                         code,
+                        issuedBy,
                         object,
                         validFrom,
-                        validUntil }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined), (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string') ? { issuedBy } : undefined);
+                        validUntil }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined
+                    // ...(typeof issuedBy?.id === 'string') ? { issuedBy } : undefined
+                    );
                 });
                 const result = yield this.authorizationModel.insertMany(docs, { ordered: false, rawResult: true });
                 if (result.insertedCount !== docs.length) {

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateIssuedOfferIfExists.js

@@ -50,21 +50,21 @@ function verifyOfferToken(params) {
 const OFFER_TOKEN_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 function validateOfferToken(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const { event, acceptedDate, verifiedOffer, eventOffer, numAcceptedOffers } = params;
-        // イベント識別子一致検証
-        const itemOfferedIdentifier = verifiedOffer.itemOffered.identifier;
-        if (typeof itemOfferedIdentifier !== 'string' || itemOfferedIdentifier === '') {
-            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.identifier must be string');
+        // イベントID一致検証
+        const itemOfferedId = (_a = verifiedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof itemOfferedId !== 'string' || itemOfferedId === '') {
+            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.id must be string');
         }
-        const itemOfferedIdentifierMustBe = event.identifier;
-        if (typeof itemOfferedIdentifierMustBe !== 'string') {
-            throw new factory.errors.NotFound('identifier', 'the event must have an identifier');
+        const itemOfferedIdMustBe = event.id;
+        if (typeof itemOfferedIdMustBe !== 'string') {
+            throw new factory.errors.NotFound('event.id', 'the event must have an ID');
         }
-        if (itemOfferedIdentifier !== itemOfferedIdentifierMustBe) {
-            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.identifier not matched');
+        if (itemOfferedId !== itemOfferedIdMustBe) {
+            throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.id not matched');
         }
-        // アプリケーションオファーコード一致検証
+        // オファーコード一致検証
         const applicationOfferIdentifier = verifiedOffer.identifier;
         if (typeof applicationOfferIdentifier !== 'string' || applicationOfferIdentifier === '') {
             throw new factory.errors.Argument('ticketedOffer.token', 'identifier must be string');
@@ -94,7 +94,7 @@ function validateOfferToken(params) {
             throw new factory.errors.Argument('ticketedOffer.token', `the offer id valid through ${validThroughMoment}`);
         }
         // maxValueを検証
-        const maxValue = (_a = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
+        const maxValue = (_b = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
         if (typeof maxValue !== 'number') {
             throw new factory.errors.Argument('ticketedOffer.token', 'eligibleQuantity.maxValue must be number');
         }

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateMemberTierIfExists.js

@@ -136,33 +136,5 @@ function validateMemberTierIfExists(params) {
                 memberProgramIdentifierMustBe, aggregateOfferIdentifier
             })(repos);
         }
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO オファートークン検証(2025-10-21~)
-        // const offerTokenIssuer = makesOfferOnApplication.issuedBy?.identifier;
-        // const offerTokenRequired = typeof offerTokenIssuer === 'string';
-        // if (offerTokenRequired) {
-        //     const offerToken = params.object.reservationFor?.offers?.token;
-        //     if (typeof offerToken !== 'string' || offerToken === '') {
-        //         throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
-        //     }
-        //     const issuer = await repos.issuer.findByIdentifier({
-        //         project: { id: params.event.project.id },
-        //         identifier: offerTokenIssuer
-        //     });
-        //     if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
-        //         throw new factory.errors.NotFound('issuer.tokenSecret');
-        //     }
-        //     const verifiedOffer = await verifyOfferToken({
-        //         secret: issuer.tokenSecret,
-        //         issuer: issuer.url,
-        //         token: offerToken
-        //     });
-        //     await validateOfferToken({
-        //         acceptedDate,
-        //         verifiedOffer,
-        //         makesOfferOnApplication,
-        //         object: params.object
-        //     })();
-        // }
     });
 }

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

@@ -31,7 +31,7 @@ function createOfferTicket(params) {
         const action = yield repos.action.start(actionAttributes);
         let authorizations;
         try {
-            authorizations = yield repos.authorization.publish([{
+            authorizations = yield repos.authorization.issueAuthorization([{
                     project: { id: project.id, typeOf: factory.organizationType.Project },
                     object,
                     validFrom,

package/lib/chevre/service/transaction/placeOrder/confirm/publishCode.js

@@ -21,7 +21,7 @@ function publishCode(params) {
         const issuedBy = { id: params.object.seller.id, typeOf: factory.organizationType.Corporation };
         let authorizations;
         try {
-            authorizations = yield repos.authorization.publish([{
+            authorizations = yield repos.authorization.issueAuthorization([{
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     object: authorizationObject,
                     validFrom: params.validFrom,

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.2.0",
-    "@cinerino/sdk": "12.8.0",
+    "@chevre/factory": "5.3.0-alpha.1",
+    "@cinerino/sdk": "12.9.0-alpha.0",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.13"
+  "version": "23.1.0-alpha.15"
 }