@chevre/domain 21.30.0-alpha.41 → 21.30.0-alpha.43

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,15 +114,15 @@ 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();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.authorizationModel.modelName);
             }
-            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);
+            const { id, object, typeOf, audience, issuedBy } = doc.toObject();
+            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);
         });
     }
     /**

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: { type: mongoose_1.SchemaTypes.Mixed, required: true }
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

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