@contember/engine-tenant-api 2.2.0-alpha.1 → 2.2.0-alpha.10

package/dist/development/src/resolvers/mutation/person/EmailVerificationMutationResolver.js

@@ -1,17 +1,20 @@
 import { PermissionActions } from "../../../model/authorization/PermissionActions.js";
 import "@contember/authorization";
+import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import "@contember/database";
+import "../../../model/type/ApiKey.js";
+import { ConfigurationQuery } from "../../../model/queries/configuration/ConfigurationQuery.js";
+import { PersonQuery } from "../../../model/queries/person/PersonQuery.js";
+import "../../../model/authorization/CustomRolePermissions.js";
 import "../../../model/authorization/PermissionContext.js";
-import "../../../model/authorization/PermissionsFactory.js";
+import "../../../model/authorization/TargetIdentityPermission.js";
 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 { ConfigurationQuery } from "../../../model/queries/configuration/ConfigurationQuery.js";
-import { PersonQuery } from "../../../model/queries/person/PersonQuery.js";
 import "node:assert";
 import "../../../model/service/idp/IDPRevalidation.js";
+import "../../../model/service/idp/ClaimMapping.js";
+import "@contember/schema-utils";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
@@ -19,7 +22,6 @@ 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 { createErrorResponse } from "../../errorUtils.js";
 class EmailVerificationMutationResolver {
@@ -55,7 +57,7 @@ class EmailVerificationMutationResolver {
       const permissionContext = await this.permissionContextFactory.create(context.db, {
         id: person.identity_id,
         roles: person.roles
-      });
+      }, context.permissionContext.authorizator);
       const sent = await this.emailVerificationManager.sendVerificationEmail(context.db, permissionContext, person, {
         mailVariant: args.options?.mailVariant || void 0,
         project: args.options?.mailProject || void 0

package/dist/development/src/resolvers/mutation/person/EmailVerificationMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"EmailVerificationMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/EmailVerificationMutationResolver.ts"],"sourcesContent":["import {\n\tMutationRequestEmailVerificationArgs,\n\tMutationResolvers,\n\tMutationVerifyEmailArgs,\n\tRequestEmailVerificationResponse,\n\tVerifyEmailResponse,\n} from '../../../schema/index.js'\nimport { GraphQLResolveInfo } from 'graphql'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport {\n\tCaptchaValidator,\n\tConfigurationQuery,\n\tEmailVerificationManager,\n\tPermissionActions,\n\tPermissionContextFactory,\n\tPersonQuery,\n\tRateLimiter,\n} from '../../../model/index.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\n\nexport class EmailVerificationMutationResolver implements Pick<MutationResolvers, 'requestEmailVerification' | 'verifyEmail'> {\n\tconstructor(\n\t\tprivate readonly emailVerificationManager: EmailVerificationManager,\n\t\tprivate readonly permissionContextFactory: PermissionContextFactory,\n\t\tprivate readonly captchaValidator: CaptchaValidator,\n\t\tprivate readonly rateLimiter: RateLimiter,\n\t) {}\n\n\tasync requestEmailVerification(\n\t\tparent: unknown,\n\t\targs: MutationRequestEmailVerificationArgs,\n\t\tcontext: TenantResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<RequestEmailVerificationResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_RESET_PASSWORD,\n\t\t\tmessage: 'You are not allowed to request e-mail verification',\n\t\t})\n\n\t\tconst configuration = await context.db.queryHandler.fetch(new ConfigurationQuery(context.db.providers))\n\n\t\t// Per-IP rate limit + captcha mirror createResetPasswordRequest: this is\n\t\t// an unauthenticated email-sending endpoint, so gate abuse before the\n\t\t// (always-ok) anti-enumeration response below can be used as a mail bomb.\n\t\tconst rl = await this.rateLimiter.consume(context.db, 'email_verification_per_ip', context.httpInfo.ip, configuration)\n\t\tif (!rl.ok) {\n\t\t\treturn createErrorResponse('RATE_LIMIT_EXCEEDED', `Too many e-mail verification requests. Retry after ${rl.retryAfterSeconds}s.`)\n\t\t}\n\n\t\tconst captchaConfig = this.captchaValidator.extractConfig(configuration)\n\t\tif (this.captchaValidator.isEnabledFor(captchaConfig, 'emailVerification')) {\n\t\t\tconst captcha = await this.captchaValidator.verify({\n\t\t\t\tconfig: captchaConfig,\n\t\t\t\ttoken: args.captchaToken ?? undefined,\n\t\t\t\tremoteIp: context.httpInfo.ip,\n\t\t\t})\n\t\t\tif (!captcha.ok) {\n\t\t\t\treturn createErrorResponse('INVALID_CAPTCHA', `Captcha verification failed: ${captcha.reason}`)\n\t\t\t}\n\t\t}\n\n\t\tconst person = await context.db.queryHandler.fetch(PersonQuery.byEmail(args.email))\n\t\t// Always report ok regardless of whether the address exists or is\n\t\t// already verified — same anti-enumeration stance as password reset.\n\t\tif (person?.email && person.email_verified_at === null) {\n\t\t\tconst permissionContext = await this.permissionContextFactory.create(context.db, {\n\t\t\t\tid: person.identity_id,\n\t\t\t\troles: person.roles,\n\t\t\t})\n\t\t\tconst sent = await this.emailVerificationManager.sendVerificationEmail(context.db, permissionContext, person, {\n\t\t\t\tmailVariant: args.options?.mailVariant || undefined,\n\t\t\t\tproject: args.options?.mailProject || undefined,\n\t\t\t})\n\t\t\tif (sent) {\n\t\t\t\tawait context.logAuthAction({\n\t\t\t\t\ttype: 'email_verify_init',\n\t\t\t\t\tresponse: new ResponseOk(null),\n\t\t\t\t\tpersonId: person.id,\n\t\t\t\t\tpersonInput: args.email,\n\t\t\t\t})\n\t\t\t}\n\t\t}\n\t\treturn { ok: true }\n\t}\n\n\tasync verifyEmail(\n\t\tparent: unknown,\n\t\targs: MutationVerifyEmailArgs,\n\t\tcontext: TenantResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<VerifyEmailResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_RESET_PASSWORD,\n\t\t\tmessage: 'You are not allowed to verify an e-mail address',\n\t\t})\n\n\t\tconst result = await this.emailVerificationManager.verifyEmail(context.db, args.token)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'email_verify_complete',\n\t\t\tresponse: result,\n\t\t})\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\t\treturn { ok: true }\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAqBO,MAAM,kCAAiH;AAAA,EAC7H,YACkB,0BACA,0BACA,kBACA,aAChB;AAJgB,SAAA,2BAAA;AACA,SAAA,2BAAA;AACA,SAAA,mBAAA;AACA,SAAA,cAAA;AAAA,EACf;AAAA,EAEH,MAAM,yBACL,QACA,MACA,SACA,MAC4C;AAC5C,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AAED,UAAM,gBAAgB,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,mBAAmB,QAAQ,GAAG,SAAS,CAAC;AAKtG,UAAM,KAAK,MAAM,KAAK,YAAY,QAAQ,QAAQ,IAAI,6BAA6B,QAAQ,SAAS,IAAI,aAAa;AACrH,QAAI,CAAC,GAAG,IAAI;AACX,aAAO,oBAAoB,uBAAuB,sDAAsD,GAAG,iBAAiB,IAAI;AAAA,IACjI;AAEA,UAAM,gBAAgB,KAAK,iBAAiB,cAAc,aAAa;AACvE,QAAI,KAAK,iBAAiB,aAAa,eAAe,mBAAmB,GAAG;AAC3E,YAAM,UAAU,MAAM,KAAK,iBAAiB,OAAO;AAAA,QAClD,QAAQ;AAAA,QACR,OAAO,KAAK,gBAAgB;AAAA,QAC5B,UAAU,QAAQ,SAAS;AAAA,MAAA,CAC3B;AACD,UAAI,CAAC,QAAQ,IAAI;AAChB,eAAO,oBAAoB,mBAAmB,gCAAgC,QAAQ,MAAM,EAAE;AAAA,MAC/F;AAAA,IACD;AAEA,UAAM,SAAS,MAAM,QAAQ,GAAG,aAAa,MAAM,YAAY,QAAQ,KAAK,KAAK,CAAC;AAGlF,QAAI,QAAQ,SAAS,OAAO,sBAAsB,MAAM;AACvD,YAAM,oBAAoB,MAAM,KAAK,yBAAyB,OAAO,QAAQ,IAAI;AAAA,QAChF,IAAI,OAAO;AAAA,QACX,OAAO,OAAO;AAAA,MAAA,CACd;AACD,YAAM,OAAO,MAAM,KAAK,yBAAyB,sBAAsB,QAAQ,IAAI,mBAAmB,QAAQ;AAAA,QAC7G,aAAa,KAAK,SAAS,eAAe;AAAA,QAC1C,SAAS,KAAK,SAAS,eAAe;AAAA,MAAA,CACtC;AACD,UAAI,MAAM;AACT,cAAM,QAAQ,cAAc;AAAA,UAC3B,MAAM;AAAA,UACN,UAAU,IAAI,WAAW,IAAI;AAAA,UAC7B,UAAU,OAAO;AAAA,UACjB,aAAa,KAAK;AAAA,QAAA,CAClB;AAAA,MACF;AAAA,IACD;AACA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AAAA,EAEA,MAAM,YACL,QACA,MACA,SACA,MAC+B;AAC/B,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,KAAK,yBAAyB,YAAY,QAAQ,IAAI,KAAK,KAAK;AACrF,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,IAAA,CACV;AACD,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;"}
+{"version":3,"file":"EmailVerificationMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/EmailVerificationMutationResolver.ts"],"sourcesContent":["import {\n\tMutationRequestEmailVerificationArgs,\n\tMutationResolvers,\n\tMutationVerifyEmailArgs,\n\tRequestEmailVerificationResponse,\n\tVerifyEmailResponse,\n} from '../../../schema/index.js'\nimport { GraphQLResolveInfo } from 'graphql'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport {\n\tCaptchaValidator,\n\tConfigurationQuery,\n\tEmailVerificationManager,\n\tPermissionActions,\n\tPermissionContextFactory,\n\tPersonQuery,\n\tRateLimiter,\n} from '../../../model/index.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\n\nexport class EmailVerificationMutationResolver implements Pick<MutationResolvers, 'requestEmailVerification' | 'verifyEmail'> {\n\tconstructor(\n\t\tprivate readonly emailVerificationManager: EmailVerificationManager,\n\t\tprivate readonly permissionContextFactory: PermissionContextFactory,\n\t\tprivate readonly captchaValidator: CaptchaValidator,\n\t\tprivate readonly rateLimiter: RateLimiter,\n\t) {}\n\n\tasync requestEmailVerification(\n\t\tparent: unknown,\n\t\targs: MutationRequestEmailVerificationArgs,\n\t\tcontext: TenantResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<RequestEmailVerificationResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_RESET_PASSWORD,\n\t\t\tmessage: 'You are not allowed to request e-mail verification',\n\t\t})\n\n\t\tconst configuration = await context.db.queryHandler.fetch(new ConfigurationQuery(context.db.providers))\n\n\t\t// Per-IP rate limit + captcha mirror createResetPasswordRequest: this is\n\t\t// an unauthenticated email-sending endpoint, so gate abuse before the\n\t\t// (always-ok) anti-enumeration response below can be used as a mail bomb.\n\t\tconst rl = await this.rateLimiter.consume(context.db, 'email_verification_per_ip', context.httpInfo.ip, configuration)\n\t\tif (!rl.ok) {\n\t\t\treturn createErrorResponse('RATE_LIMIT_EXCEEDED', `Too many e-mail verification requests. Retry after ${rl.retryAfterSeconds}s.`)\n\t\t}\n\n\t\tconst captchaConfig = this.captchaValidator.extractConfig(configuration)\n\t\tif (this.captchaValidator.isEnabledFor(captchaConfig, 'emailVerification')) {\n\t\t\tconst captcha = await this.captchaValidator.verify({\n\t\t\t\tconfig: captchaConfig,\n\t\t\t\ttoken: args.captchaToken ?? undefined,\n\t\t\t\tremoteIp: context.httpInfo.ip,\n\t\t\t})\n\t\t\tif (!captcha.ok) {\n\t\t\t\treturn createErrorResponse('INVALID_CAPTCHA', `Captcha verification failed: ${captcha.reason}`)\n\t\t\t}\n\t\t}\n\n\t\tconst person = await context.db.queryHandler.fetch(PersonQuery.byEmail(args.email))\n\t\t// Always report ok regardless of whether the address exists or is\n\t\t// already verified — same anti-enumeration stance as password reset.\n\t\tif (person?.email && person.email_verified_at === null) {\n\t\t\tconst permissionContext = await this.permissionContextFactory.create(context.db, {\n\t\t\t\tid: person.identity_id,\n\t\t\t\troles: person.roles,\n\t\t\t}, context.permissionContext.authorizator)\n\t\t\tconst sent = await this.emailVerificationManager.sendVerificationEmail(context.db, permissionContext, person, {\n\t\t\t\tmailVariant: args.options?.mailVariant || undefined,\n\t\t\t\tproject: args.options?.mailProject || undefined,\n\t\t\t})\n\t\t\tif (sent) {\n\t\t\t\tawait context.logAuthAction({\n\t\t\t\t\ttype: 'email_verify_init',\n\t\t\t\t\tresponse: new ResponseOk(null),\n\t\t\t\t\tpersonId: person.id,\n\t\t\t\t\tpersonInput: args.email,\n\t\t\t\t})\n\t\t\t}\n\t\t}\n\t\treturn { ok: true }\n\t}\n\n\tasync verifyEmail(\n\t\tparent: unknown,\n\t\targs: MutationVerifyEmailArgs,\n\t\tcontext: TenantResolverContext,\n\t\tinfo: GraphQLResolveInfo,\n\t): Promise<VerifyEmailResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_RESET_PASSWORD,\n\t\t\tmessage: 'You are not allowed to verify an e-mail address',\n\t\t})\n\n\t\tconst result = await this.emailVerificationManager.verifyEmail(context.db, args.token)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'email_verify_complete',\n\t\t\tresponse: result,\n\t\t})\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\t\treturn { ok: true }\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAqBO,MAAM,kCAAiH;AAAA,EAC7H,YACkB,0BACA,0BACA,kBACA,aAChB;AAJgB,SAAA,2BAAA;AACA,SAAA,2BAAA;AACA,SAAA,mBAAA;AACA,SAAA,cAAA;AAAA,EACf;AAAA,EAEH,MAAM,yBACL,QACA,MACA,SACA,MAC4C;AAC5C,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AAED,UAAM,gBAAgB,MAAM,QAAQ,GAAG,aAAa,MAAM,IAAI,mBAAmB,QAAQ,GAAG,SAAS,CAAC;AAKtG,UAAM,KAAK,MAAM,KAAK,YAAY,QAAQ,QAAQ,IAAI,6BAA6B,QAAQ,SAAS,IAAI,aAAa;AACrH,QAAI,CAAC,GAAG,IAAI;AACX,aAAO,oBAAoB,uBAAuB,sDAAsD,GAAG,iBAAiB,IAAI;AAAA,IACjI;AAEA,UAAM,gBAAgB,KAAK,iBAAiB,cAAc,aAAa;AACvE,QAAI,KAAK,iBAAiB,aAAa,eAAe,mBAAmB,GAAG;AAC3E,YAAM,UAAU,MAAM,KAAK,iBAAiB,OAAO;AAAA,QAClD,QAAQ;AAAA,QACR,OAAO,KAAK,gBAAgB;AAAA,QAC5B,UAAU,QAAQ,SAAS;AAAA,MAAA,CAC3B;AACD,UAAI,CAAC,QAAQ,IAAI;AAChB,eAAO,oBAAoB,mBAAmB,gCAAgC,QAAQ,MAAM,EAAE;AAAA,MAC/F;AAAA,IACD;AAEA,UAAM,SAAS,MAAM,QAAQ,GAAG,aAAa,MAAM,YAAY,QAAQ,KAAK,KAAK,CAAC;AAGlF,QAAI,QAAQ,SAAS,OAAO,sBAAsB,MAAM;AACvD,YAAM,oBAAoB,MAAM,KAAK,yBAAyB,OAAO,QAAQ,IAAI;AAAA,QAChF,IAAI,OAAO;AAAA,QACX,OAAO,OAAO;AAAA,MAAA,GACZ,QAAQ,kBAAkB,YAAY;AACzC,YAAM,OAAO,MAAM,KAAK,yBAAyB,sBAAsB,QAAQ,IAAI,mBAAmB,QAAQ;AAAA,QAC7G,aAAa,KAAK,SAAS,eAAe;AAAA,QAC1C,SAAS,KAAK,SAAS,eAAe;AAAA,MAAA,CACtC;AACD,UAAI,MAAM;AACT,cAAM,QAAQ,cAAc;AAAA,UAC3B,MAAM;AAAA,UACN,UAAU,IAAI,WAAW,IAAI;AAAA,UAC7B,UAAU,OAAO;AAAA,UACjB,aAAa,KAAK;AAAA,QAAA,CAClB;AAAA,MACF;AAAA,IACD;AACA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AAAA,EAEA,MAAM,YACL,QACA,MACA,SACA,MAC+B;AAC/B,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,KAAK,yBAAyB,YAAY,QAAQ,IAAI,KAAK,KAAK;AACrF,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,IAAA,CACV;AACD,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;"}

package/dist/development/src/resolvers/mutation/person/EnablePersonMutationResolver.cjs

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const PermissionActions = require("../../../model/authorization/PermissionActions.cjs");
+require("@contember/authorization");
+require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+require("@contember/database");
+require("../../../model/type/ApiKey.cjs");
+require("../../../model/authorization/CustomRolePermissions.cjs");
+require("../../../model/authorization/PermissionContext.cjs");
+const TargetIdentityPermission = require("../../../model/authorization/TargetIdentityPermission.cjs");
+require("@contember/schema");
+require("node:crypto");
+require("node:assert");
+require("../../../model/service/idp/IDPRevalidation.cjs");
+require("../../../model/service/idp/ClaimMapping.cjs");
+require("@contember/schema-utils");
+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("otpauth");
+const errorUtils = require("../../errorUtils.cjs");
+class EnablePersonMutationResolver {
+  constructor(personAccessManager, personManager) {
+    this.personAccessManager = personAccessManager;
+    this.personManager = personManager;
+  }
+  async enablePerson(parent, args, context) {
+    const targetPerson = await this.personManager.findPersonById(context.db, args.personId);
+    if (targetPerson === null) {
+      return {
+        ok: false,
+        error: {
+          code: "PERSON_NOT_FOUND",
+          developerMessage: `Person <${args.personId}> was not found`
+        }
+      };
+    }
+    await context.requireAccess({
+      action: PermissionActions.PermissionActions.PERSON_DISABLE(await TargetIdentityPermission.createPersonPermissionTarget(context.db, targetPerson)),
+      message: "You are not allowed to enable person account"
+    });
+    const result = await this.personAccessManager.enablePerson(context.db, targetPerson);
+    await context.logAuthAction({
+      type: "person_enable",
+      response: result,
+      targetPersonId: targetPerson.id
+    });
+    if (!result.ok) {
+      return errorUtils.createErrorResponse(result.error, result.errorMessage);
+    }
+    return {
+      ok: true
+    };
+  }
+}
+exports.EnablePersonMutationResolver = EnablePersonMutationResolver;
+//# sourceMappingURL=EnablePersonMutationResolver.cjs.map

package/dist/development/src/resolvers/mutation/person/EnablePersonMutationResolver.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnablePersonMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/EnablePersonMutationResolver.ts"],"sourcesContent":["import { EnablePersonResponse, MutationEnablePersonArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { createPersonPermissionTarget, PermissionActions, PersonAccessManager } from '../../../model/index.js'\nimport { PersonManager } from '../../../model/service/PersonManager.js'\nimport { createErrorResponse } from '../../errorUtils.js'\n\nexport class EnablePersonMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly personAccessManager: PersonAccessManager,\n\t\tprivate readonly personManager: PersonManager,\n\t) {}\n\n\tasync enablePerson(\n\t\tparent: unknown,\n\t\targs: MutationEnablePersonArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<EnablePersonResponse> {\n\t\tconst targetPerson = await this.personManager.findPersonById(context.db, args.personId)\n\n\t\tif (targetPerson === null) {\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terror: {\n\t\t\t\t\tcode: 'PERSON_NOT_FOUND',\n\t\t\t\t\tdeveloperMessage: `Person <${args.personId}> was not found`,\n\t\t\t\t},\n\t\t\t}\n\t\t}\n\n\t\t// Enabling is the inverse of disabling, so it is the same privilege — a separate resource/privilege pair would need an ACL change everywhere.\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_DISABLE(await createPersonPermissionTarget(context.db, targetPerson)),\n\t\t\tmessage: 'You are not allowed to enable person account',\n\t\t})\n\n\t\tconst result = await this.personAccessManager.enablePerson(context.db, targetPerson)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'person_enable',\n\t\t\tresponse: result,\n\t\t\ttargetPersonId: targetPerson.id,\n\t\t})\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}\n\t}\n}\n"],"names":["PermissionActions","createPersonPermissionTarget","createErrorResponse"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAMO,MAAM,6BAA0D;AAAA,EACtE,YACkB,qBACA,eAChB;AAFgB,SAAA,sBAAA;AACA,SAAA,gBAAA;AAAA,EACf;AAAA,EAEH,MAAM,aACL,QACA,MACA,SACgC;AAChC,UAAM,eAAe,MAAM,KAAK,cAAc,eAAe,QAAQ,IAAI,KAAK,QAAQ;AAEtF,QAAI,iBAAiB,MAAM;AAC1B,aAAO;AAAA,QACN,IAAI;AAAA,QACJ,OAAO;AAAA,UACN,MAAM;AAAA,UACN,kBAAkB,WAAW,KAAK,QAAQ;AAAA,QAAA;AAAA,MAC3C;AAAA,IAEF;AAGA,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQA,kBAAAA,kBAAkB,eAAe,MAAMC,yBAAAA,6BAA6B,QAAQ,IAAI,YAAY,CAAC;AAAA,MACrG,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,KAAK,oBAAoB,aAAa,QAAQ,IAAI,YAAY;AACnF,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,MACV,gBAAgB,aAAa;AAAA,IAAA,CAC7B;AACD,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,IAAA;AAAA,EAEN;AACD;;"}

package/dist/development/src/resolvers/mutation/person/EnablePersonMutationResolver.js

@@ -0,0 +1,61 @@
+import { PermissionActions } from "../../../model/authorization/PermissionActions.js";
+import "@contember/authorization";
+import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import "@contember/database";
+import "../../../model/type/ApiKey.js";
+import "../../../model/authorization/CustomRolePermissions.js";
+import "../../../model/authorization/PermissionContext.js";
+import { createPersonPermissionTarget } from "../../../model/authorization/TargetIdentityPermission.js";
+import "@contember/schema";
+import "node:crypto";
+import "node:assert";
+import "../../../model/service/idp/IDPRevalidation.js";
+import "../../../model/service/idp/ClaimMapping.js";
+import "@contember/schema-utils";
+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 "otpauth";
+import { createErrorResponse } from "../../errorUtils.js";
+class EnablePersonMutationResolver {
+  constructor(personAccessManager, personManager) {
+    this.personAccessManager = personAccessManager;
+    this.personManager = personManager;
+  }
+  async enablePerson(parent, args, context) {
+    const targetPerson = await this.personManager.findPersonById(context.db, args.personId);
+    if (targetPerson === null) {
+      return {
+        ok: false,
+        error: {
+          code: "PERSON_NOT_FOUND",
+          developerMessage: `Person <${args.personId}> was not found`
+        }
+      };
+    }
+    await context.requireAccess({
+      action: PermissionActions.PERSON_DISABLE(await createPersonPermissionTarget(context.db, targetPerson)),
+      message: "You are not allowed to enable person account"
+    });
+    const result = await this.personAccessManager.enablePerson(context.db, targetPerson);
+    await context.logAuthAction({
+      type: "person_enable",
+      response: result,
+      targetPersonId: targetPerson.id
+    });
+    if (!result.ok) {
+      return createErrorResponse(result.error, result.errorMessage);
+    }
+    return {
+      ok: true
+    };
+  }
+}
+export {
+  EnablePersonMutationResolver
+};
+//# sourceMappingURL=EnablePersonMutationResolver.js.map

package/dist/development/src/resolvers/mutation/person/EnablePersonMutationResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnablePersonMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/EnablePersonMutationResolver.ts"],"sourcesContent":["import { EnablePersonResponse, MutationEnablePersonArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { createPersonPermissionTarget, PermissionActions, PersonAccessManager } from '../../../model/index.js'\nimport { PersonManager } from '../../../model/service/PersonManager.js'\nimport { createErrorResponse } from '../../errorUtils.js'\n\nexport class EnablePersonMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly personAccessManager: PersonAccessManager,\n\t\tprivate readonly personManager: PersonManager,\n\t) {}\n\n\tasync enablePerson(\n\t\tparent: unknown,\n\t\targs: MutationEnablePersonArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<EnablePersonResponse> {\n\t\tconst targetPerson = await this.personManager.findPersonById(context.db, args.personId)\n\n\t\tif (targetPerson === null) {\n\t\t\treturn {\n\t\t\t\tok: false,\n\t\t\t\terror: {\n\t\t\t\t\tcode: 'PERSON_NOT_FOUND',\n\t\t\t\t\tdeveloperMessage: `Person <${args.personId}> was not found`,\n\t\t\t\t},\n\t\t\t}\n\t\t}\n\n\t\t// Enabling is the inverse of disabling, so it is the same privilege — a separate resource/privilege pair would need an ACL change everywhere.\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_DISABLE(await createPersonPermissionTarget(context.db, targetPerson)),\n\t\t\tmessage: 'You are not allowed to enable person account',\n\t\t})\n\n\t\tconst result = await this.personAccessManager.enablePerson(context.db, targetPerson)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'person_enable',\n\t\t\tresponse: result,\n\t\t\ttargetPersonId: targetPerson.id,\n\t\t})\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}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAMO,MAAM,6BAA0D;AAAA,EACtE,YACkB,qBACA,eAChB;AAFgB,SAAA,sBAAA;AACA,SAAA,gBAAA;AAAA,EACf;AAAA,EAEH,MAAM,aACL,QACA,MACA,SACgC;AAChC,UAAM,eAAe,MAAM,KAAK,cAAc,eAAe,QAAQ,IAAI,KAAK,QAAQ;AAEtF,QAAI,iBAAiB,MAAM;AAC1B,aAAO;AAAA,QACN,IAAI;AAAA,QACJ,OAAO;AAAA,UACN,MAAM;AAAA,UACN,kBAAkB,WAAW,KAAK,QAAQ;AAAA,QAAA;AAAA,MAC3C;AAAA,IAEF;AAGA,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB,eAAe,MAAM,6BAA6B,QAAQ,IAAI,YAAY,CAAC;AAAA,MACrG,SAAS;AAAA,IAAA,CACT;AAED,UAAM,SAAS,MAAM,KAAK,oBAAoB,aAAa,QAAQ,IAAI,YAAY;AACnF,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,MACV,gBAAgB,aAAa;AAAA,IAAA,CAC7B;AACD,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AAEA,WAAO;AAAA,MACN,IAAI;AAAA,IAAA;AAAA,EAEN;AACD;"}

package/dist/development/src/resolvers/mutation/person/ForceSignOutMutationResolver.cjs

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const PermissionActions = require("../../../model/authorization/PermissionActions.cjs");
 require("@contember/authorization");
+require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+require("@contember/database");
+require("../../../model/type/ApiKey.cjs");
+require("../../../model/authorization/CustomRolePermissions.cjs");
 require("../../../model/authorization/PermissionContext.cjs");
-require("../../../model/authorization/PermissionsFactory.cjs");
+const TargetIdentityPermission = require("../../../model/authorization/TargetIdentityPermission.cjs");
 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/ClaimMapping.cjs");
+require("@contember/schema-utils");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
@@ -19,7 +22,6 @@ 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");
 class ForceSignOutMutationResolver {
@@ -32,7 +34,7 @@ class ForceSignOutMutationResolver {
     const targetPerson = await this.personManager.findPersonById(context.db, args.personId);
     const reason = args.reason ?? null;
     await context.requireAccess({
-      action: PermissionActions.PermissionActions.PERSON_FORCE_SIGN_OUT(targetPerson?.roles ?? []),
+      action: PermissionActions.PermissionActions.PERSON_FORCE_SIGN_OUT(await TargetIdentityPermission.createPersonPermissionTarget(context.db, targetPerson)),
       message: "You are not allowed to force sign out this person"
     });
     if (targetPerson === null) {

package/dist/development/src/resolvers/mutation/person/ForceSignOutMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ForceSignOutMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/ForceSignOutMutationResolver.ts"],"sourcesContent":["import { ForceSignOutPersonResponse, MutationForceSignOutPersonArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { ApiKeyManager, PermissionActions } from '../../../model/index.js'\nimport { PersonManager } from '../../../model/service/PersonManager.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { ResponseError, ResponseOk } from '../../../model/utils/Response.js'\nimport { UserMailer } from '../../../model/mailing/index.js'\n\nexport class ForceSignOutMutationResolver implements Pick<MutationResolvers, 'forceSignOutPerson'> {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly personManager: PersonManager,\n\t\tprivate readonly userMailer: UserMailer,\n\t) {}\n\n\tasync forceSignOutPerson(\n\t\tparent: unknown,\n\t\targs: MutationForceSignOutPersonArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<ForceSignOutPersonResponse> {\n\t\tconst targetPerson = await this.personManager.findPersonById(context.db, args.personId)\n\t\tconst reason = args.reason ?? null\n\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_FORCE_SIGN_OUT(targetPerson?.roles ?? []),\n\t\t\tmessage: 'You are not allowed to force sign out this person',\n\t\t})\n\n\t\tif (targetPerson === null) {\n\t\t\tconst response = new ResponseError('PERSON_NOT_FOUND', `Person <${args.personId}> was not found`)\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'forced_sign_out',\n\t\t\t\tresponse,\n\t\t\t\tmetadata: {\n\t\t\t\t\trequestedPersonId: args.personId,\n\t\t\t\t\t...(reason !== null ? { reason } : {}),\n\t\t\t\t},\n\t\t\t})\n\t\t\treturn createErrorResponse(response.error, response.errorMessage)\n\t\t}\n\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(context.db, targetPerson.identity_id)\n\n\t\tconst response = new ResponseOk(null)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'forced_sign_out',\n\t\t\tresponse,\n\t\t\ttargetPersonId: targetPerson.id,\n\t\t\tmetadata: reason !== null ? { reason } : undefined,\n\t\t})\n\n\t\tif (targetPerson.email) {\n\t\t\tawait this.userMailer.sendForcedSignOutEmail(\n\t\t\t\tcontext.db,\n\t\t\t\t{ email: targetPerson.email, reason },\n\t\t\t\t{ projectId: null, variant: '' },\n\t\t\t)\n\t\t}\n\n\t\treturn { ok: true }\n\t}\n}\n"],"names":["PermissionActions","response","ResponseError","createErrorResponse","ResponseOk"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAQO,MAAM,6BAAsF;AAAA,EAClG,YACkB,eACA,eACA,YAChB;AAHgB,SAAA,gBAAA;AACA,SAAA,gBAAA;AACA,SAAA,aAAA;AAAA,EACf;AAAA,EAEH,MAAM,mBACL,QACA,MACA,SACsC;AACtC,UAAM,eAAe,MAAM,KAAK,cAAc,eAAe,QAAQ,IAAI,KAAK,QAAQ;AACtF,UAAM,SAAS,KAAK,UAAU;AAE9B,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQA,kBAAAA,kBAAkB,sBAAsB,cAAc,SAAS,CAAA,CAAE;AAAA,MACzE,SAAS;AAAA,IAAA,CACT;AAED,QAAI,iBAAiB,MAAM;AAC1B,YAAMC,YAAW,IAAIC,SAAAA,cAAc,oBAAoB,WAAW,KAAK,QAAQ,iBAAiB;AAChG,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAAD;AAAAA,QACA,UAAU;AAAA,UACT,mBAAmB,KAAK;AAAA,UACxB,GAAI,WAAW,OAAO,EAAE,WAAW,CAAA;AAAA,QAAC;AAAA,MACrC,CACA;AACD,aAAOE,WAAAA,oBAAoBF,UAAS,OAAOA,UAAS,YAAY;AAAA,IACjE;AAEA,UAAM,KAAK,cAAc,uBAAuB,QAAQ,IAAI,aAAa,WAAW;AAEpF,UAAM,WAAW,IAAIG,SAAAA,WAAW,IAAI;AACpC,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN;AAAA,MACA,gBAAgB,aAAa;AAAA,MAC7B,UAAU,WAAW,OAAO,EAAE,WAAW;AAAA,IAAA,CACzC;AAED,QAAI,aAAa,OAAO;AACvB,YAAM,KAAK,WAAW;AAAA,QACrB,QAAQ;AAAA,QACR,EAAE,OAAO,aAAa,OAAO,OAAA;AAAA,QAC7B,EAAE,WAAW,MAAM,SAAS,GAAA;AAAA,MAAG;AAAA,IAEjC;AAEA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;;"}
+{"version":3,"file":"ForceSignOutMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/ForceSignOutMutationResolver.ts"],"sourcesContent":["import { ForceSignOutPersonResponse, MutationForceSignOutPersonArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { ApiKeyManager, createPersonPermissionTarget, PermissionActions } from '../../../model/index.js'\nimport { PersonManager } from '../../../model/service/PersonManager.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { ResponseError, ResponseOk } from '../../../model/utils/Response.js'\nimport { UserMailer } from '../../../model/mailing/index.js'\n\nexport class ForceSignOutMutationResolver implements Pick<MutationResolvers, 'forceSignOutPerson'> {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly personManager: PersonManager,\n\t\tprivate readonly userMailer: UserMailer,\n\t) {}\n\n\tasync forceSignOutPerson(\n\t\tparent: unknown,\n\t\targs: MutationForceSignOutPersonArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<ForceSignOutPersonResponse> {\n\t\tconst targetPerson = await this.personManager.findPersonById(context.db, args.personId)\n\t\tconst reason = args.reason ?? null\n\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_FORCE_SIGN_OUT(await createPersonPermissionTarget(context.db, targetPerson)),\n\t\t\tmessage: 'You are not allowed to force sign out this person',\n\t\t})\n\n\t\tif (targetPerson === null) {\n\t\t\tconst response = new ResponseError('PERSON_NOT_FOUND', `Person <${args.personId}> was not found`)\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'forced_sign_out',\n\t\t\t\tresponse,\n\t\t\t\tmetadata: {\n\t\t\t\t\trequestedPersonId: args.personId,\n\t\t\t\t\t...(reason !== null ? { reason } : {}),\n\t\t\t\t},\n\t\t\t})\n\t\t\treturn createErrorResponse(response.error, response.errorMessage)\n\t\t}\n\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(context.db, targetPerson.identity_id)\n\n\t\tconst response = new ResponseOk(null)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'forced_sign_out',\n\t\t\tresponse,\n\t\t\ttargetPersonId: targetPerson.id,\n\t\t\tmetadata: reason !== null ? { reason } : undefined,\n\t\t})\n\n\t\tif (targetPerson.email) {\n\t\t\tawait this.userMailer.sendForcedSignOutEmail(\n\t\t\t\tcontext.db,\n\t\t\t\t{ email: targetPerson.email, reason },\n\t\t\t\t{ projectId: null, variant: '' },\n\t\t\t)\n\t\t}\n\n\t\treturn { ok: true }\n\t}\n}\n"],"names":["PermissionActions","createPersonPermissionTarget","response","ResponseError","createErrorResponse","ResponseOk"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAQO,MAAM,6BAAsF;AAAA,EAClG,YACkB,eACA,eACA,YAChB;AAHgB,SAAA,gBAAA;AACA,SAAA,gBAAA;AACA,SAAA,aAAA;AAAA,EACf;AAAA,EAEH,MAAM,mBACL,QACA,MACA,SACsC;AACtC,UAAM,eAAe,MAAM,KAAK,cAAc,eAAe,QAAQ,IAAI,KAAK,QAAQ;AACtF,UAAM,SAAS,KAAK,UAAU;AAE9B,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQA,kBAAAA,kBAAkB,sBAAsB,MAAMC,yBAAAA,6BAA6B,QAAQ,IAAI,YAAY,CAAC;AAAA,MAC5G,SAAS;AAAA,IAAA,CACT;AAED,QAAI,iBAAiB,MAAM;AAC1B,YAAMC,YAAW,IAAIC,SAAAA,cAAc,oBAAoB,WAAW,KAAK,QAAQ,iBAAiB;AAChG,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAAD;AAAAA,QACA,UAAU;AAAA,UACT,mBAAmB,KAAK;AAAA,UACxB,GAAI,WAAW,OAAO,EAAE,WAAW,CAAA;AAAA,QAAC;AAAA,MACrC,CACA;AACD,aAAOE,WAAAA,oBAAoBF,UAAS,OAAOA,UAAS,YAAY;AAAA,IACjE;AAEA,UAAM,KAAK,cAAc,uBAAuB,QAAQ,IAAI,aAAa,WAAW;AAEpF,UAAM,WAAW,IAAIG,SAAAA,WAAW,IAAI;AACpC,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN;AAAA,MACA,gBAAgB,aAAa;AAAA,MAC7B,UAAU,WAAW,OAAO,EAAE,WAAW;AAAA,IAAA,CACzC;AAED,QAAI,aAAa,OAAO;AACvB,YAAM,KAAK,WAAW;AAAA,QACrB,QAAQ;AAAA,QACR,EAAE,OAAO,aAAa,OAAO,OAAA;AAAA,QAC7B,EAAE,WAAW,MAAM,SAAS,GAAA;AAAA,MAAG;AAAA,IAEjC;AAEA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;;"}

package/dist/development/src/resolvers/mutation/person/ForceSignOutMutationResolver.js

@@ -1,15 +1,18 @@
 import { PermissionActions } from "../../../model/authorization/PermissionActions.js";
 import "@contember/authorization";
+import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import "@contember/database";
+import "../../../model/type/ApiKey.js";
+import "../../../model/authorization/CustomRolePermissions.js";
 import "../../../model/authorization/PermissionContext.js";
-import "../../../model/authorization/PermissionsFactory.js";
+import { createPersonPermissionTarget } from "../../../model/authorization/TargetIdentityPermission.js";
 import "@contember/schema";
-import "../../../model/type/ApiKey.js";
-import "@contember/database";
 import "node:crypto";
 import { ResponseError, 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/ClaimMapping.js";
+import "@contember/schema-utils";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
@@ -17,7 +20,6 @@ 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 { createErrorResponse } from "../../errorUtils.js";
 class ForceSignOutMutationResolver {
@@ -30,7 +32,7 @@ class ForceSignOutMutationResolver {
     const targetPerson = await this.personManager.findPersonById(context.db, args.personId);
     const reason = args.reason ?? null;
     await context.requireAccess({
-      action: PermissionActions.PERSON_FORCE_SIGN_OUT(targetPerson?.roles ?? []),
+      action: PermissionActions.PERSON_FORCE_SIGN_OUT(await createPersonPermissionTarget(context.db, targetPerson)),
       message: "You are not allowed to force sign out this person"
     });
     if (targetPerson === null) {

package/dist/development/src/resolvers/mutation/person/ForceSignOutMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ForceSignOutMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/ForceSignOutMutationResolver.ts"],"sourcesContent":["import { ForceSignOutPersonResponse, MutationForceSignOutPersonArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { ApiKeyManager, PermissionActions } from '../../../model/index.js'\nimport { PersonManager } from '../../../model/service/PersonManager.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { ResponseError, ResponseOk } from '../../../model/utils/Response.js'\nimport { UserMailer } from '../../../model/mailing/index.js'\n\nexport class ForceSignOutMutationResolver implements Pick<MutationResolvers, 'forceSignOutPerson'> {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly personManager: PersonManager,\n\t\tprivate readonly userMailer: UserMailer,\n\t) {}\n\n\tasync forceSignOutPerson(\n\t\tparent: unknown,\n\t\targs: MutationForceSignOutPersonArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<ForceSignOutPersonResponse> {\n\t\tconst targetPerson = await this.personManager.findPersonById(context.db, args.personId)\n\t\tconst reason = args.reason ?? null\n\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_FORCE_SIGN_OUT(targetPerson?.roles ?? []),\n\t\t\tmessage: 'You are not allowed to force sign out this person',\n\t\t})\n\n\t\tif (targetPerson === null) {\n\t\t\tconst response = new ResponseError('PERSON_NOT_FOUND', `Person <${args.personId}> was not found`)\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'forced_sign_out',\n\t\t\t\tresponse,\n\t\t\t\tmetadata: {\n\t\t\t\t\trequestedPersonId: args.personId,\n\t\t\t\t\t...(reason !== null ? { reason } : {}),\n\t\t\t\t},\n\t\t\t})\n\t\t\treturn createErrorResponse(response.error, response.errorMessage)\n\t\t}\n\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(context.db, targetPerson.identity_id)\n\n\t\tconst response = new ResponseOk(null)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'forced_sign_out',\n\t\t\tresponse,\n\t\t\ttargetPersonId: targetPerson.id,\n\t\t\tmetadata: reason !== null ? { reason } : undefined,\n\t\t})\n\n\t\tif (targetPerson.email) {\n\t\t\tawait this.userMailer.sendForcedSignOutEmail(\n\t\t\t\tcontext.db,\n\t\t\t\t{ email: targetPerson.email, reason },\n\t\t\t\t{ projectId: null, variant: '' },\n\t\t\t)\n\t\t}\n\n\t\treturn { ok: true }\n\t}\n}\n"],"names":["response"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAQO,MAAM,6BAAsF;AAAA,EAClG,YACkB,eACA,eACA,YAChB;AAHgB,SAAA,gBAAA;AACA,SAAA,gBAAA;AACA,SAAA,aAAA;AAAA,EACf;AAAA,EAEH,MAAM,mBACL,QACA,MACA,SACsC;AACtC,UAAM,eAAe,MAAM,KAAK,cAAc,eAAe,QAAQ,IAAI,KAAK,QAAQ;AACtF,UAAM,SAAS,KAAK,UAAU;AAE9B,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB,sBAAsB,cAAc,SAAS,CAAA,CAAE;AAAA,MACzE,SAAS;AAAA,IAAA,CACT;AAED,QAAI,iBAAiB,MAAM;AAC1B,YAAMA,YAAW,IAAI,cAAc,oBAAoB,WAAW,KAAK,QAAQ,iBAAiB;AAChG,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAAA;AAAAA,QACA,UAAU;AAAA,UACT,mBAAmB,KAAK;AAAA,UACxB,GAAI,WAAW,OAAO,EAAE,WAAW,CAAA;AAAA,QAAC;AAAA,MACrC,CACA;AACD,aAAO,oBAAoBA,UAAS,OAAOA,UAAS,YAAY;AAAA,IACjE;AAEA,UAAM,KAAK,cAAc,uBAAuB,QAAQ,IAAI,aAAa,WAAW;AAEpF,UAAM,WAAW,IAAI,WAAW,IAAI;AACpC,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN;AAAA,MACA,gBAAgB,aAAa;AAAA,MAC7B,UAAU,WAAW,OAAO,EAAE,WAAW;AAAA,IAAA,CACzC;AAED,QAAI,aAAa,OAAO;AACvB,YAAM,KAAK,WAAW;AAAA,QACrB,QAAQ;AAAA,QACR,EAAE,OAAO,aAAa,OAAO,OAAA;AAAA,QAC7B,EAAE,WAAW,MAAM,SAAS,GAAA;AAAA,MAAG;AAAA,IAEjC;AAEA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;"}
+{"version":3,"file":"ForceSignOutMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/ForceSignOutMutationResolver.ts"],"sourcesContent":["import { ForceSignOutPersonResponse, MutationForceSignOutPersonArgs, MutationResolvers } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { ApiKeyManager, createPersonPermissionTarget, PermissionActions } from '../../../model/index.js'\nimport { PersonManager } from '../../../model/service/PersonManager.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { ResponseError, ResponseOk } from '../../../model/utils/Response.js'\nimport { UserMailer } from '../../../model/mailing/index.js'\n\nexport class ForceSignOutMutationResolver implements Pick<MutationResolvers, 'forceSignOutPerson'> {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly personManager: PersonManager,\n\t\tprivate readonly userMailer: UserMailer,\n\t) {}\n\n\tasync forceSignOutPerson(\n\t\tparent: unknown,\n\t\targs: MutationForceSignOutPersonArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<ForceSignOutPersonResponse> {\n\t\tconst targetPerson = await this.personManager.findPersonById(context.db, args.personId)\n\t\tconst reason = args.reason ?? null\n\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_FORCE_SIGN_OUT(await createPersonPermissionTarget(context.db, targetPerson)),\n\t\t\tmessage: 'You are not allowed to force sign out this person',\n\t\t})\n\n\t\tif (targetPerson === null) {\n\t\t\tconst response = new ResponseError('PERSON_NOT_FOUND', `Person <${args.personId}> was not found`)\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'forced_sign_out',\n\t\t\t\tresponse,\n\t\t\t\tmetadata: {\n\t\t\t\t\trequestedPersonId: args.personId,\n\t\t\t\t\t...(reason !== null ? { reason } : {}),\n\t\t\t\t},\n\t\t\t})\n\t\t\treturn createErrorResponse(response.error, response.errorMessage)\n\t\t}\n\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(context.db, targetPerson.identity_id)\n\n\t\tconst response = new ResponseOk(null)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'forced_sign_out',\n\t\t\tresponse,\n\t\t\ttargetPersonId: targetPerson.id,\n\t\t\tmetadata: reason !== null ? { reason } : undefined,\n\t\t})\n\n\t\tif (targetPerson.email) {\n\t\t\tawait this.userMailer.sendForcedSignOutEmail(\n\t\t\t\tcontext.db,\n\t\t\t\t{ email: targetPerson.email, reason },\n\t\t\t\t{ projectId: null, variant: '' },\n\t\t\t)\n\t\t}\n\n\t\treturn { ok: true }\n\t}\n}\n"],"names":["response"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAQO,MAAM,6BAAsF;AAAA,EAClG,YACkB,eACA,eACA,YAChB;AAHgB,SAAA,gBAAA;AACA,SAAA,gBAAA;AACA,SAAA,aAAA;AAAA,EACf;AAAA,EAEH,MAAM,mBACL,QACA,MACA,SACsC;AACtC,UAAM,eAAe,MAAM,KAAK,cAAc,eAAe,QAAQ,IAAI,KAAK,QAAQ;AACtF,UAAM,SAAS,KAAK,UAAU;AAE9B,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB,sBAAsB,MAAM,6BAA6B,QAAQ,IAAI,YAAY,CAAC;AAAA,MAC5G,SAAS;AAAA,IAAA,CACT;AAED,QAAI,iBAAiB,MAAM;AAC1B,YAAMA,YAAW,IAAI,cAAc,oBAAoB,WAAW,KAAK,QAAQ,iBAAiB;AAChG,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAAA;AAAAA,QACA,UAAU;AAAA,UACT,mBAAmB,KAAK;AAAA,UACxB,GAAI,WAAW,OAAO,EAAE,WAAW,CAAA;AAAA,QAAC;AAAA,MACrC,CACA;AACD,aAAO,oBAAoBA,UAAS,OAAOA,UAAS,YAAY;AAAA,IACjE;AAEA,UAAM,KAAK,cAAc,uBAAuB,QAAQ,IAAI,aAAa,WAAW;AAEpF,UAAM,WAAW,IAAI,WAAW,IAAI;AACpC,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN;AAAA,MACA,gBAAgB,aAAa;AAAA,MAC7B,UAAU,WAAW,OAAO,EAAE,WAAW;AAAA,IAAA,CACzC;AAED,QAAI,aAAa,OAAO;AACvB,YAAM,KAAK,WAAW;AAAA,QACrB,QAAQ;AAAA,QACR,EAAE,OAAO,aAAa,OAAO,OAAA;AAAA,QAC7B,EAAE,WAAW,MAAM,SAAS,GAAA;AAAA,MAAG;AAAA,IAEjC;AAEA,WAAO,EAAE,IAAI,KAAA;AAAA,EACd;AACD;"}

package/dist/development/src/resolvers/mutation/person/IDPMutationResolver.cjs

@@ -2,15 +2,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const PermissionActions = require("../../../model/authorization/PermissionActions.cjs");
 require("@contember/authorization");
+require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+require("@contember/database");
+require("../../../model/type/ApiKey.cjs");
+require("../../../model/authorization/CustomRolePermissions.cjs");
 require("../../../model/authorization/PermissionContext.cjs");
-require("../../../model/authorization/PermissionsFactory.cjs");
+require("../../../model/authorization/TargetIdentityPermission.cjs");
 require("@contember/schema");
-require("../../../model/type/ApiKey.cjs");
-require("@contember/database");
 require("node:crypto");
-require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+const Response = require("../../../model/utils/Response.cjs");
 require("node:assert");
 require("../../../model/service/idp/IDPRevalidation.cjs");
+require("../../../model/service/idp/ClaimMapping.cjs");
+require("@contember/schema-utils");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
@@ -18,7 +22,6 @@ 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");
 class IDPMutationResolver {
@@ -64,6 +67,30 @@ class IDPMutationResolver {
       type: "idp_login",
       response: signIn
     });
+    if (signIn.ok && signIn.result.claimMappingAudit) {
+      const audit = signIn.result.claimMappingAudit;
+      await context.logAuthAction({
+        type: "idp_role_mapped",
+        response: new Response.ResponseOk(null),
+        personId: signIn.result.person.id,
+        // the membership change affects the signing-in person — record it as the target too, so it
+        // surfaces in target_person_id audit queries like the other project_membership_* events.
+        targetPersonId: signIn.result.person.id,
+        identityProviderId: signIn.result.identityProviderId,
+        // the audit object IS the event payload ({ before, after, syncPolicy, unmatched }); pass it
+        // whole so the shape is single-sourced from ClaimMappingAudit (the refresh path does the same).
+        eventData: audit
+      });
+    }
+    if (signIn.ok && signIn.result.claimMappingFailed) {
+      await context.logAuthAction({
+        type: "idp_role_mapping_failed",
+        response: new Response.ResponseOk(null),
+        personId: signIn.result.person.id,
+        targetPersonId: signIn.result.person.id,
+        identityProviderId: signIn.result.identityProviderId
+      });
+    }
     if (!signIn.ok) {
       return errorUtils.createErrorResponse(signIn.error, signIn.errorMessage);
     }

package/dist/development/src/resolvers/mutation/person/IDPMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"IDPMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/IDPMutationResolver.ts"],"sourcesContent":["import {\n\tInitSignInIdpResponse,\n\tMutationInitSignInIdpArgs,\n\tMutationResolvers,\n\tMutationSignInIdpArgs,\n\tSignInIdpResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { IDPSignInManager, PermissionActions } from '../../../model/index.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { SignInResponseFactory } from '../../responseHelpers/SignInResponseFactory.js'\n\nexport class IDPMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly idpSignInManager: IDPSignInManager,\n\t\tprivate readonly signInResponseFactory: SignInResponseFactory,\n\t) {}\n\n\tasync initSignInIDP(\n\t\tparent: any,\n\t\targs: MutationInitSignInIdpArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InitSignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_CREATE_IDP_URL,\n\t\t\tmessage: 'You are not allowed to create a redirect URL for IDP',\n\t\t})\n\t\tconst result = await this.idpSignInManager.initSignInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t)\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\t\treturn { ok: true, errors: [], result: result.result }\n\t}\n\n\tasync signInIDP(parent: any, args: MutationSignInIdpArgs, context: TenantResolverContext): Promise<SignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_SIGN_IN_IDP,\n\t\t\tmessage: 'You are not allowed to person IDP sign in',\n\t\t})\n\t\tconst signIn = await this.idpSignInManager.signInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tsessionData: args.sessionData,\n\t\t\t\turl: args.idpResponse?.url,\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t\targs.expiration ?? undefined,\n\t\t\tcontext.httpInfo,\n\t\t\targs.options?.trustForwardedClientInfo === true && context.trustForwardedInfo,\n\t\t)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'idp_login',\n\t\t\tresponse: signIn,\n\t\t})\n\t\tif (!signIn.ok) {\n\t\t\treturn createErrorResponse(signIn.error, signIn.errorMessage)\n\t\t}\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t\tresult: {\n\t\t\t\t...await this.signInResponseFactory.createResponse(signIn.result, context),\n\t\t\t\tidpResponse: signIn.result.idpResponse,\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createErrorResponse"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAYO,MAAM,oBAAiD;AAAA,EAC7D,YACkB,kBACA,uBAChB;AAFgB,SAAA,mBAAA;AACA,SAAA,wBAAA;AAAA,EACf;AAAA,EAEH,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQA,kBAAAA,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,MAAA;AAAA,IACnB;AAED,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO,EAAE,IAAI,MAAM,QAAQ,CAAA,GAAI,QAAQ,OAAO,OAAA;AAAA,EAC/C;AAAA,EAEA,MAAM,UAAU,QAAa,MAA6B,SAA4D;AACrH,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQD,kBAAAA,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,QAClB,KAAK,KAAK,aAAa;AAAA,QACvB,aAAa,KAAK;AAAA,MAAA;AAAA,MAEnB,KAAK,cAAc;AAAA,MACnB,QAAQ;AAAA,MACR,KAAK,SAAS,6BAA6B,QAAQ,QAAQ;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,IAAA,CACV;AACD,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,MACR,QAAQ;AAAA,QACP,GAAG,MAAM,KAAK,sBAAsB,eAAe,OAAO,QAAQ,OAAO;AAAA,QACzE,aAAa,OAAO,OAAO;AAAA,MAAA;AAAA,IAC5B;AAAA,EAEF;AACD;;"}
+{"version":3,"file":"IDPMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/IDPMutationResolver.ts"],"sourcesContent":["import {\n\tInitSignInIdpResponse,\n\tMutationInitSignInIdpArgs,\n\tMutationResolvers,\n\tMutationSignInIdpArgs,\n\tSignInIdpResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { IDPSignInManager, PermissionActions } from '../../../model/index.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { SignInResponseFactory } from '../../responseHelpers/SignInResponseFactory.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\n\nexport class IDPMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly idpSignInManager: IDPSignInManager,\n\t\tprivate readonly signInResponseFactory: SignInResponseFactory,\n\t) {}\n\n\tasync initSignInIDP(\n\t\tparent: any,\n\t\targs: MutationInitSignInIdpArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InitSignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_CREATE_IDP_URL,\n\t\t\tmessage: 'You are not allowed to create a redirect URL for IDP',\n\t\t})\n\t\tconst result = await this.idpSignInManager.initSignInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t)\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\t\treturn { ok: true, errors: [], result: result.result }\n\t}\n\n\tasync signInIDP(parent: any, args: MutationSignInIdpArgs, context: TenantResolverContext): Promise<SignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_SIGN_IN_IDP,\n\t\t\tmessage: 'You are not allowed to person IDP sign in',\n\t\t})\n\t\tconst signIn = await this.idpSignInManager.signInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tsessionData: args.sessionData,\n\t\t\t\turl: args.idpResponse?.url,\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t\targs.expiration ?? undefined,\n\t\t\tcontext.httpInfo,\n\t\t\targs.options?.trustForwardedClientInfo === true && context.trustForwardedInfo,\n\t\t)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'idp_login',\n\t\t\tresponse: signIn,\n\t\t})\n\t\t// A09 — audit claim-mapping membership sync separately from the login itself, with a plain\n\t\t// `{ before, after }` diff. Emitted only when the mapping actually changed grants on this\n\t\t// sign-in (the manager returns null otherwise).\n\t\tif (signIn.ok && signIn.result.claimMappingAudit) {\n\t\t\tconst audit = signIn.result.claimMappingAudit\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'idp_role_mapped',\n\t\t\t\tresponse: new ResponseOk(null),\n\t\t\t\tpersonId: signIn.result.person.id,\n\t\t\t\t// the membership change affects the signing-in person — record it as the target too, so it\n\t\t\t\t// surfaces in target_person_id audit queries like the other project_membership_* events.\n\t\t\t\ttargetPersonId: signIn.result.person.id,\n\t\t\t\tidentityProviderId: signIn.result.identityProviderId,\n\t\t\t\t// the audit object IS the event payload ({ before, after, syncPolicy, unmatched }); pass it\n\t\t\t\t// whole so the shape is single-sourced from ClaimMappingAudit (the refresh path does the same).\n\t\t\t\teventData: audit,\n\t\t\t})\n\t\t}\n\t\t// A09 fail-open marker: the mapping was configured but its evaluation/apply failed and was\n\t\t// skipped so sign-in could proceed. Audited (no claim values in the payload) so a broken\n\t\t// mapping is visible to the operator instead of silently never applying.\n\t\tif (signIn.ok && signIn.result.claimMappingFailed) {\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'idp_role_mapping_failed',\n\t\t\t\tresponse: new ResponseOk(null),\n\t\t\t\tpersonId: signIn.result.person.id,\n\t\t\t\ttargetPersonId: signIn.result.person.id,\n\t\t\t\tidentityProviderId: signIn.result.identityProviderId,\n\t\t\t})\n\t\t}\n\t\tif (!signIn.ok) {\n\t\t\treturn createErrorResponse(signIn.error, signIn.errorMessage)\n\t\t}\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t\tresult: {\n\t\t\t\t...await this.signInResponseFactory.createResponse(signIn.result, context),\n\t\t\t\tidpResponse: signIn.result.idpResponse,\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":["PermissionActions","createErrorResponse","ResponseOk"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAaO,MAAM,oBAAiD;AAAA,EAC7D,YACkB,kBACA,uBAChB;AAFgB,SAAA,mBAAA;AACA,SAAA,wBAAA;AAAA,EACf;AAAA,EAEH,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQA,kBAAAA,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,MAAA;AAAA,IACnB;AAED,QAAI,CAAC,OAAO,IAAI;AACf,aAAOC,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO,EAAE,IAAI,MAAM,QAAQ,CAAA,GAAI,QAAQ,OAAO,OAAA;AAAA,EAC/C;AAAA,EAEA,MAAM,UAAU,QAAa,MAA6B,SAA4D;AACrH,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQD,kBAAAA,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,QAClB,KAAK,KAAK,aAAa;AAAA,QACvB,aAAa,KAAK;AAAA,MAAA;AAAA,MAEnB,KAAK,cAAc;AAAA,MACnB,QAAQ;AAAA,MACR,KAAK,SAAS,6BAA6B,QAAQ,QAAQ;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,IAAA,CACV;AAID,QAAI,OAAO,MAAM,OAAO,OAAO,mBAAmB;AACjD,YAAM,QAAQ,OAAO,OAAO;AAC5B,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAU,IAAIE,SAAAA,WAAW,IAAI;AAAA,QAC7B,UAAU,OAAO,OAAO,OAAO;AAAA;AAAA;AAAA,QAG/B,gBAAgB,OAAO,OAAO,OAAO;AAAA,QACrC,oBAAoB,OAAO,OAAO;AAAA;AAAA;AAAA,QAGlC,WAAW;AAAA,MAAA,CACX;AAAA,IACF;AAIA,QAAI,OAAO,MAAM,OAAO,OAAO,oBAAoB;AAClD,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAU,IAAIA,SAAAA,WAAW,IAAI;AAAA,QAC7B,UAAU,OAAO,OAAO,OAAO;AAAA,QAC/B,gBAAgB,OAAO,OAAO,OAAO;AAAA,QACrC,oBAAoB,OAAO,OAAO;AAAA,MAAA,CAClC;AAAA,IACF;AACA,QAAI,CAAC,OAAO,IAAI;AACf,aAAOD,WAAAA,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,MACR,QAAQ;AAAA,QACP,GAAG,MAAM,KAAK,sBAAsB,eAAe,OAAO,QAAQ,OAAO;AAAA,QACzE,aAAa,OAAO,OAAO;AAAA,MAAA;AAAA,IAC5B;AAAA,EAEF;AACD;;"}

package/dist/development/src/resolvers/mutation/person/IDPMutationResolver.js

@@ -1,14 +1,18 @@
 import { PermissionActions } from "../../../model/authorization/PermissionActions.js";
 import "@contember/authorization";
+import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import "@contember/database";
+import "../../../model/type/ApiKey.js";
+import "../../../model/authorization/CustomRolePermissions.js";
 import "../../../model/authorization/PermissionContext.js";
-import "../../../model/authorization/PermissionsFactory.js";
+import "../../../model/authorization/TargetIdentityPermission.js";
 import "@contember/schema";
-import "../../../model/type/ApiKey.js";
-import "@contember/database";
 import "node:crypto";
-import "../../../model/queries/apiKey/ApiKeyQuery.js";
+import { ResponseOk } from "../../../model/utils/Response.js";
 import "node:assert";
 import "../../../model/service/idp/IDPRevalidation.js";
+import "../../../model/service/idp/ClaimMapping.js";
+import "@contember/schema-utils";
 import "../../../model/service/idp/providers/AppleProvider.js";
 import "openid-client";
 import "@contember/typesafe";
@@ -16,7 +20,6 @@ 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 { createErrorResponse } from "../../errorUtils.js";
 class IDPMutationResolver {
@@ -62,6 +65,30 @@ class IDPMutationResolver {
       type: "idp_login",
       response: signIn
     });
+    if (signIn.ok && signIn.result.claimMappingAudit) {
+      const audit = signIn.result.claimMappingAudit;
+      await context.logAuthAction({
+        type: "idp_role_mapped",
+        response: new ResponseOk(null),
+        personId: signIn.result.person.id,
+        // the membership change affects the signing-in person — record it as the target too, so it
+        // surfaces in target_person_id audit queries like the other project_membership_* events.
+        targetPersonId: signIn.result.person.id,
+        identityProviderId: signIn.result.identityProviderId,
+        // the audit object IS the event payload ({ before, after, syncPolicy, unmatched }); pass it
+        // whole so the shape is single-sourced from ClaimMappingAudit (the refresh path does the same).
+        eventData: audit
+      });
+    }
+    if (signIn.ok && signIn.result.claimMappingFailed) {
+      await context.logAuthAction({
+        type: "idp_role_mapping_failed",
+        response: new ResponseOk(null),
+        personId: signIn.result.person.id,
+        targetPersonId: signIn.result.person.id,
+        identityProviderId: signIn.result.identityProviderId
+      });
+    }
     if (!signIn.ok) {
       return createErrorResponse(signIn.error, signIn.errorMessage);
     }

package/dist/development/src/resolvers/mutation/person/IDPMutationResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"IDPMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/IDPMutationResolver.ts"],"sourcesContent":["import {\n\tInitSignInIdpResponse,\n\tMutationInitSignInIdpArgs,\n\tMutationResolvers,\n\tMutationSignInIdpArgs,\n\tSignInIdpResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { IDPSignInManager, PermissionActions } from '../../../model/index.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { SignInResponseFactory } from '../../responseHelpers/SignInResponseFactory.js'\n\nexport class IDPMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly idpSignInManager: IDPSignInManager,\n\t\tprivate readonly signInResponseFactory: SignInResponseFactory,\n\t) {}\n\n\tasync initSignInIDP(\n\t\tparent: any,\n\t\targs: MutationInitSignInIdpArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InitSignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_CREATE_IDP_URL,\n\t\t\tmessage: 'You are not allowed to create a redirect URL for IDP',\n\t\t})\n\t\tconst result = await this.idpSignInManager.initSignInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t)\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\t\treturn { ok: true, errors: [], result: result.result }\n\t}\n\n\tasync signInIDP(parent: any, args: MutationSignInIdpArgs, context: TenantResolverContext): Promise<SignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_SIGN_IN_IDP,\n\t\t\tmessage: 'You are not allowed to person IDP sign in',\n\t\t})\n\t\tconst signIn = await this.idpSignInManager.signInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tsessionData: args.sessionData,\n\t\t\t\turl: args.idpResponse?.url,\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t\targs.expiration ?? undefined,\n\t\t\tcontext.httpInfo,\n\t\t\targs.options?.trustForwardedClientInfo === true && context.trustForwardedInfo,\n\t\t)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'idp_login',\n\t\t\tresponse: signIn,\n\t\t})\n\t\tif (!signIn.ok) {\n\t\t\treturn createErrorResponse(signIn.error, signIn.errorMessage)\n\t\t}\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t\tresult: {\n\t\t\t\t...await this.signInResponseFactory.createResponse(signIn.result, context),\n\t\t\t\tidpResponse: signIn.result.idpResponse,\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAYO,MAAM,oBAAiD;AAAA,EAC7D,YACkB,kBACA,uBAChB;AAFgB,SAAA,mBAAA;AACA,SAAA,wBAAA;AAAA,EACf;AAAA,EAEH,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,MAAA;AAAA,IACnB;AAED,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO,EAAE,IAAI,MAAM,QAAQ,CAAA,GAAI,QAAQ,OAAO,OAAA;AAAA,EAC/C;AAAA,EAEA,MAAM,UAAU,QAAa,MAA6B,SAA4D;AACrH,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,QAClB,KAAK,KAAK,aAAa;AAAA,QACvB,aAAa,KAAK;AAAA,MAAA;AAAA,MAEnB,KAAK,cAAc;AAAA,MACnB,QAAQ;AAAA,MACR,KAAK,SAAS,6BAA6B,QAAQ,QAAQ;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,IAAA,CACV;AACD,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,MACR,QAAQ;AAAA,QACP,GAAG,MAAM,KAAK,sBAAsB,eAAe,OAAO,QAAQ,OAAO;AAAA,QACzE,aAAa,OAAO,OAAO;AAAA,MAAA;AAAA,IAC5B;AAAA,EAEF;AACD;"}
+{"version":3,"file":"IDPMutationResolver.js","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/IDPMutationResolver.ts"],"sourcesContent":["import {\n\tInitSignInIdpResponse,\n\tMutationInitSignInIdpArgs,\n\tMutationResolvers,\n\tMutationSignInIdpArgs,\n\tSignInIdpResponse,\n} from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { IDPSignInManager, PermissionActions } from '../../../model/index.js'\nimport { createErrorResponse } from '../../errorUtils.js'\nimport { SignInResponseFactory } from '../../responseHelpers/SignInResponseFactory.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\n\nexport class IDPMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly idpSignInManager: IDPSignInManager,\n\t\tprivate readonly signInResponseFactory: SignInResponseFactory,\n\t) {}\n\n\tasync initSignInIDP(\n\t\tparent: any,\n\t\targs: MutationInitSignInIdpArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InitSignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_CREATE_IDP_URL,\n\t\t\tmessage: 'You are not allowed to create a redirect URL for IDP',\n\t\t})\n\t\tconst result = await this.idpSignInManager.initSignInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t)\n\t\tif (!result.ok) {\n\t\t\treturn createErrorResponse(result.error, result.errorMessage)\n\t\t}\n\t\treturn { ok: true, errors: [], result: result.result }\n\t}\n\n\tasync signInIDP(parent: any, args: MutationSignInIdpArgs, context: TenantResolverContext): Promise<SignInIdpResponse> {\n\t\tawait context.requireAccess({\n\t\t\taction: PermissionActions.PERSON_SIGN_IN_IDP,\n\t\t\tmessage: 'You are not allowed to person IDP sign in',\n\t\t})\n\t\tconst signIn = await this.idpSignInManager.signInIDP(\n\t\t\tcontext.db,\n\t\t\targs.identityProvider,\n\t\t\targs.data ?? {\n\t\t\t\tsessionData: args.sessionData,\n\t\t\t\turl: args.idpResponse?.url,\n\t\t\t\tredirectUrl: args.redirectUrl,\n\t\t\t},\n\t\t\targs.expiration ?? undefined,\n\t\t\tcontext.httpInfo,\n\t\t\targs.options?.trustForwardedClientInfo === true && context.trustForwardedInfo,\n\t\t)\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'idp_login',\n\t\t\tresponse: signIn,\n\t\t})\n\t\t// A09 — audit claim-mapping membership sync separately from the login itself, with a plain\n\t\t// `{ before, after }` diff. Emitted only when the mapping actually changed grants on this\n\t\t// sign-in (the manager returns null otherwise).\n\t\tif (signIn.ok && signIn.result.claimMappingAudit) {\n\t\t\tconst audit = signIn.result.claimMappingAudit\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'idp_role_mapped',\n\t\t\t\tresponse: new ResponseOk(null),\n\t\t\t\tpersonId: signIn.result.person.id,\n\t\t\t\t// the membership change affects the signing-in person — record it as the target too, so it\n\t\t\t\t// surfaces in target_person_id audit queries like the other project_membership_* events.\n\t\t\t\ttargetPersonId: signIn.result.person.id,\n\t\t\t\tidentityProviderId: signIn.result.identityProviderId,\n\t\t\t\t// the audit object IS the event payload ({ before, after, syncPolicy, unmatched }); pass it\n\t\t\t\t// whole so the shape is single-sourced from ClaimMappingAudit (the refresh path does the same).\n\t\t\t\teventData: audit,\n\t\t\t})\n\t\t}\n\t\t// A09 fail-open marker: the mapping was configured but its evaluation/apply failed and was\n\t\t// skipped so sign-in could proceed. Audited (no claim values in the payload) so a broken\n\t\t// mapping is visible to the operator instead of silently never applying.\n\t\tif (signIn.ok && signIn.result.claimMappingFailed) {\n\t\t\tawait context.logAuthAction({\n\t\t\t\ttype: 'idp_role_mapping_failed',\n\t\t\t\tresponse: new ResponseOk(null),\n\t\t\t\tpersonId: signIn.result.person.id,\n\t\t\t\ttargetPersonId: signIn.result.person.id,\n\t\t\t\tidentityProviderId: signIn.result.identityProviderId,\n\t\t\t})\n\t\t}\n\t\tif (!signIn.ok) {\n\t\t\treturn createErrorResponse(signIn.error, signIn.errorMessage)\n\t\t}\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t\tresult: {\n\t\t\t\t...await this.signInResponseFactory.createResponse(signIn.result, context),\n\t\t\t\tidpResponse: signIn.result.idpResponse,\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAaO,MAAM,oBAAiD;AAAA,EAC7D,YACkB,kBACA,uBAChB;AAFgB,SAAA,mBAAA;AACA,SAAA,wBAAA;AAAA,EACf;AAAA,EAEH,MAAM,cACL,QACA,MACA,SACiC;AACjC,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,MAAA;AAAA,IACnB;AAED,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO,EAAE,IAAI,MAAM,QAAQ,CAAA,GAAI,QAAQ,OAAO,OAAA;AAAA,EAC/C;AAAA,EAEA,MAAM,UAAU,QAAa,MAA6B,SAA4D;AACrH,UAAM,QAAQ,cAAc;AAAA,MAC3B,QAAQ,kBAAkB;AAAA,MAC1B,SAAS;AAAA,IAAA,CACT;AACD,UAAM,SAAS,MAAM,KAAK,iBAAiB;AAAA,MAC1C,QAAQ;AAAA,MACR,KAAK;AAAA,MACL,KAAK,QAAQ;AAAA,QACZ,aAAa,KAAK;AAAA,QAClB,KAAK,KAAK,aAAa;AAAA,QACvB,aAAa,KAAK;AAAA,MAAA;AAAA,MAEnB,KAAK,cAAc;AAAA,MACnB,QAAQ;AAAA,MACR,KAAK,SAAS,6BAA6B,QAAQ,QAAQ;AAAA,IAAA;AAE5D,UAAM,QAAQ,cAAc;AAAA,MAC3B,MAAM;AAAA,MACN,UAAU;AAAA,IAAA,CACV;AAID,QAAI,OAAO,MAAM,OAAO,OAAO,mBAAmB;AACjD,YAAM,QAAQ,OAAO,OAAO;AAC5B,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAU,IAAI,WAAW,IAAI;AAAA,QAC7B,UAAU,OAAO,OAAO,OAAO;AAAA;AAAA;AAAA,QAG/B,gBAAgB,OAAO,OAAO,OAAO;AAAA,QACrC,oBAAoB,OAAO,OAAO;AAAA;AAAA;AAAA,QAGlC,WAAW;AAAA,MAAA,CACX;AAAA,IACF;AAIA,QAAI,OAAO,MAAM,OAAO,OAAO,oBAAoB;AAClD,YAAM,QAAQ,cAAc;AAAA,QAC3B,MAAM;AAAA,QACN,UAAU,IAAI,WAAW,IAAI;AAAA,QAC7B,UAAU,OAAO,OAAO,OAAO;AAAA,QAC/B,gBAAgB,OAAO,OAAO,OAAO;AAAA,QACrC,oBAAoB,OAAO,OAAO;AAAA,MAAA,CAClC;AAAA,IACF;AACA,QAAI,CAAC,OAAO,IAAI;AACf,aAAO,oBAAoB,OAAO,OAAO,OAAO,YAAY;AAAA,IAC7D;AACA,WAAO;AAAA,MACN,IAAI;AAAA,MACJ,QAAQ,CAAA;AAAA,MACR,QAAQ;AAAA,QACP,GAAG,MAAM,KAAK,sBAAsB,eAAe,OAAO,QAAQ,OAAO;AAAA,QACzE,aAAa,OAAO,OAAO;AAAA,MAAA;AAAA,IAC5B;AAAA,EAEF;AACD;"}

package/dist/development/src/resolvers/mutation/person/InviteMutationResolver.cjs

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const PermissionActions = require("../../../model/authorization/PermissionActions.cjs");
 require("@contember/authorization");
+require("../../../model/queries/apiKey/ApiKeyQuery.cjs");
+require("@contember/database");
+require("../../../model/type/ApiKey.cjs");
+require("../../../model/authorization/CustomRolePermissions.cjs");
 require("../../../model/authorization/PermissionContext.cjs");
-require("../../../model/authorization/PermissionsFactory.cjs");
+require("../../../model/authorization/TargetIdentityPermission.cjs");
 require("@contember/schema");
-require("../../../model/type/ApiKey.cjs");
-require("@contember/database");
 const token = require("../../../model/utils/token.cjs");
 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/ClaimMapping.cjs");
+require("@contember/schema-utils");
 require("../../../model/service/idp/providers/AppleProvider.cjs");
 require("openid-client");
 require("@contember/typesafe");
@@ -19,7 +22,6 @@ 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");

package/dist/development/src/resolvers/mutation/person/InviteMutationResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"InviteMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/InviteMutationResolver.ts"],"sourcesContent":["import { InviteErrorCode, InviteResponse, MutationInviteArgs, MutationResolvers, MutationUnmanagedInviteArgs } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { InviteData, InviteManager, isTokenHash, MembershipValidator, PermissionActions, ProjectManager } from '../../../model/index.js'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { UserInputError } from '@contember/graphql-utils'\nimport { PersonResponseFactory } from '../../responseHelpers/PersonResponseFactory.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\nimport { Acl, JSONValue } from '@contember/schema'\n\nexport class InviteMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly inviteManager: InviteManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync invite(\n\t\tparent: any,\n\t\t{ projectSlug, email, name, memberships, options }: MutationInviteArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InviteResponse> {\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.PERSON_INVITE(memberships),\n\t\t\tmessage: 'You are not allowed to invite a person',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\treturn this.doInvite(context, {\n\t\t\temail,\n\t\t\tproject,\n\t\t\tmemberships,\n\t\t\tname: name ?? undefined,\n\t\t\temailVariant: options?.mailVariant || '',\n\t\t\tmethod: options?.method ?? 'CREATE_PASSWORD',\n\t\t}, { unmanaged: false })\n\t}\n\n\tasync unmanagedInvite(\n\t\tparent: any,\n\t\t{ projectSlug, email, memberships, password, options }: MutationUnmanagedInviteArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InviteResponse> {\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.PERSON_INVITE_UNMANAGED(memberships),\n\t\t\tmessage: 'You are not allowed to unmanaged person invite',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tif (typeof options?.resetTokenHash === 'string' && !isTokenHash(options?.resetTokenHash)) {\n\t\t\tthrow new UserInputError('Invalid format of resetTokenHash. Must be hex-encoded sha256.')\n\t\t}\n\t\treturn this.doInvite(context, {\n\t\t\temail,\n\t\t\tproject,\n\t\t\tmemberships,\n\t\t\tnoEmail: true,\n\t\t\tpassword: password ?? options?.password ?? undefined,\n\t\t\tpasswordResetTokenHash: options?.resetTokenHash ?? undefined,\n\t\t}, { unmanaged: true })\n\t}\n\n\tprivate async doInvite(\n\t\tcontext: TenantResolverContext,\n\t\tinvite: InviteData,\n\t\taudit: { unmanaged: boolean },\n\t): Promise<InviteResponse> {\n\t\tconst validationResult = await this.membershipValidator.validate(invite.project.slug, invite.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\t\tconst response = await this.inviteManager.invite(context.db, invite)\n\n\t\tif (!response.ok) {\n\t\t\treturn createErrorResponse(response.error, response.errorMessage)\n\t\t}\n\t\tconst result = response.result\n\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'person_invite',\n\t\t\tresponse: new ResponseOk(null),\n\t\t\ttargetPersonId: result.person.id,\n\t\t\tpersonInput: invite.email,\n\t\t\teventData: {\n\t\t\t\tprojectSlug: invite.project.slug,\n\t\t\t\tisNew: result.isNew,\n\t\t\t\tunmanaged: audit.unmanaged,\n\t\t\t\tmemberships: invite.memberships.map(membershipToJson),\n\t\t\t},\n\t\t})\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t\tresult: {\n\t\t\t\tperson: PersonResponseFactory.createPersonResponse(result.person),\n\t\t\t\tisNew: result.isNew,\n\t\t\t},\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":["PermissionActions","createProjectNotFoundResponse","isTokenHash","UserInputError","createMembershipValidationErrorResult","createErrorResponse","ResponseOk","PersonResponseFactory"],"mappings":"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"}
+{"version":3,"file":"InviteMutationResolver.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/resolvers/mutation/person/InviteMutationResolver.ts"],"sourcesContent":["import { InviteErrorCode, InviteResponse, MutationInviteArgs, MutationResolvers, MutationUnmanagedInviteArgs } from '../../../schema/index.js'\nimport { TenantResolverContext } from '../../TenantResolverContext.js'\nimport { InviteData, InviteManager, isTokenHash, MembershipValidator, PermissionActions, ProjectManager } from '../../../model/index.js'\nimport { createMembershipValidationErrorResult } from '../../membershipUtils.js'\nimport { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils.js'\nimport { UserInputError } from '@contember/graphql-utils'\nimport { PersonResponseFactory } from '../../responseHelpers/PersonResponseFactory.js'\nimport { ResponseOk } from '../../../model/utils/Response.js'\nimport { Acl, JSONValue } from '@contember/schema'\n\nexport class InviteMutationResolver implements MutationResolvers {\n\tconstructor(\n\t\tprivate readonly inviteManager: InviteManager,\n\t\tprivate readonly projectManager: ProjectManager,\n\t\tprivate readonly membershipValidator: MembershipValidator,\n\t) {}\n\n\tasync invite(\n\t\tparent: any,\n\t\t{ projectSlug, email, name, memberships, options }: MutationInviteArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InviteResponse> {\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.PERSON_INVITE(memberships),\n\t\t\tmessage: 'You are not allowed to invite a person',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\treturn this.doInvite(context, {\n\t\t\temail,\n\t\t\tproject,\n\t\t\tmemberships,\n\t\t\tname: name ?? undefined,\n\t\t\temailVariant: options?.mailVariant || '',\n\t\t\tmethod: options?.method ?? 'CREATE_PASSWORD',\n\t\t}, { unmanaged: false })\n\t}\n\n\tasync unmanagedInvite(\n\t\tparent: any,\n\t\t{ projectSlug, email, memberships, password, options }: MutationUnmanagedInviteArgs,\n\t\tcontext: TenantResolverContext,\n\t): Promise<InviteResponse> {\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.PERSON_INVITE_UNMANAGED(memberships),\n\t\t\tmessage: 'You are not allowed to unmanaged person invite',\n\t\t})\n\t\tif (!project) {\n\t\t\treturn createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)\n\t\t}\n\t\tif (typeof options?.resetTokenHash === 'string' && !isTokenHash(options?.resetTokenHash)) {\n\t\t\tthrow new UserInputError('Invalid format of resetTokenHash. Must be hex-encoded sha256.')\n\t\t}\n\t\treturn this.doInvite(context, {\n\t\t\temail,\n\t\t\tproject,\n\t\t\tmemberships,\n\t\t\tnoEmail: true,\n\t\t\tpassword: password ?? options?.password ?? undefined,\n\t\t\tpasswordResetTokenHash: options?.resetTokenHash ?? undefined,\n\t\t}, { unmanaged: true })\n\t}\n\n\tprivate async doInvite(\n\t\tcontext: TenantResolverContext,\n\t\tinvite: InviteData,\n\t\taudit: { unmanaged: boolean },\n\t): Promise<InviteResponse> {\n\t\tconst validationResult = await this.membershipValidator.validate(invite.project.slug, invite.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\t\tconst response = await this.inviteManager.invite(context.db, invite)\n\n\t\tif (!response.ok) {\n\t\t\treturn createErrorResponse(response.error, response.errorMessage)\n\t\t}\n\t\tconst result = response.result\n\n\t\tawait context.logAuthAction({\n\t\t\ttype: 'person_invite',\n\t\t\tresponse: new ResponseOk(null),\n\t\t\ttargetPersonId: result.person.id,\n\t\t\tpersonInput: invite.email,\n\t\t\teventData: {\n\t\t\t\tprojectSlug: invite.project.slug,\n\t\t\t\tisNew: result.isNew,\n\t\t\t\tunmanaged: audit.unmanaged,\n\t\t\t\tmemberships: invite.memberships.map(membershipToJson),\n\t\t\t},\n\t\t})\n\n\t\treturn {\n\t\t\tok: true,\n\t\t\terrors: [],\n\t\t\tresult: {\n\t\t\t\tperson: PersonResponseFactory.createPersonResponse(result.person),\n\t\t\t\tisNew: result.isNew,\n\t\t\t},\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":["PermissionActions","createProjectNotFoundResponse","isTokenHash","UserInputError","createMembershipValidationErrorResult","createErrorResponse","ResponseOk","PersonResponseFactory"],"mappings":"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"}