@chevre/domain 21.30.0-alpha.30 → 21.30.0-alpha.32

package/example/src/chevre/findValidAuthorization.ts

@@ -27,7 +27,9 @@ async function main() {
     const token = await (await chevre.service.code.createService()).getToken({
         project,
         code: CODE,
-        expiresIn: 18000
+        expiresIn: 18000,
+        issuer: 'https://example.com',
+        audience: 'https://example.com'
     })({
         authorization: authorizationRepo
     });

package/lib/chevre/credentials.d.ts

@@ -47,10 +47,6 @@ export declare const credentials: {
     };
     jwt: {
         secret: string;
-        /**
-         * トークン発行時の発行者
-         */
-        issuer: string;
         /**
          * トークン検証時の発行者リスト
          */

package/lib/chevre/credentials.js

@@ -55,12 +55,9 @@ exports.credentials = {
     jwt: {
         secret: process.env.TOKEN_SECRET,
         // RESOURCE_SERVER_IDENTIFIERとは分離して指定可能に拡張(2024-05-02~)
-        /**
-         * トークン発行時の発行者
-         */
-        issuer: (typeof process.env.TOKEN_ISSUER_BY_AUTHORIZATION === 'string')
-            ? process.env.TOKEN_ISSUER_BY_AUTHORIZATION
-            : process.env.RESOURCE_SERVER_IDENTIFIER,
+        // issuer: (typeof process.env.TOKEN_ISSUER_BY_AUTHORIZATION === 'string')
+        //     ? process.env.TOKEN_ISSUER_BY_AUTHORIZATION
+        //     : <string>process.env.RESOURCE_SERVER_IDENTIFIER,
         /**
          * トークン検証時の発行者リスト
          */

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

@@ -2,7 +2,7 @@ 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'> & {
+type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience'> & {
     id: string;
 };
 /**
@@ -24,6 +24,7 @@ export declare class AuthorizationRepo {
         validFrom: Date;
         expiresInSeconds: number;
         audience?: factory.authorization.IAudience;
+        author: factory.authorization.IAuthor;
     }[]): Promise<factory.authorization.IAuthorization[]>;
     /**
      * コードで有効な承認を参照する

package/lib/chevre/repo/code.js

@@ -101,9 +101,9 @@ class AuthorizationRepo {
      */
     publish(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const saveParams = params.map(({ project, object, validFrom, expiresInSeconds, audience }) => {
+            const saveParams = params.map(({ project, object, validFrom, expiresInSeconds, audience, author }) => {
                 const code = uuid.v4();
-                return { project, code, object, validFrom, expiresInSeconds, audience };
+                return { project, code, object, validFrom, expiresInSeconds, audience, author };
             });
             return this.save(saveParams);
         });
@@ -119,15 +119,15 @@ class AuthorizationRepo {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1, _id: 1, typeOf: 1 })
+            }, { object: 1, _id: 1, typeOf: 1, audience: 1 })
                 // projection的にleanで十分
                 // .lean<Pick<factory.authorization.IAuthorization, 'object'>>()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            const { id, object, typeOf } = doc.toObject();
-            return { id, object, typeOf };
+            const { id, object, typeOf, audience } = doc.toObject();
+            return Object.assign({ id, object, typeOf }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);
         });
     }
     /**
@@ -194,11 +194,12 @@ class AuthorizationRepo {
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.length > 0) {
-                const docs = params.map(({ project, code, object, validFrom, expiresInSeconds, audience }) => {
+                const docs = params.map(({ project, code, object, validFrom, expiresInSeconds, audience, author }) => {
                     const validUntil = moment(validFrom)
                         .add(expiresInSeconds, 'seconds')
                         .toDate();
-                    return Object.assign({ project, typeOf: 'Authorization', code,
+                    return Object.assign({ project, typeOf: 'Authorization', author,
+                        code,
                         object,
                         validFrom,
                         validUntil }, (typeof (audience === null || audience === void 0 ? void 0 : audience.id) === 'string') ? { audience } : undefined);

package/lib/chevre/repo/mongoose/schemas/authorization.js

@@ -28,7 +28,8 @@ const schemaDefinition = {
         type: Date,
         required: true
     },
-    audience: mongoose_1.SchemaTypes.Mixed // add(2024-05-02~)
+    audience: mongoose_1.SchemaTypes.Mixed,
+    author: mongoose_1.SchemaTypes.Mixed // add(2024-05-02~)
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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

@@ -5,6 +5,7 @@ type IToken = string;
 type ICode = string;
 interface IPayload {
     sub: string;
+    aud?: string;
     token_use: string;
     iss: string;
     exp: number;
@@ -24,6 +25,14 @@ declare function getToken(params: {
     };
     code: ICode;
     expiresIn: number;
+    /**
+     * jtw.payload.iss
+     */
+    issuer: string;
+    /**
+     * jtw.payload.aud
+     */
+    audience: string;
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<IToken>;

