@chevre/domain 21.30.0-alpha.40 → 21.30.0-alpha.42

package/example/src/chevre/findValidAuthorization.ts

@@ -26,6 +26,7 @@ async function main() {
     // console.log('result:', result);
 
     const token = await (await chevre.service.code.createService()).getToken({
+        agent: { id: 'xxx', typeOf: chevre.factory.personType.Person },
         project,
         code: CODE,
         expiresIn: 18000,

package/example/src/chevre/playAroundTicket.ts

@@ -28,11 +28,11 @@ async function main() {
     console.log('tickets:', tickets);
     console.log(tickets.length, 'tickets found');
 
-    const issueResult = await ticketRepo.issueByTicketToken({
-        ticketToken: TICKET_TOKEN,
-        project: { id: project.id }
-    });
-    console.log('issueResult:', issueResult);
+    // const issueResult = await ticketRepo.issueByTicketToken({
+    //     ticketToken: TICKET_TOKEN,
+    //     project: { id: project.id }
+    // });
+    // console.log('issueResult:', issueResult);
 }
 
 main()

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 export type ICode = string;
-type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience'> & {
+type IFindValidOneResult = Pick<factory.authorization.IAuthorization, 'object' | 'typeOf' | 'audience' | 'issuedBy'> & {
     id: string;
 };
 type ISaveParams = Pick<factory.authorization.IAuthorization, 'audience' | 'author' | 'code' | 'issuedBy' | 'project' | 'validFrom' | 'object'> & {

package/lib/chevre/repo/code.js

@@ -114,7 +114,7 @@ class AuthorizationRepo {
                 code: { $eq: String(params.code) },
                 validFrom: { $lte: now },
                 validUntil: { $gte: now }
-            }, { object: 1, _id: 1, typeOf: 1, audience: 1 })
+            }, { object: 1, _id: 1, typeOf: 1, audience: 1, issuedBy: 1 })
                 // projection的にleanで十分
                 // .lean<Pick<factory.authorization.IAuthorization, 'object'>>()
                 .exec();

package/lib/chevre/repo/mongoose/schemas/role.d.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition, IndexOptions, Schema } from 'mongoose';
 declare const modelName = "Role";
-declare function createSchema(): Schema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): Schema;
 export { modelName, indexes, createSchema };

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

@@ -7,8 +7,9 @@ const settings_1 = require("../../../settings");
 const modelName = 'Role';
 exports.modelName = modelName;
 const schemaDefinition = {
-    typeOf: String,
-    permissions: [String]
+    typeOf: { type: String, required: true },
+    permissions: [String],
+    roleName: { type: String, required: true }
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,
@@ -17,12 +18,10 @@ const schemaOptions = {
     id: true,
     read: settings_1.MONGO_READ_PREFERENCE,
     writeConcern: writeConcern_1.writeConcern,
-    strict: false,
+    strict: true,
     strictQuery: false,
-    timestamps: {
-        createdAt: 'createdAt',
-        updatedAt: 'updatedAt'
-    },
+    timestamps: false,
+    versionKey: false,
     toJSON: {
         getters: false,
         virtuals: false,
@@ -36,31 +35,10 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * ロールスキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
-exports.createSchema = createSchema;
 const indexes = [
-    [
-        { createdAt: 1 },
-        { name: 'searchByCreatedAt' }
-    ],
-    [
-        { updatedAt: 1 },
-        { name: 'searchByUpdatedAt' }
-    ],
     [
         { roleName: 1 },
-        {
-            name: 'searchByRoleName'
-        }
+        { name: 'searchByRoleName' }
     ],
     [
         { permissions: 1, roleName: 1 },
@@ -73,3 +51,19 @@ const indexes = [
     ]
 ];
 exports.indexes = indexes;
+/**
+ * ロールスキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}
+exports.createSchema = createSchema;

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

@@ -10,7 +10,8 @@ const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     ticketToken: { type: String, required: true },
-    dateIssued: { type: Date, required: true }
+    dateIssued: { type: Date, required: true },
+    issuedBy: mongoose_1.SchemaTypes.Mixed
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repo/role.js

@@ -42,11 +42,7 @@ class MongoRepository {
     search(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, {
-                __v: 0,
-                createdAt: 0,
-                updatedAt: 0
-            });
+            const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, {});
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)

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

@@ -1,5 +1,9 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+export interface ITicketIssuedBy {
+    id: string;
+    typeOf: factory.organizationType.Corporation | factory.organizationType.Project;
+}
 interface ITicket {
     /**
      * チケットID(jti)
@@ -12,11 +16,13 @@ interface ITicket {
     typeOf: 'Ticket';
     ticketToken: string;
     dateIssued: Date;
+    issuedBy: ITicketIssuedBy;
 }
 type IIssueParams = Pick<ITicket, 'ticketToken'> & {
     project: {
         id: string;
     };
+    issuedBy?: ITicketIssuedBy;
 };
 interface ISearchConditions {
     limit?: number;

package/lib/chevre/repo/ticket.js

@@ -42,9 +42,13 @@ class TicketRepo {
      */
     issueByTicketToken(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { ticketToken, project } = params;
+            const { ticketToken, project, issuedBy } = params;
+            const ticketIssuedBy = (typeof (issuedBy === null || issuedBy === void 0 ? void 0 : issuedBy.id) === 'string' && issuedBy.typeOf === factory.organizationType.Corporation)
+                ? issuedBy
+                : { id: project.id, typeOf: factory.organizationType.Project };
             const creatingTicket = {
                 dateIssued: new Date(),
+                issuedBy: ticketIssuedBy,
                 project: { id: project.id, typeOf: factory.organizationType.Project },
                 ticketToken,
                 typeOf: 'Ticket'

package/lib/chevre/service/code.js

@@ -23,6 +23,7 @@ const ALGORITHM = 'HS256';
  */
 function getToken(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         if (typeof params.project.id !== 'string' || params.project.id.length === 0) {
             throw new factory.errors.ArgumentNull('project.id');
         }
@@ -40,10 +41,7 @@ function getToken(params) {
         let typ = `${credentials_1.credentials.jwt.payloadTypPrefix}:${authorization.typeOf}`;
         let jti;
         if (params.useJti) {
-            const { id } = yield repos.ticket.issueByTicketToken({
-                project: { id: params.project.id },
-                ticketToken: params.code
-            });
+            const { id } = yield repos.ticket.issueByTicketToken(Object.assign({ project: { id: params.project.id }, ticketToken: params.code }, (typeof ((_a = authorization.issuedBy) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { issuedBy: authorization.issuedBy } : undefined));
             jti = id;
             // ロール承認の場合、subjectはメンバーID,typはメンバータイプ
             if (authorization.object.typeOf === factory.iam.RoleType.OrganizationRole) {

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