@contember/engine-tenant-api 2.1.0-beta.2 → 2.2.0-alpha.1

package/dist/development/src/resolvers/mutation/project/UpdateProjectMutationResolver.cjs

@@ -8,12 +8,15 @@ require("@contember/schema");
 require("../../../model/type/ApiKey.cjs");
 require("@contember/database");
 require("node:crypto");
+const Response = require("../../../model/utils/Response.cjs");
 require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
 require("node:assert");
+require("../../../model/service/idp/IDPRevalidation.cjs");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
 require("../../../model/service/idp/providers/OIDCTypes.cjs");
+require("jose");
 require("../../../model/service/idp/providers/FacebookProvider.cjs");
 require("../../../model/service/AuthLogService.cjs");
 require("@contember/schema-utils");
@@ -34,10 +37,21 @@ class UpdateProjectMutationResolver {
     if (!project) {
       return errorUtils.createProjectNotFoundResponse("PROJECT_NOT_FOUND", args.projectSlug);
     }
+    const nameChange = args.name && args.name !== project.name ? { before: project.name, after: args.name } : void 0;
+    const configChanged = args.config !== void 0;
     await this.projectManager.updateProject(context.db, project.id, {
       name: args.name || void 0,
       config: args.config !== void 0 ? configLoader.Merger.merge(args.mergeConfig ? project.config : {}, args.config) : void 0
     });
+    await context.logAuthAction({
+      type: "project_update",
+      response: new Response.ResponseOk(null),
+      eventData: {
+        slug: project.slug,
+        ...nameChange ? { name: nameChange } : {},
+        ...configChanged ? { configChanged: true, mergeConfig: args.mergeConfig ?? false } : {}
+      }
+    });
     return { ok: true };
   }
 }

