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

package/example/src/chevre/findValidObjectByAuthorizationCode.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const CODE = '33357ca4-55cb-4b36-8d82-af8e445c53c7';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const codeRepo = await chevre.repository.Code.createInstance(mongoose.connection);
+
+    const result = await codeRepo.findValidOneByCode({
+        project,
+        code: CODE
+    });
+    console.log('result:', result);
+
+    const token = await (await chevre.service.code.createService()).getToken({
+        project,
+        code: CODE,
+        expiresIn: 1800
+    })({
+        authorization: codeRepo
+    });
+    console.log('token:', token);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -2,6 +2,9 @@ import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type IObject = factory.authorization.IObject;
 export type ICode = string;
+type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf'> & {
+    id: string;
+};
 /**
  * 承認コードリポジトリ
  */
@@ -24,12 +27,12 @@ export declare class MongoRepository {
     /**
      * コードで承認対象を検索する
      */
-    findValidObjectByCode(params: {
+    findValidOneByCode(params: {
         project: {
             id: string;
         };
         code: ICode;
-    }): Promise<IObject>;
+    }): Promise<IFindValidOneResult>;
     search(params: factory.authorization.ISearchConditions): Promise<factory.authorization.IAuthorization[]>;
     /**
      * 有効期限を一定期間過ぎた承認を削除する
@@ -42,3 +45,4 @@ export declare class MongoRepository {
      */
     private save;
 }
+export {};

package/lib/chevre/repo/code.js

@@ -111,7 +111,7 @@ class MongoRepository {
     /**
      * コードで承認対象を検索する
      */
-    findValidObjectByCode(params) {
+    findValidOneByCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const now = new Date();
             const doc = yield this.authorizationModel.findOne({
@@ -119,22 +119,17 @@ class MongoRepository {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1, _id: 0 })
+            }, { object: 1, _id: 1, typeOf: 1 })
                 // projection的にleanで十分
-                .lean()
+                // .lean<Pick<factory.authorization.IAuthorization, 'object'>>()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            return doc.object;
+            const { id, object, typeOf } = doc.toObject();
+            return { id, object, typeOf };
         });
     }
-    // public async count(params: factory.authorization.ISearchConditions): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.authorizationModel.countDocuments((conditions.length > 0) ? { $and: conditions } : {})
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     search(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/lib/chevre/service/code.js

@@ -27,18 +27,19 @@ function getToken(params) {
         if (typeof params.code !== 'string' || params.code.length === 0) {
             throw new factory.errors.ArgumentNull('code');
         }
-        const authorizationObject = yield repos.authorization.findValidObjectByCode({
+        const authorization = yield repos.authorization.findValidOneByCode({
             project: { id: params.project.id },
             code: params.code
         });
         return new Promise((resolve, reject) => {
             // 所有権を暗号化する
-            jwt.sign(authorizationObject, credentials_1.credentials.jwt.secret, 
-            // params.secret,
-            {
+            jwt.sign(Object.assign(Object.assign({}, authorization.object), { 
+                // sub: authorization.id, // 拡張(2024-05-01~)
+                token_use: 'access', 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
+             }), credentials_1.credentials.jwt.secret, {
                 issuer: credentials_1.credentials.jwt.issuer,
-                // issuer: params.issuer,
-                expiresIn: params.expiresIn
+                expiresIn: params.expiresIn,
+                subject: authorization.id // 拡張(2024-05-01~)
             }, (err, encoded) => {
                 if (err instanceof Error) {
                     reject(err);

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

@@ -21,13 +21,13 @@ function findByCode(params) {
             throw new factory.errors.ArgumentNull('code');
         }
         const reservationId = String(params.id);
-        const authorizationObject = yield repos.authorization.findValidObjectByCode({
+        const authorization = yield repos.authorization.findValidOneByCode({
             project: { id: params.project.id },
             code: params.code
         });
-        switch (authorizationObject.typeOf) {
+        switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order:
-                const { orderNumber } = authorizationObject;
+                const { orderNumber } = authorization.object;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     // reservationIdを含む注文の存在を確認するだけでよい
                     yield repos.order.findByOrderNumberAndReservationId({
@@ -39,7 +39,7 @@ function findByCode(params) {
                 }
                 break;
             default:
-                throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorizationObject.typeOf} not implemented`);
+                throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }
         const reservationFromRepo = yield repos.reservation.findById({
             id: reservationId,

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

@@ -28,10 +28,11 @@ function verifyToken4reservation(params) {
             })({});
         }
         else if (typeof ticketToken === 'string' && ticketToken.length > 0) {
-            payload = yield repos.authorization.findValidObjectByCode({
+            const findValidOneByCodeResult = yield repos.authorization.findValidOneByCode({
                 project: { id: params.project.id },
                 code: ticketToken
             });
+            payload = findValidOneByCodeResult.object;
         }
         else {
             throw new factory.errors.ArgumentNull('ticket.token or ticket.ticketToken');

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

@@ -49,14 +49,14 @@ function onAuthorizationCreated(params) {
         let reservationNumbers = [];
         // 発券対象イベントID
         let reservationForIds = [];
-        const authorizationObject = yield repos.code.findValidObjectByCode({
+        const authorization = yield repos.code.findValidOneByCode({
             code: params.code,
             project: { id: params.project.id }
         });
-        switch (authorizationObject.typeOf) {
+        switch (authorization.object.typeOf) {
             case factory.order.OrderType.Order:
                 // 注文検索
-                const orderNumber = authorizationObject.orderNumber;
+                const orderNumber = authorization.object.orderNumber;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     reservationNumbers = yield repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [orderNumber] }
@@ -68,7 +68,7 @@ function onAuthorizationCreated(params) {
                 break;
             case 'OwnershipInfo':
                 // 所有権検索
-                const ownershipInfoId = authorizationObject.id;
+                const ownershipInfoId = authorization.object.id;
                 if (typeof ownershipInfoId === 'string' && ownershipInfoId.length > 0) {
                     const ownershipInfo = yield repos.ownershipInfo.findById({ id: ownershipInfoId });
                     // 座席予約に対する所有権であれば発券

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