package/lib/chevre/service/code.js

@@ -16,6 +16,7 @@ exports.verifyToken = exports.getToken = void 0;
 const jwt = require("jsonwebtoken");
 const factory = require("../factory");
 const credentials_1 = require("../credentials");
+const ALGORITHM = 'HS256';
 /**
  * コードをトークンに変換する
  */
@@ -31,16 +32,22 @@ function getToken(params) {
             project: { id: params.project.id },
             code: params.code
         });
+        const isAuthorize4order = (!Array.isArray(authorization.object) && authorization.object.typeOf === factory.order.OrderType.Order);
+        const payload = Object.assign(Object.assign({}, (isAuthorize4order) ? authorization.object : undefined), { 
+            // sub: authorization.id, // 拡張(2024-05-01~)
+            token_use: 'access', version: credentials_1.credentials.jwt.version, 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
+         });
+        if (typeof params.issuer !== 'string' || params.issuer.length === 0) {
+            throw new factory.errors.ArgumentNull('issuer');
+        }
         return new Promise((resolve, reject) => {
             // 所有権を暗号化する
-            jwt.sign(Object.assign(Object.assign({}, authorization.object), { 
-                // sub: authorization.id, // 拡張(2024-05-01~)
-                token_use: 'access', version: credentials_1.credentials.jwt.version, 'chevre:typeOf': authorization.typeOf // 拡張(2024-05-01~)
-             }), credentials_1.credentials.jwt.secret, {
-                issuer: credentials_1.credentials.jwt.issuer,
-                expiresIn: params.expiresIn,
-                subject: authorization.id // 拡張(2024-05-01~)
-            }, (err, encoded) => {
+            jwt.sign(payload, credentials_1.credentials.jwt.secret, Object.assign({ algorithm: ALGORITHM, 
+                // issuer: credentials.jwt.issuer,
+                issuer: params.issuer, expiresIn: params.expiresIn, subject: authorization.id }, (typeof params.audience === 'string')
+                ? { audience: params.audience }
+                : undefined // 拡張(2024-05-02~)
+            ), (err, encoded) => {
                 if (err instanceof Error) {
                     reject(err);
                 }
@@ -76,7 +83,7 @@ function verifyToken(params) {
         }
         try {
             payload = yield new Promise((resolve, reject) => {
-                jwt.verify(params.token, credentials_1.credentials.jwt.secret, Object.assign({ 
+                jwt.verify(params.token, credentials_1.credentials.jwt.secret, Object.assign({ algorithms: [ALGORITHM], 
                     // 互換性維持のために複数対応(2024-05-02~)
                     // issuer: credentials.jwt.issuer,
                     issuer: credentials_1.credentials.jwt.issuers }, (Array.isArray(params.audience)) ? { audience: params.audience } : undefined), (err, decoded) => {

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

@@ -68,7 +68,8 @@ function confirm(params) {
                 project: { id: transaction.project.id },
                 object: { orderNumber },
                 validFrom: params.result.order.orderDate,
-                expiresInSeconds: publishCodeExpiresInSeconds
+                expiresInSeconds: publishCodeExpiresInSeconds,
+                author: { id: transaction.agent.id, typeOf: transaction.agent.typeOf }
             })(repos);
         }
         let acceptedOffers;

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

@@ -1,4 +1,5 @@
 import type { AuthorizationRepo } from '../../../repo/code';
+import * as factory from '../../../factory';
 declare function publishCode(params: {
     project: {
         id: string;
@@ -8,6 +9,7 @@ declare function publishCode(params: {
     };
     validFrom: Date;
     expiresInSeconds: number;
+    author: factory.authorization.IAuthor;
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<string>;

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

@@ -24,7 +24,8 @@ function publishCode(params) {
                     project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     object: authorizationObject,
                     validFrom: params.validFrom,
-                    expiresInSeconds: params.expiresInSeconds
+                    expiresInSeconds: params.expiresInSeconds,
+                    author: params.author
                 }]);
         }
         catch (error) {

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.369.0-alpha.5",
+    "@chevre/factory": "4.369.0-alpha.6",
     "@cinerino/sdk": "5.18.0-alpha.16",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -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.30"
+  "version": "21.30.0-alpha.32"
 }