package/dist/development/src/resolvers/mutation/project/UpdateProjectMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateProjectMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/project/UpdateProjectMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationUpdateProjectArgs, UpdateProjectResponse } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { PermissionActions, ProjectManager } from '../../../model'\nimport { createProjectNotFoundResponse } from '../../errorUtils'\nimport { Merger } from '@contember/config-loader'\n\nexport class UpdateProjectMutationResolver implements MutationResolvers {\n\tconstructor(private readonly projectManager: ProjectManager) {}\n\n\tasync updateProject(\n\t\tparent: any,\n\t\targs: MutationUpdateProjectArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, args.projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_UPDATE,\n\t\t\tmessage: 'You are not allowed to update a project',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', args.projectSlug)\n\t\t}\n\t\tawait this.projectManager.updateProject(context.db, project.id, {\n\t\t\tname: args.name || undefined,\n\t\t\tconfig: args.config !== undefined ? Merger.merge(args.mergeConfig ? project.config : {}, args.config as any) : undefined,\n\t\t})\n\t\treturn { ok: true }\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","Merger"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAMO,MAAM,8BAA2D;AAAA,EACvE,YAA6B,gBAAgC;AAAhC,SAAA,iBAAA;AAAA,EAAiC;AAAA,EAE9D,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,KAAK,WAAW;AACvF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQA,kBAAAA,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,yCAA8B,qBAAqB,KAAK,WAAW;AAAA,IAC3E;AACA,UAAM,KAAK,eAAe,cAAc,QAAQ,IAAI,QAAQ,IAAI;AAAA,MAC/D,MAAM,KAAK,QAAQ;AAAA,MACnB,QAAQ,KAAK,WAAW,SAAYC,aAAAA,OAAO,MAAM,KAAK,cAAc,QAAQ,SAAS,CAAA,GAAI,KAAK,MAAa,IAAI;AAAA,IAAA,CAC/G;AACD,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;;"}
+{"version":3,"file":"UpdateProjectMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/project/UpdateProjectMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationUpdateProjectArgs, UpdateProjectResponse } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { PermissionActions, ProjectManager } from '../../../model/index.js'\nimport { createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { Merger } from '@contember/config-loader'\nimport { ResponseOk } from '../../../model/utils/Response.js'\n\nexport class UpdateProjectMutationResolver implements MutationResolvers {\n\tconstructor(private readonly projectManager: ProjectManager) {}\n\n\tasync updateProject(\n\t\tparent: any,\n\t\targs: MutationUpdateProjectArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, args.projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_UPDATE,\n\t\t\tmessage: 'You are not allowed to update a project',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', args.projectSlug)\n\t\t}\n\t\tconst nameChange = args.name && args.name !== project.name ? { before: project.name, after: args.name } : undefined\n\t\tconst configChanged = args.config !== undefined\n\t\tawait this.projectManager.updateProject(context.db, project.id, {\n\t\t\tname: args.name || undefined,\n\t\t\tconfig: args.config !== undefined ? Merger.merge(args.mergeConfig ? project.config : {}, args.config as any) : undefined,\n\t\t})\n\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'project_update',\n\t\t\tresponse: new ResponseOk(null),\n\t\t\teventData: {\n\t\t\t\tslug: project.slug,\n\t\t\t\t...(nameChange ? { name: nameChange } : {}),\n\t\t\t\t...(configChanged ? { configChanged: true, mergeConfig: args.mergeConfig ?? false } : {}),\n\t\t\t},\n\t\t})\n\n\t\treturn { ok: true }\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","Merger","ResponseOk"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAOO,MAAM,8BAA2D;AAAA,EACvE,YAA6B,gBAAgC;AAAhC,SAAA,iBAAA;AAAA,EAAiC;AAAA,EAE9D,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,KAAK,WAAW;AACvF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQA,kBAAAA,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,yCAA8B,qBAAqB,KAAK,WAAW;AAAA,IAC3E;AACA,UAAM,aAAa,KAAK,QAAQ,KAAK,SAAS,QAAQ,OAAO,EAAE,QAAQ,QAAQ,MAAM,OAAO,KAAK,SAAS;AAC1G,UAAM,gBAAgB,KAAK,WAAW;AACtC,UAAM,KAAK,eAAe,cAAc,QAAQ,IAAI,QAAQ,IAAI;AAAA,MAC/D,MAAM,KAAK,QAAQ;AAAA,MACnB,QAAQ,KAAK,WAAW,SAAYC,aAAAA,OAAO,MAAM,KAAK,cAAc,QAAQ,SAAS,CAAA,GAAI,KAAK,MAAa,IAAI;AAAA,IAAA,CAC/G;AAED,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU,IAAIC,SAAAA,WAAW,IAAI;AAAA,MAC7B,WAAW;AAAA,QACV,MAAM,QAAQ;AAAA,QACd,GAAI,aAAa,EAAE,MAAM,WAAA,IAAe,CAAA;AAAA,QACxC,GAAI,gBAAgB,EAAE,eAAe,MAAM,aAAa,KAAK,eAAe,UAAU,CAAA;AAAA,MAAC;AAAA,IACxF,CACA;AAED,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;;"}

package/dist/development/src/resolvers/mutation/project/UpdateProjectMutationResolver.js

@@ -6,12 +6,15 @@ import "@contember/schema";
 import "../../../model/type/ApiKey.js";
 import "@contember/database";
 import "node:crypto";
+import { ResponseOk } from "../../../model/utils/Response.js";
 import "../../../model/queries/apiKey/ApiKeyQuery.js";
 import "node:assert";
+import "../../../model/service/idp/IDPRevalidation.js";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
 import "../../../model/service/idp/providers/OIDCTypes.js";
+import "jose";
 import "../../../model/service/idp/providers/FacebookProvider.js";
 import "../../../model/service/AuthLogService.js";
 import "@contember/schema-utils";
@@ -32,10 +35,21 @@ class UpdateProjectMutationResolver {
     if (!project) {
       return createProjectNotFoundResponse("PROJECT_NOT_FOUND", args.projectSlug);
     }
+    const nameChange = args.name && args.name !== project.name ? { before: project.name, after: args.name } : void 0;
+    const configChanged = args.config !== void 0;
     await this.projectManager.updateProject(context.db, project.id, {
       name: args.name || void 0,
       config: args.config !== void 0 ? Merger.merge(args.mergeConfig ? project.config : {}, args.config) : void 0
     });
+    await context.logAuthAction({
+      type: "project_update",
+      response: new ResponseOk(null),
+      eventData: {
+        slug: project.slug,
+        ...nameChange ? { name: nameChange } : {},
+        ...configChanged ? { configChanged: true, mergeConfig: args.mergeConfig ?? false } : {}
+      }
+    });
     return { ok: true };
   }
 }

package/dist/development/src/resolvers/mutation/project/UpdateProjectMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateProjectMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/project/UpdateProjectMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationUpdateProjectArgs, UpdateProjectResponse } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { PermissionActions, ProjectManager } from '../../../model'\nimport { createProjectNotFoundResponse } from '../../errorUtils'\nimport { Merger } from '@contember/config-loader'\n\nexport class UpdateProjectMutationResolver implements MutationResolvers {\n\tconstructor(private readonly projectManager: ProjectManager) {}\n\n\tasync updateProject(\n\t\tparent: any,\n\t\targs: MutationUpdateProjectArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, args.projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_UPDATE,\n\t\t\tmessage: 'You are not allowed to update a project',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', args.projectSlug)\n\t\t}\n\t\tawait this.projectManager.updateProject(context.db, project.id, {\n\t\t\tname: args.name || undefined,\n\t\t\tconfig: args.config !== undefined ? Merger.merge(args.mergeConfig ? project.config : {}, args.config as any) : undefined,\n\t\t})\n\t\treturn { ok: true }\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAMO,MAAM,8BAA2D;AAAA,EACvE,YAA6B,gBAAgC;AAAhC,SAAA,iBAAA;AAAA,EAAiC;AAAA,EAE9D,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,KAAK,WAAW;AACvF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,KAAK,WAAW;AAAA,IAC3E;AACA,UAAM,KAAK,eAAe,cAAc,QAAQ,IAAI,QAAQ,IAAI;AAAA,MAC/D,MAAM,KAAK,QAAQ;AAAA,MACnB,QAAQ,KAAK,WAAW,SAAY,OAAO,MAAM,KAAK,cAAc,QAAQ,SAAS,CAAA,GAAI,KAAK,MAAa,IAAI;AAAA,IAAA,CAC/G;AACD,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;"}
+{"version":3,"file":"UpdateProjectMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/project/UpdateProjectMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationUpdateProjectArgs, UpdateProjectResponse } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { PermissionActions, ProjectManager } from '../../../model/index.js'\nimport { createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { Merger } from '@contember/config-loader'\nimport { ResponseOk } from '../../../model/utils/Response.js'\n\nexport class UpdateProjectMutationResolver implements MutationResolvers {\n\tconstructor(private readonly projectManager: ProjectManager) {}\n\n\tasync updateProject(\n\t\tparent: any,\n\t\targs: MutationUpdateProjectArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, args.projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_UPDATE,\n\t\t\tmessage: 'You are not allowed to update a project',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', args.projectSlug)\n\t\t}\n\t\tconst nameChange = args.name && args.name !== project.name ? { before: project.name, after: args.name } : undefined\n\t\tconst configChanged = args.config !== undefined\n\t\tawait this.projectManager.updateProject(context.db, project.id, {\n\t\t\tname: args.name || undefined,\n\t\t\tconfig: args.config !== undefined ? Merger.merge(args.mergeConfig ? project.config : {}, args.config as any) : undefined,\n\t\t})\n\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'project_update',\n\t\t\tresponse: new ResponseOk(null),\n\t\t\teventData: {\n\t\t\t\tslug: project.slug,\n\t\t\t\t...(nameChange ? { name: nameChange } : {}),\n\t\t\t\t...(configChanged ? { configChanged: true, mergeConfig: args.mergeConfig ?? false } : {}),\n\t\t\t},\n\t\t})\n\n\t\treturn { ok: true }\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAOO,MAAM,8BAA2D;AAAA,EACvE,YAA6B,gBAAgC;AAAhC,SAAA,iBAAA;AAAA,EAAiC;AAAA,EAE9D,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,KAAK,WAAW;AACvF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,KAAK,WAAW;AAAA,IAC3E;AACA,UAAM,aAAa,KAAK,QAAQ,KAAK,SAAS,QAAQ,OAAO,EAAE,QAAQ,QAAQ,MAAM,OAAO,KAAK,SAAS;AAC1G,UAAM,gBAAgB,KAAK,WAAW;AACtC,UAAM,KAAK,eAAe,cAAc,QAAQ,IAAI,QAAQ,IAAI;AAAA,MAC/D,MAAM,KAAK,QAAQ;AAAA,MACnB,QAAQ,KAAK,WAAW,SAAY,OAAO,MAAM,KAAK,cAAc,QAAQ,SAAS,CAAA,GAAI,KAAK,MAAa,IAAI;AAAA,IAAA,CAC/G;AAED,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU,IAAI,WAAW,IAAI;AAAA,MAC7B,WAAW;AAAA,QACV,MAAM,QAAQ;AAAA,QACd,GAAI,aAAa,EAAE,MAAM,WAAA,IAAe,CAAA;AAAA,QACxC,GAAI,gBAAgB,EAAE,eAAe,MAAM,aAAa,KAAK,eAAe,UAAU,CAAA;AAAA,MAAC;AAAA,IACxF,CACA;AAED,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;"}

package/dist/development/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.cjs

@@ -10,16 +10,19 @@ require("@contember/database");
 require("node:crypto");
 require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
 require("node:assert");
+require("../../../model/service/idp/IDPRevalidation.cjs");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
 require("../../../model/service/idp/providers/OIDCTypes.cjs");
+require("jose");
 require("../../../model/service/idp/providers/FacebookProvider.cjs");
 require("../../../model/service/AuthLogService.cjs");
 require("@contember/schema-utils");
 require("otpauth");
 const membershipUtils = require("../../membershipUtils.cjs");
 const errorUtils = require("../../errorUtils.cjs");
+const audit = require("./audit.cjs");
 class AddProjectMemberMutationResolver {
   constructor(projectMemberManager, projectManager, membershipValidator) {
     this.projectMemberManager = projectMemberManager;
@@ -49,6 +52,7 @@ class AddProjectMemberMutationResolver {
     if (!result.ok) {
       return errorUtils.createErrorResponse(result.error, result.errorMessage);
     }
+    await audit.logProjectMembershipChange(context, "project_membership_create", project.id, identityId, []);
     return {
       ok: true,
       errors: []

package/dist/development/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"AddProjectMemberMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.ts"],"sourcesContent":["import { AddProjectMemberErrorCode, AddProjectMemberResponse, MutationAddProjectMemberArgs, MutationResolvers } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'\n\nexport class AddProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync addProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationAddProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<AddProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_ADD_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to add a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst validationResult = await this.membershipValidator.validate(project.slug, memberships)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst result = await this.projectMemberManager.addProjectMember(context.db, project.id, identityId, memberships)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","createMembershipValidationErrorResult","createErrorResponse"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAMO,MAAM,iCAA8D;AAAA,EAC1E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,iBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACoC;AACpC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQA,kBAAAA,kBAAkB,mBAAmB,WAAW;AAAA,MACxD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,WAAAA,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,mBAAmB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW;AAC1F,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAASC,gBAAAA,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,KAAK,qBAAqB,iBAAiB,QAAQ,IAAI,QAAQ,IAAI,YAAY,WAAW;AAE/G,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;;"}
+{"version":3,"file":"AddProjectMemberMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.ts"],"sourcesContent":["import { AddProjectMemberErrorCode, AddProjectMemberResponse, MutationAddProjectMemberArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model/index.js'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { logProjectMembershipChange } from './audit.js'\n\nexport class AddProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync addProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationAddProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<AddProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_ADD_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to add a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst validationResult = await this.membershipValidator.validate(project.slug, memberships)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst result = await this.projectMemberManager.addProjectMember(context.db, project.id, identityId, memberships)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\tawait logProjectMembershipChange(context, 'project_membership_create', project.id, identityId, [])\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","createMembershipValidationErrorResult","createErrorResponse","logProjectMembershipChange"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAOO,MAAM,iCAA8D;AAAA,EAC1E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,iBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACoC;AACpC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQA,kBAAAA,kBAAkB,mBAAmB,WAAW;AAAA,MACxD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,WAAAA,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,mBAAmB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW;AAC1F,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAASC,gBAAAA,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,KAAK,qBAAqB,iBAAiB,QAAQ,IAAI,QAAQ,IAAI,YAAY,WAAW;AAE/G,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,UAAMC,MAAAA,2BAA2B,SAAS,6BAA6B,QAAQ,IAAI,YAAY,EAAE;AAEjG,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;;"}

package/dist/development/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.js

@@ -8,16 +8,19 @@ import "@contember/database";
 import "node:crypto";
 import "../../../model/queries/apiKey/ApiKeyQuery.js";
 import "node:assert";
+import "../../../model/service/idp/IDPRevalidation.js";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
 import "../../../model/service/idp/providers/OIDCTypes.js";
+import "jose";
 import "../../../model/service/idp/providers/FacebookProvider.js";
 import "../../../model/service/AuthLogService.js";
 import "@contember/schema-utils";
 import "otpauth";
 import { createMembershipValidationErrorResult } from "../../membershipUtils.js";
 import { createProjectNotFoundResponse, createErrorResponse } from "../../errorUtils.js";
+import { logProjectMembershipChange } from "./audit.js";
 class AddProjectMemberMutationResolver {
   constructor(projectMemberManager, projectManager, membershipValidator) {
     this.projectMemberManager = projectMemberManager;
@@ -47,6 +50,7 @@ class AddProjectMemberMutationResolver {
     if (!result.ok) {
       return createErrorResponse(result.error, result.errorMessage);
     }
+    await logProjectMembershipChange(context, "project_membership_create", project.id, identityId, []);
     return {
       ok: true,
       errors: []

package/dist/development/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"AddProjectMemberMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.ts"],"sourcesContent":["import { AddProjectMemberErrorCode, AddProjectMemberResponse, MutationAddProjectMemberArgs, MutationResolvers } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'\n\nexport class AddProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync addProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationAddProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<AddProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_ADD_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to add a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst validationResult = await this.membershipValidator.validate(project.slug, memberships)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst result = await this.projectMemberManager.addProjectMember(context.db, project.id, identityId, memberships)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAMO,MAAM,iCAA8D;AAAA,EAC1E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,iBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACoC;AACpC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQ,kBAAkB,mBAAmB,WAAW;AAAA,MACxD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,mBAAmB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW;AAC1F,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAAS,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,KAAK,qBAAqB,iBAAiB,QAAQ,IAAI,QAAQ,IAAI,YAAY,WAAW;AAE/G,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;"}
+{"version":3,"file":"AddProjectMemberMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/AddProjectMemberMutationResolver.ts"],"sourcesContent":["import { AddProjectMemberErrorCode, AddProjectMemberResponse, MutationAddProjectMemberArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model/index.js'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { logProjectMembershipChange } from './audit.js'\n\nexport class AddProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync addProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationAddProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<AddProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tawait context.requireAccess({\n\t\t\tscope: await context.permissionContext.createProjectScope(project),\n\t\t\taction: PermissionActions.PROJECT_ADD_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to add a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst validationResult = await this.membershipValidator.validate(project.slug, memberships)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst result = await this.projectMemberManager.addProjectMember(context.db, project.id, identityId, memberships)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\tawait logProjectMembershipChange(context, 'project_membership_create', project.id, identityId, [])\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAOO,MAAM,iCAA8D;AAAA,EAC1E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,iBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACoC;AACpC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAAA,MACjE,QAAQ,kBAAkB,mBAAmB,WAAW;AAAA,MACxD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,mBAAmB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW;AAC1F,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAAS,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,KAAK,qBAAqB,iBAAiB,QAAQ,IAAI,QAAQ,IAAI,YAAY,WAAW;AAE/G,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,UAAM,2BAA2B,SAAS,6BAA6B,QAAQ,IAAI,YAAY,EAAE;AAEjG,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;"}

package/dist/development/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.cjs

@@ -9,16 +9,20 @@ require("../../../model/type/ApiKey.cjs");
 require("@contember/database");
 require("node:crypto");
 require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+const ProjectMembershipByIdentityQuery = require("../../../model/queries/membership/ProjectMembershipByIdentityQuery.cjs");
 require("node:assert");
+require("../../../model/service/idp/IDPRevalidation.cjs");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
 require("../../../model/service/idp/providers/OIDCTypes.cjs");
+require("jose");
 require("../../../model/service/idp/providers/FacebookProvider.cjs");
 require("../../../model/service/AuthLogService.cjs");
 require("@contember/schema-utils");
 require("otpauth");
 const errorUtils = require("../../errorUtils.cjs");
+const audit = require("./audit.cjs");
 class RemoveProjectMemberMutationResolver {
   constructor(projectMemberManager, projectManager) {
     this.projectMemberManager = projectMemberManager;
@@ -46,10 +50,12 @@ class RemoveProjectMemberMutationResolver {
       action: PermissionActions.PermissionActions.PROJECT_REMOVE_MEMBER(memberships),
       message: "You are not allowed to remove a project member"
     });
+    const before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery.ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]));
     const result = await this.projectMemberManager.removeProjectMember(context.db, project.id, identityId);
     if (!result.ok) {
       return errorUtils.createErrorResponse(result.error, result.errorMessage);
     }
+    await audit.logProjectMembershipChange(context, "project_membership_remove", project.id, identityId, before);
     return {
       ok: true,
       errors: []

package/dist/development/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RemoveProjectMemberMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.ts"],"sourcesContent":["import { MutationRemoveProjectMemberArgs, MutationResolvers, RemoveProjectMemberErrorCode, RemoveProjectMemberResponse } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'\n\nexport class RemoveProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t) {}\n\n\tasync removeProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId }: MutationRemoveProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<RemoveProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst memberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\n\t\tconst result = await this.projectMemberManager.removeProjectMember(context.db, project.id, identityId)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","createErrorResponse"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAKO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBAChB;AAFgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,WAAA,GACf,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQA,kBAAAA,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,WAAAA,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,cAAc,MAAM,KAAK,qBAAqB;AAAA,MACnD,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQD,kBAAAA,kBAAkB,sBAAsB,WAAW;AAAA,MAC3D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,UAAU;AAErG,QAAI,CAAC,OAAO,IAAI;AACf,aAAOE,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;;"}
+{"version":3,"file":"RemoveProjectMemberMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.ts"],"sourcesContent":["import {\n\tMutationRemoveProjectMemberArgs,\n\tMutationResolvers,\n\tRemoveProjectMemberErrorCode,\n\tRemoveProjectMemberResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model/index.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { ProjectMembershipByIdentityQuery } from '../../../model/queries/index.js'\nimport { logProjectMembershipChange } from './audit.js'\n\nexport class RemoveProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t) {}\n\n\tasync removeProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId }: MutationRemoveProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<RemoveProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst memberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\n\t\tconst before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]))\n\t\tconst result = await this.projectMemberManager.removeProjectMember(context.db, project.id, identityId)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\tawait logProjectMembershipChange(context, 'project_membership_remove', project.id, identityId, before)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","ProjectMembershipByIdentityQuery","createErrorResponse","logProjectMembershipChange"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAYO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBAChB;AAFgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,WAAA,GACf,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQA,kBAAAA,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,WAAAA,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,cAAc,MAAM,KAAK,qBAAqB;AAAA,MACnD,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQD,kBAAAA,kBAAkB,sBAAsB,WAAW;AAAA,MAC3D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAIE,iCAAAA,iCAAiC,EAAE,IAAI,QAAQ,GAAA,GAAM,CAAC,UAAU,CAAC,CAAC;AACzH,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,UAAU;AAErG,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,UAAMC,MAAAA,2BAA2B,SAAS,6BAA6B,QAAQ,IAAI,YAAY,MAAM;AAErG,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;;"}

package/dist/development/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.js

@@ -7,16 +7,20 @@ import "../../../model/type/ApiKey.js";
 import "@contember/database";
 import "node:crypto";
 import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import { ProjectMembershipByIdentityQuery } from "../../../model/queries/membership/ProjectMembershipByIdentityQuery.js";
 import "node:assert";
+import "../../../model/service/idp/IDPRevalidation.js";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
 import "../../../model/service/idp/providers/OIDCTypes.js";
+import "jose";
 import "../../../model/service/idp/providers/FacebookProvider.js";
 import "../../../model/service/AuthLogService.js";
 import "@contember/schema-utils";
 import "otpauth";
 import { createProjectNotFoundResponse, createErrorResponse } from "../../errorUtils.js";
+import { logProjectMembershipChange } from "./audit.js";
 class RemoveProjectMemberMutationResolver {
   constructor(projectMemberManager, projectManager) {
     this.projectMemberManager = projectMemberManager;
@@ -44,10 +48,12 @@ class RemoveProjectMemberMutationResolver {
       action: PermissionActions.PROJECT_REMOVE_MEMBER(memberships),
       message: "You are not allowed to remove a project member"
     });
+    const before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]));
     const result = await this.projectMemberManager.removeProjectMember(context.db, project.id, identityId);
     if (!result.ok) {
       return createErrorResponse(result.error, result.errorMessage);
     }
+    await logProjectMembershipChange(context, "project_membership_remove", project.id, identityId, before);
     return {
       ok: true,
       errors: []

package/dist/development/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"RemoveProjectMemberMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.ts"],"sourcesContent":["import { MutationRemoveProjectMemberArgs, MutationResolvers, RemoveProjectMemberErrorCode, RemoveProjectMemberResponse } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'\n\nexport class RemoveProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t) {}\n\n\tasync removeProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId }: MutationRemoveProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<RemoveProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst memberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\n\t\tconst result = await this.projectMemberManager.removeProjectMember(context.db, project.id, identityId)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAKO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBAChB;AAFgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,WAAA,GACf,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,cAAc,MAAM,KAAK,qBAAqB;AAAA,MACnD,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,WAAW;AAAA,MAC3D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,UAAU;AAErG,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;"}
+{"version":3,"file":"RemoveProjectMemberMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/RemoveProjectMemberMutationResolver.ts"],"sourcesContent":["import {\n\tMutationRemoveProjectMemberArgs,\n\tMutationResolvers,\n\tRemoveProjectMemberErrorCode,\n\tRemoveProjectMemberResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model/index.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { ProjectMembershipByIdentityQuery } from '../../../model/queries/index.js'\nimport { logProjectMembershipChange } from './audit.js'\n\nexport class RemoveProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t) {}\n\n\tasync removeProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId }: MutationRemoveProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<RemoveProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst memberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_REMOVE_MEMBER(memberships),\n\t\t\tmessage: 'You are not allowed to remove a project member',\n\t\t})\n\n\t\tconst before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]))\n\t\tconst result = await this.projectMemberManager.removeProjectMember(context.db, project.id, identityId)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\tawait logProjectMembershipChange(context, 'project_membership_remove', project.id, identityId, before)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAYO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBAChB;AAFgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,WAAA,GACf,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,cAAc,MAAM,KAAK,qBAAqB;AAAA,MACnD,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,WAAW;AAAA,MAC3D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,iCAAiC,EAAE,IAAI,QAAQ,GAAA,GAAM,CAAC,UAAU,CAAC,CAAC;AACzH,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,UAAU;AAErG,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,UAAM,2BAA2B,SAAS,6BAA6B,QAAQ,IAAI,YAAY,MAAM;AAErG,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;"}

package/dist/development/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.cjs

@@ -9,18 +9,22 @@ require("../../../model/type/ApiKey.cjs");
 require("@contember/database");
 require("node:crypto");
 require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+const ProjectMembershipByIdentityQuery = require("../../../model/queries/membership/ProjectMembershipByIdentityQuery.cjs");
 require("node:assert");
 const membershipUtils = require("../../../model/service/membershipUtils.cjs");
+require("../../../model/service/idp/IDPRevalidation.cjs");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
 require("../../../model/service/idp/providers/OIDCTypes.cjs");
+require("jose");
 require("../../../model/service/idp/providers/FacebookProvider.cjs");
 require("../../../model/service/AuthLogService.cjs");
 const schemaUtils = require("@contember/schema-utils");
 require("otpauth");
 const membershipUtils$1 = require("../../membershipUtils.cjs");
 const errorUtils = require("../../errorUtils.cjs");
+const audit = require("./audit.cjs");
 class UpdateProjectMemberMutationResolver {
   constructor(projectMemberManager, projectManager, membershipValidator) {
     this.projectMemberManager = projectMemberManager;
@@ -68,10 +72,12 @@ class UpdateProjectMemberMutationResolver {
         error: errors[0]
       };
     }
+    const before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery.ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]));
     const result = await this.projectMemberManager.updateProjectMember(context.db, project.id, identityId, membershipPatch);
     if (!result.ok) {
       return errorUtils.createErrorResponse(result.error, result.errorMessage);
     }
+    await audit.logProjectMembershipChange(context, "project_membership_update", project.id, identityId, before);
     return {
       ok: true,
       errors: []

package/dist/development/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateProjectMemberMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationUpdateProjectMemberArgs, UpdateProjectMemberErrorCode, UpdateProjectMemberResponse } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { MembershipValidationErrorType, MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils'\nimport { createMembershipModification } from '../../../model/service/membershipUtils'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'\nimport { Acl } from '@contember/schema'\n\nexport class UpdateProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync updateProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationUpdateProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst visibleMemberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tconst membershipPatch = createMembershipModification(visibleMemberships, memberships)\n\n\t\tconst aclMemberships: Acl.Membership[] = membershipPatch.map(it => ({\n\t\t\trole: it.role,\n\t\t\tvariables: it.variables.map(it => ({\n\t\t\t\tname: it.name,\n\t\t\t\tvalues: 'set' in it ? it.set : [...it.remove, ...it.append],\n\t\t\t})),\n\t\t}))\n\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER(aclMemberships),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\n\t\tconst validationResult = (await this.membershipValidator.validate(project.slug, memberships)).filter(\n\t\t\tit => it.error !== MembershipValidationErrorType.VARIABLE_EMPTY,\n\t\t)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst result = await this.projectMemberManager.updateProjectMember(context.db, project.id, identityId, membershipPatch)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","createMembershipModification","it","MembershipValidationErrorType","createMembershipValidationErrorResult","createErrorResponse"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAQO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQA,kBAAAA,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,WAAAA,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,qBAAqB,MAAM,KAAK,qBAAqB;AAAA,MAC1D,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,kBAAkBC,gBAAAA,6BAA6B,oBAAoB,WAAW;AAEpF,UAAM,iBAAmC,gBAAgB,IAAI,CAAA,QAAO;AAAA,MACnE,MAAM,GAAG;AAAA,MACT,WAAW,GAAG,UAAU,IAAI,CAAAC,SAAO;AAAA,QAClC,MAAMA,IAAG;AAAA,QACT,QAAQ,SAASA,MAAKA,IAAG,MAAM,CAAC,GAAGA,IAAG,QAAQ,GAAGA,IAAG,MAAM;AAAA,MAAA,EACzD;AAAA,IAAA,EACD;AAEF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQH,kBAAAA,kBAAkB,sBAAsB,cAAc;AAAA,MAC9D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,oBAAoB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC7F,CAAA,OAAM,GAAG,UAAUI,0CAA8B;AAAA,IAAA;AAElD,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAASC,kBAAAA,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,YAAY,eAAe;AAEtH,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;;"}
+{"version":3,"file":"UpdateProjectMemberMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.ts"],"sourcesContent":["import {\n\tMutationResolvers,\n\tMutationUpdateProjectMemberArgs,\n\tUpdateProjectMemberErrorCode,\n\tUpdateProjectMemberResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { MembershipValidationErrorType, MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model/index.js'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils.js'\nimport { createMembershipModification } from '../../../model/service/membershipUtils.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { Acl } from '@contember/schema'\nimport { ProjectMembershipByIdentityQuery } from '../../../model/queries/index.js'\nimport { logProjectMembershipChange } from './audit.js'\n\nexport class UpdateProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync updateProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationUpdateProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst visibleMemberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tconst membershipPatch = createMembershipModification(visibleMemberships, memberships)\n\n\t\tconst aclMemberships: Acl.Membership[] = membershipPatch.map(it => ({\n\t\t\trole: it.role,\n\t\t\tvariables: it.variables.map(it => ({\n\t\t\t\tname: it.name,\n\t\t\t\tvalues: 'set' in it ? it.set : [...it.remove, ...it.append],\n\t\t\t})),\n\t\t}))\n\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER(aclMemberships),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\n\t\tconst validationResult = (await this.membershipValidator.validate(project.slug, memberships)).filter(\n\t\t\tit => it.error !== MembershipValidationErrorType.VARIABLE_EMPTY,\n\t\t)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]))\n\t\tconst result = await this.projectMemberManager.updateProjectMember(context.db, project.id, identityId, membershipPatch)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\tawait logProjectMembershipChange(context, 'project_membership_update', project.id, identityId, before)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createProjectNotFoundResponse","createMembershipModification","it","MembershipValidationErrorType","createMembershipValidationErrorResult","ProjectMembershipByIdentityQuery","createErrorResponse","logProjectMembershipChange"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAeO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQA,kBAAAA,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAOC,WAAAA,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,qBAAqB,MAAM,KAAK,qBAAqB;AAAA,MAC1D,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,kBAAkBC,gBAAAA,6BAA6B,oBAAoB,WAAW;AAEpF,UAAM,iBAAmC,gBAAgB,IAAI,CAAA,QAAO;AAAA,MACnE,MAAM,GAAG;AAAA,MACT,WAAW,GAAG,UAAU,IAAI,CAAAC,SAAO;AAAA,QAClC,MAAMA,IAAG;AAAA,QACT,QAAQ,SAASA,MAAKA,IAAG,MAAM,CAAC,GAAGA,IAAG,QAAQ,GAAGA,IAAG,MAAM;AAAA,MAAA,EACzD;AAAA,IAAA,EACD;AAEF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQH,kBAAAA,kBAAkB,sBAAsB,cAAc;AAAA,MAC9D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,oBAAoB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC7F,CAAA,OAAM,GAAG,UAAUI,0CAA8B;AAAA,IAAA;AAElD,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAASC,kBAAAA,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAIC,iCAAAA,iCAAiC,EAAE,IAAI,QAAQ,GAAA,GAAM,CAAC,UAAU,CAAC,CAAC;AACzH,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,YAAY,eAAe;AAEtH,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,UAAMC,MAAAA,2BAA2B,SAAS,6BAA6B,QAAQ,IAAI,YAAY,MAAM;AAErG,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;;"}

package/dist/development/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.js

@@ -7,18 +7,22 @@ import "../../../model/type/ApiKey.js";
 import "@contember/database";
 import "node:crypto";
 import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import { ProjectMembershipByIdentityQuery } from "../../../model/queries/membership/ProjectMembershipByIdentityQuery.js";
 import "node:assert";
 import { createMembershipModification } from "../../../model/service/membershipUtils.js";
+import "../../../model/service/idp/IDPRevalidation.js";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
 import "../../../model/service/idp/providers/OIDCTypes.js";
+import "jose";
 import "../../../model/service/idp/providers/FacebookProvider.js";
 import "../../../model/service/AuthLogService.js";
 import { MembershipValidationErrorType } from "@contember/schema-utils";
 import "otpauth";
 import { createMembershipValidationErrorResult } from "../../membershipUtils.js";
 import { createProjectNotFoundResponse, createErrorResponse } from "../../errorUtils.js";
+import { logProjectMembershipChange } from "./audit.js";
 class UpdateProjectMemberMutationResolver {
   constructor(projectMemberManager, projectManager, membershipValidator) {
     this.projectMemberManager = projectMemberManager;
@@ -66,10 +70,12 @@ class UpdateProjectMemberMutationResolver {
         error: errors[0]
       };
     }
+    const before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]));
     const result = await this.projectMemberManager.updateProjectMember(context.db, project.id, identityId, membershipPatch);
     if (!result.ok) {
       return createErrorResponse(result.error, result.errorMessage);
     }
+    await logProjectMembershipChange(context, "project_membership_update", project.id, identityId, before);
     return {
       ok: true,
       errors: []

package/dist/development/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateProjectMemberMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationUpdateProjectMemberArgs, UpdateProjectMemberErrorCode, UpdateProjectMemberResponse } from '../../../schema'\nimport { TenantResolverContext } from '../../TenantResolverContext'\nimport { MembershipValidationErrorType, MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils'\nimport { createMembershipModification } from '../../../model/service/membershipUtils'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'\nimport { Acl } from '@contember/schema'\n\nexport class UpdateProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync updateProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationUpdateProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst visibleMemberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tconst membershipPatch = createMembershipModification(visibleMemberships, memberships)\n\n\t\tconst aclMemberships: Acl.Membership[] = membershipPatch.map(it => ({\n\t\t\trole: it.role,\n\t\t\tvariables: it.variables.map(it => ({\n\t\t\t\tname: it.name,\n\t\t\t\tvalues: 'set' in it ? it.set : [...it.remove, ...it.append],\n\t\t\t})),\n\t\t}))\n\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER(aclMemberships),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\n\t\tconst validationResult = (await this.membershipValidator.validate(project.slug, memberships)).filter(\n\t\t\tit => it.error !== MembershipValidationErrorType.VARIABLE_EMPTY,\n\t\t)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst result = await this.projectMemberManager.updateProjectMember(context.db, project.id, identityId, membershipPatch)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["it"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAQO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,qBAAqB,MAAM,KAAK,qBAAqB;AAAA,MAC1D,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,kBAAkB,6BAA6B,oBAAoB,WAAW;AAEpF,UAAM,iBAAmC,gBAAgB,IAAI,CAAA,QAAO;AAAA,MACnE,MAAM,GAAG;AAAA,MACT,WAAW,GAAG,UAAU,IAAI,CAAAA,SAAO;AAAA,QAClC,MAAMA,IAAG;AAAA,QACT,QAAQ,SAASA,MAAKA,IAAG,MAAM,CAAC,GAAGA,IAAG,QAAQ,GAAGA,IAAG,MAAM;AAAA,MAAA,EACzD;AAAA,IAAA,EACD;AAEF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,cAAc;AAAA,MAC9D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,oBAAoB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC7F,CAAA,OAAM,GAAG,UAAU,8BAA8B;AAAA,IAAA;AAElD,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAAS,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,YAAY,eAAe;AAEtH,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;"}
+{"version":3,"file":"UpdateProjectMemberMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/UpdateProjectMemberMutationResolver.ts"],"sourcesContent":["import {\n\tMutationResolvers,\n\tMutationUpdateProjectMemberArgs,\n\tUpdateProjectMemberErrorCode,\n\tUpdateProjectMemberResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { MembershipValidationErrorType, MembershipValidator, PermissionActions, ProjectManager, ProjectMemberManager } from '../../../model/index.js'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils.js'\nimport { createMembershipModification } from '../../../model/service/membershipUtils.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { Acl } from '@contember/schema'\nimport { ProjectMembershipByIdentityQuery } from '../../../model/queries/index.js'\nimport { logProjectMembershipChange } from './audit.js'\n\nexport class UpdateProjectMemberMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly projectMemberManager: ProjectMemberManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync updateProjectMember(\n\t\tparent: any,\n\t\t{ projectSlug, identityId, memberships }: MutationUpdateProjectMemberArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<UpdateProjectMemberResponse> {\n\t\tconst project = await this.projectManager.getProjectBySlug(context.db, projectSlug)\n\t\tconst projectScope = await context.permissionContext.createProjectScope(project)\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER([]),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tconst visibleMemberships = await this.projectMemberManager.getStoredProjectsMemberships(\n\t\t\tcontext.db,\n\t\t\t{ id: project.id },\n\t\t\t{ id: identityId },\n\t\t\tcontext.permissionContext.createAccessVerifier(projectScope),\n\t\t)\n\t\tconst membershipPatch = createMembershipModification(visibleMemberships, memberships)\n\n\t\tconst aclMemberships: Acl.Membership[] = membershipPatch.map(it => ({\n\t\t\trole: it.role,\n\t\t\tvariables: it.variables.map(it => ({\n\t\t\t\tname: it.name,\n\t\t\t\tvalues: 'set' in it ? it.set : [...it.remove, ...it.append],\n\t\t\t})),\n\t\t}))\n\n\t\tawait context.requireAccess({\n\t\t\tscope: projectScope,\n\t\t\taction: PermissionActions.PROJECT_UPDATE_MEMBER(aclMemberships),\n\t\t\tmessage: 'You are not allowed to update project member variables',\n\t\t})\n\n\t\tconst validationResult = (await this.membershipValidator.validate(project.slug, memberships)).filter(\n\t\t\tit => it.error !== MembershipValidationErrorType.VARIABLE_EMPTY,\n\t\t)\n\t\tif (validationResult.length > 0) {\n\t\t\tconst errors = createMembershipValidationErrorResult(validationResult)\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terrors: errors,\n\t\t\t\terror: errors[0],\n\t\t\t}\n\t\t}\n\n\t\tconst before = await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: project.id }, [identityId]))\n\t\tconst result = await this.projectMemberManager.updateProjectMember(context.db, project.id, identityId, membershipPatch)\n\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\n\t\tawait logProjectMembershipChange(context, 'project_membership_update', project.id, identityId, before)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t}\n\t}\n}\n"],"names":["it"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAeO,MAAM,oCAAiE;AAAA,EAC7E,YACkB,sBACA,gBACA,qBAChB;AAHgB,SAAA,uBAAA;AACA,SAAA,iBAAA;AACA,SAAA,sBAAA;AAAA,EACf;AAAA,EAEH,MAAM,oBACL,QACA,EAAE,aAAa,YAAY,YAAA,GAC3B,SACuC;AACvC,UAAM,UAAU,MAAM,KAAK,eAAe,iBAAiB,QAAQ,IAAI,WAAW;AAClF,UAAM,eAAe,MAAM,QAAQ,kBAAkB,mBAAmB,OAAO;AAC/E,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,EAAE;AAAA,MAClD,SAAS;AAAA,IAAA,CACT;AACD,QAAI,CAAC,SAAS;AACb,aAAO,8BAA8B,qBAAqB,WAAW;AAAA,IACtE;AACA,UAAM,qBAAqB,MAAM,KAAK,qBAAqB;AAAA,MAC1D,QAAQ;AAAA,MACR,EAAE,IAAI,QAAQ,GAAA;AAAA,MACd,EAAE,IAAI,WAAA;AAAA,MACN,QAAQ,kBAAkB,qBAAqB,YAAY;AAAA,IAAA;AAE5D,UAAM,kBAAkB,6BAA6B,oBAAoB,WAAW;AAEpF,UAAM,iBAAmC,gBAAgB,IAAI,CAAA,QAAO;AAAA,MACnE,MAAM,GAAG;AAAA,MACT,WAAW,GAAG,UAAU,IAAI,CAAAA,SAAO;AAAA,QAClC,MAAMA,IAAG;AAAA,QACT,QAAQ,SAASA,MAAKA,IAAG,MAAM,CAAC,GAAGA,IAAG,QAAQ,GAAGA,IAAG,MAAM;AAAA,MAAA,EACzD;AAAA,IAAA,EACD;AAEF,UAAM,QAAQ,cAAc;AAAA,MAC3B,OAAO;AAAA,MACP,QAAQ,kBAAkB,sBAAsB,cAAc;AAAA,MAC9D,SAAS;AAAA,IAAA,CACT;AAED,UAAM,oBAAoB,MAAM,KAAK,oBAAoB,SAAS,QAAQ,MAAM,WAAW,GAAG;AAAA,MAC7F,CAAA,OAAM,GAAG,UAAU,8BAA8B;AAAA,IAAA;AAElD,QAAI,iBAAiB,SAAS,GAAG;AAChC,YAAM,SAAS,sCAAsC,gBAAgB;AACrE,aAAO;AAAA,QACN,IAAI;AAAA,QACJ;AAAA,QACA,OAAO,OAAO,CAAC;AAAA,MAAA;AAAA,IAEjB;AAEA,UAAM,SAAS,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,iCAAiC,EAAE,IAAI,QAAQ,GAAA,GAAM,CAAC,UAAU,CAAC,CAAC;AACzH,UAAM,SAAS,MAAM,KAAK,qBAAqB,oBAAoB,QAAQ,IAAI,QAAQ,IAAI,YAAY,eAAe;AAEtH,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,UAAM,2BAA2B,SAAS,6BAA6B,QAAQ,IAAI,YAAY,MAAM;AAErG,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,IAAC;AAAA,EAEX;AACD;"}

package/dist/development/src/resolvers/mutation/projectMember/audit.cjs

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+require("@contember/database");
+require("../../../model/type/ApiKey.cjs");
+const ProjectMembershipByIdentityQuery = require("../../../model/queries/membership/ProjectMembershipByIdentityQuery.cjs");
+const PersonByIdentityBatchQuery = require("../../../model/queries/person/PersonByIdentityBatchQuery.cjs");
+require("../../../model/authorization/PermissionActions.cjs");
+require("@contember/authorization");
+require("../../../model/authorization/PermissionContext.cjs");
+require("../../../model/authorization/PermissionsFactory.cjs");
+require("@contember/schema");
+const Response = require("../../../model/utils/Response.cjs");
+const logProjectMembershipChange = async (context, auditType, projectId, identityId, before) => {
+  const after = auditType === "project_membership_remove" ? [] : await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery.ProjectMembershipByIdentityQuery({ id: projectId }, [identityId]));
+  const [targetPerson] = await context.db.queryHandler.fetch(new PersonByIdentityBatchQuery.PersonByIdentityBatchQuery([identityId]));
+  await context.logAuthAction({
+    type: auditType,
+    response: new Response.ResponseOk(null),
+    targetPersonId: targetPerson?.id,
+    eventData: {
+      projectId,
+      identityId,
+      before: before.map(membershipToJson),
+      after: after.map(membershipToJson)
+    }
+  });
+};
+const membershipToJson = ({ role, variables }) => ({
+  role,
+  variables: variables.map(({ name, values }) => ({ name, values: [...values] }))
+});
+exports.logProjectMembershipChange = logProjectMembershipChange;
+//# sourceMappingURL=audit.cjs.map

package/dist/development/src/resolvers/mutation/projectMember/audit.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"audit.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/audit.ts"],"sourcesContent":["import { Acl, JSONValue } from '@contember/schema'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { ProjectMembershipByIdentityQuery } from '../../../model/queries/index.js'\nimport { PersonByIdentityBatchQuery } from '../../../model/queries/person/PersonByIdentityBatchQuery.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\nimport { AuthActionType } from '../../../model/type/AuthLog.js'\n\nexport const logProjectMembershipChange = async (\n\tcontext: TenantResolverContext,\n\tauditType: Extract<AuthActionType, 'project_membership_create' | 'project_membership_update' | 'project_membership_remove'>,\n\tprojectId: string,\n\tidentityId: string,\n\tbefore: readonly Acl.Membership[],\n): Promise<void> => {\n\tconst after = auditType === 'project_membership_remove'\n\t\t? []\n\t\t: await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: projectId }, [identityId]))\n\tconst [targetPerson] = await context.db.queryHandler.fetch(new PersonByIdentityBatchQuery([identityId]))\n\tawait context.logAuthAction({\n\t\ttype: auditType,\n\t\tresponse: new ResponseOk(null),\n\t\ttargetPersonId: targetPerson?.id,\n\t\teventData: {\n\t\t\tprojectId,\n\t\t\tidentityId,\n\t\t\tbefore: before.map(membershipToJson),\n\t\t\tafter: after.map(membershipToJson),\n\t\t},\n\t})\n}\n\nconst membershipToJson = ({ role, variables }: Acl.Membership): JSONValue => ({\n\trole,\n\tvariables: variables.map(({ name, values }) => ({ name, values: [...values] })),\n})\n"],"names":["ProjectMembershipByIdentityQuery","PersonByIdentityBatchQuery","ResponseOk"],"mappings":";;;;;;;;;;;;;AAOO,MAAM,6BAA6B,OACzC,SACA,WACA,WACA,YACA,WACmB;AACnB,QAAM,QAAQ,cAAc,8BACzB,CAAA,IACA,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAIA,iCAAAA,iCAAiC,EAAE,IAAI,UAAA,GAAa,CAAC,UAAU,CAAC,CAAC;AAC5G,QAAM,CAAC,YAAY,IAAI,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAIC,2BAAAA,2BAA2B,CAAC,UAAU,CAAC,CAAC;AACvG,QAAM,QAAQ,cAAc;AAAA,IAC3B,MAAM;AAAA,IACN,UAAU,IAAIC,SAAAA,WAAW,IAAI;AAAA,IAC7B,gBAAgB,cAAc;AAAA,IAC9B,WAAW;AAAA,MACV;AAAA,MACA;AAAA,MACA,QAAQ,OAAO,IAAI,gBAAgB;AAAA,MACnC,OAAO,MAAM,IAAI,gBAAgB;AAAA,IAAA;AAAA,EAClC,CACA;AACF;AAEA,MAAM,mBAAmB,CAAC,EAAE,MAAM,iBAA4C;AAAA,EAC7E;AAAA,EACA,WAAW,UAAU,IAAI,CAAC,EAAE,MAAM,cAAc,EAAE,MAAM,QAAQ,CAAC,GAAG,MAAM,IAAI;AAC/E;;"}

package/dist/development/src/resolvers/mutation/projectMember/audit.js

@@ -0,0 +1,34 @@
+import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import "@contember/database";
+import "../../../model/type/ApiKey.js";
+import { ProjectMembershipByIdentityQuery } from "../../../model/queries/membership/ProjectMembershipByIdentityQuery.js";
+import { PersonByIdentityBatchQuery } from "../../../model/queries/person/PersonByIdentityBatchQuery.js";
+import "../../../model/authorization/PermissionActions.js";
+import "@contember/authorization";
+import "../../../model/authorization/PermissionContext.js";
+import "../../../model/authorization/PermissionsFactory.js";
+import "@contember/schema";
+import { ResponseOk } from "../../../model/utils/Response.js";
+const logProjectMembershipChange = async (context, auditType, projectId, identityId, before) => {
+  const after = auditType === "project_membership_remove" ? [] : await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: projectId }, [identityId]));
+  const [targetPerson] = await context.db.queryHandler.fetch(new PersonByIdentityBatchQuery([identityId]));
+  await context.logAuthAction({
+    type: auditType,
+    response: new ResponseOk(null),
+    targetPersonId: targetPerson?.id,
+    eventData: {
+      projectId,
+      identityId,
+      before: before.map(membershipToJson),
+      after: after.map(membershipToJson)
+    }
+  });
+};
+const membershipToJson = ({ role, variables }) => ({
+  role,
+  variables: variables.map(({ name, values }) => ({ name, values: [...values] }))
+});
+export {
+  logProjectMembershipChange
+};
+//# sourceMappingURL=audit.js.map

package/dist/development/src/resolvers/mutation/projectMember/audit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"audit.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/projectMember/audit.ts"],"sourcesContent":["import { Acl, JSONValue } from '@contember/schema'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { ProjectMembershipByIdentityQuery } from '../../../model/queries/index.js'\nimport { PersonByIdentityBatchQuery } from '../../../model/queries/person/PersonByIdentityBatchQuery.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\nimport { AuthActionType } from '../../../model/type/AuthLog.js'\n\nexport const logProjectMembershipChange = async (\n\tcontext: TenantResolverContext,\n\tauditType: Extract<AuthActionType, 'project_membership_create' | 'project_membership_update' | 'project_membership_remove'>,\n\tprojectId: string,\n\tidentityId: string,\n\tbefore: readonly Acl.Membership[],\n): Promise<void> => {\n\tconst after = auditType === 'project_membership_remove'\n\t\t? []\n\t\t: await context.db.queryHandler.fetch(new ProjectMembershipByIdentityQuery({ id: projectId }, [identityId]))\n\tconst [targetPerson] = await context.db.queryHandler.fetch(new PersonByIdentityBatchQuery([identityId]))\n\tawait context.logAuthAction({\n\t\ttype: auditType,\n\t\tresponse: new ResponseOk(null),\n\t\ttargetPersonId: targetPerson?.id,\n\t\teventData: {\n\t\t\tprojectId,\n\t\t\tidentityId,\n\t\t\tbefore: before.map(membershipToJson),\n\t\t\tafter: after.map(membershipToJson),\n\t\t},\n\t})\n}\n\nconst membershipToJson = ({ role, variables }: Acl.Membership): JSONValue => ({\n\trole,\n\tvariables: variables.map(({ name, values }) => ({ name, values: [...values] })),\n})\n"],"names":[],"mappings":";;;;;;;;;;;AAOO,MAAM,6BAA6B,OACzC,SACA,WACA,WACA,YACA,WACmB;AACnB,QAAM,QAAQ,cAAc,8BACzB,CAAA,IACA,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,iCAAiC,EAAE,IAAI,UAAA,GAAa,CAAC,UAAU,CAAC,CAAC;AAC5G,QAAM,CAAC,YAAY,IAAI,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,2BAA2B,CAAC,UAAU,CAAC,CAAC;AACvG,QAAM,QAAQ,cAAc;AAAA,IAC3B,MAAM;AAAA,IACN,UAAU,IAAI,WAAW,IAAI;AAAA,IAC7B,gBAAgB,cAAc;AAAA,IAC9B,WAAW;AAAA,MACV;AAAA,MACA;AAAA,MACA,QAAQ,OAAO,IAAI,gBAAgB;AAAA,MACnC,OAAO,MAAM,IAAI,gBAAgB;AAAA,IAAA;AAAA,EAClC,CACA;AACF;AAEA,MAAM,mBAAmB,CAAC,EAAE,MAAM,iBAA4C;AAAA,EAC7E;AAAA,EACA,WAAW,UAAU,IAAI,CAAC,EAAE,MAAM,cAAc,EAAE,MAAM,QAAQ,CAAC,GAAG,MAAM,IAAI;AAC/E;"}

package/dist/development/src/resolvers/query/ApiKeyQueryResolver.cjs

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const PermissionActions = require("../../model/authorization/PermissionActions.cjs");
+require("@contember/authorization");
+require("../../model/authorization/PermissionContext.cjs");
+require("../../model/authorization/PermissionsFactory.cjs");
+require("@contember/schema");
+require("../../model/type/ApiKey.cjs");
+require("@contember/database");
+require("node:crypto");
+require("../../model/queries/apiKey/ApiKeyQuery.cjs");
+const ApiKeyListQuery = require("../../model/queries/apiKey/ApiKeyListQuery.cjs");
+require("node:assert");
+require("../../model/service/idp/IDPRevalidation.cjs");
+require("../../model/service/idp/providers/AppleProvider.cjs");
+require("openid-client");
+require("@contember/typesafe");
+require("../../model/service/idp/providers/OIDCTypes.cjs");
+require("jose");
+require("../../model/service/idp/providers/FacebookProvider.cjs");
+require("../../model/service/AuthLogService.cjs");
+require("@contember/schema-utils");
+require("otpauth");
+const ApiKeyResponseFactory = require("../responseHelpers/ApiKeyResponseFactory.cjs");
+class ApiKeyQueryResolver {
+  async globalApiKeys(parent, args, context) {
+    if (!await context.isAllowed({ action: PermissionActions.PermissionActions.API_KEY_LIST })) {
+      return [];
+    }
+    const rows = await context.db.queryHandler.fetch(new ApiKeyListQuery.GlobalApiKeysQuery());
+    return rows.map((row) => ApiKeyResponseFactory.ApiKeyResponseFactory.createApiKeyResponse(row));
+  }
+}
+exports.ApiKeyQueryResolver = ApiKeyQueryResolver;
+//# sourceMappingURL=ApiKeyQueryResolver.cjs.map

package/dist/development/src/resolvers/query/ApiKeyQueryResolver.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"ApiKeyQueryResolver.cjs","sources":["../../../../../../packages/engine-tenant-api/src/resolvers/query/ApiKeyQueryResolver.ts"],"sourcesContent":["import { ApiKey, QueryResolvers } from '../../schema/index.js'\nimport { TenantResolverContext } from '../TenantResolverContext.js'\nimport { PermissionActions } from '../../model/index.js'\nimport { GlobalApiKeysQuery } from '../../model/queries/apiKey/index.js'\nimport { ApiKeyResponseFactory } from '../responseHelpers/ApiKeyResponseFactory.js'\n\nexport class ApiKeyQueryResolver implements QueryResolvers {\n\tasync globalApiKeys(parent: unknown, args: unknown, context: TenantResolverContext): Promise<readonly ApiKey[]> {\n\t\tif (!(await context.isAllowed({ action: PermissionActions.API_KEY_LIST }))) {\n\t\t\treturn []\n\t\t}\n\t\tconst rows = await context.db.queryHandler.fetch(new GlobalApiKeysQuery())\n\t\treturn rows.map(row => ApiKeyResponseFactory.createApiKeyResponse(row))\n\t}\n}\n"],"names":["PermissionActions","GlobalApiKeysQuery","ApiKeyResponseFactory"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAMO,MAAM,oBAA8C;AAAA,EAC1D,MAAM,cAAc,QAAiB,MAAe,SAA4D;AAC/G,QAAI,CAAE,MAAM,QAAQ,UAAU,EAAE,QAAQA,kBAAAA,kBAAkB,aAAA,CAAc,GAAI;AAC3E,aAAO,CAAA;AAAA,IACR;AACA,UAAM,OAAO,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAIC,gBAAAA,oBAAoB;AACzE,WAAO,KAAK,IAAI,CAAA,QAAOC,sBAAAA,sBAAsB,qBAAqB,GAAG,CAAC;AAAA,EACvE;AACD;;"}