@contember/engine-tenant-api 2.1.0-alpha.3 → 2.1.0-alpha.30

package/dist/development/src/model/service/PersonAccessManager.cjs

@@ -1,42 +1,20 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../queries/apiKey/ApiKeyQuery.cjs");
-require("@contember/database");
-const PersonQuery = require("../queries/person/PersonQuery.cjs");
-require("../authorization/PermissionActions.cjs");
-require("@contember/authorization");
-require("../authorization/PermissionContext.cjs");
-require("../authorization/PermissionsFactory.cjs");
-require("@contember/schema");
 const DisablePersonCommand = require("../commands/person/DisablePersonCommand.cjs");
 const Response = require("../utils/Response.cjs");
 class PersonAccessManager {
   constructor(apiKeyManager) {
     this.apiKeyManager = apiKeyManager;
   }
-  async disablePerson(dbContext, personId) {
-    const result = await dbContext.transaction(async (trx) => {
-      const personRow = await trx.queryHandler.fetch(
-        PersonQuery.PersonQuery.byId(personId)
-      );
-      if (personRow === null) {
-        return "PERSON_NOT_FOUND";
+  async disablePerson(dbContext, person) {
+    return await dbContext.transaction(async (trx) => {
+      if (person.disabled_at !== null) {
+        return new Response.ResponseError("PERSON_ALREADY_DISABLED", "Person is already disabled");
       }
-      if (personRow.disabled_at !== null) {
-        return "PERSON_ALREADY_DISABLED";
-      }
-      await this.disablePersonAccount(trx, personRow.id);
-      await this.disableIdentityApiKeys(trx, personRow.identity_id);
-      return null;
+      await this.disablePersonAccount(trx, person.id);
+      await this.disableIdentityApiKeys(trx, person.identity_id);
+      return new Response.ResponseOk(null);
     });
-    switch (result) {
-      case null:
-        return new Response.ResponseOk(null);
-      case "PERSON_ALREADY_DISABLED":
-        return new Response.ResponseError(result, "Person is already disable");
-      case "PERSON_NOT_FOUND":
-        return new Response.ResponseError(result, "Person not found");
-    }
   }
   async disablePersonAccount(dbContext, personId) {
     await dbContext.commandBus.execute(new DisablePersonCommand.DisablePersonCommand(personId));

package/dist/development/src/model/service/PersonAccessManager.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"PersonAccessManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/PersonAccessManager.ts"],"sourcesContent":["import { PersonQuery } from '../queries'\nimport { DatabaseContext } from '../utils'\nimport { DisablePersonCommand } from '../commands/person/DisablePersonCommand'\nimport { ApiKeyManager } from './apiKey'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { DisablePersonErrorCode } from '../../schema'\n\nclass PersonAccessManager {\n\n\tconstructor(private readonly apiKeyManager: ApiKeyManager) {}\n\n\tasync disablePerson(dbContext: DatabaseContext, personId: string): Promise<PersonDisableAccessResponse> {\n\t\tconst result = await dbContext.transaction(async trx => {\n\t\t\tconst personRow = await trx.queryHandler.fetch(\n\t\t\t\tPersonQuery.byId(personId),\n\t\t\t)\n\n\t\t\tif (personRow === null) {\n\t\t\t\treturn 'PERSON_NOT_FOUND'\n\t\t\t}\n\n\t\t\tif (personRow.disabled_at !== null) {\n\t\t\t\treturn 'PERSON_ALREADY_DISABLED'\n\t\t\t}\n\n\t\t\t// Deactivate person & invalidate all api keys associated with person identity\n\t\t\tawait this.disablePersonAccount(trx, personRow.id)\n\t\t\tawait this.disableIdentityApiKeys(trx, personRow.identity_id)\n\n\t\t\treturn null\n\t\t})\n\n\t\tswitch (result) {\n\t\t\tcase null:\n\t\t\t\treturn new ResponseOk(null)\n\n\t\t\tcase 'PERSON_ALREADY_DISABLED':\n\t\t\t\treturn new ResponseError(result, 'Person is already disable')\n\n\t\t\tcase 'PERSON_NOT_FOUND':\n\t\t\t\treturn new ResponseError(result, 'Person not found')\n\t\t}\n\t}\n\n\tprivate async disablePersonAccount(dbContext: DatabaseContext, personId: string) {\n\t\tawait dbContext.commandBus.execute(new DisablePersonCommand(personId))\n\t}\n\n\tprivate async disableIdentityApiKeys(dbContext: DatabaseContext, personIdentityId: string) {\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(dbContext, personIdentityId)\n\t}\n}\n\nexport type PersonDisableAccessResponse = Response<null, DisablePersonErrorCode>\n\nexport { PersonAccessManager }\n"],"names":["PersonQuery","ResponseOk","ResponseError","DisablePersonCommand"],"mappings":";;;;;;;;;;;;AAOA,MAAM,oBAAoB;AAAA,EAEzB,YAA6B,eAA8B;AAA9B,SAAA,gBAAA;AAAA,EAAA;AAAA,EAE7B,MAAM,cAAc,WAA4B,UAAwD;AACvG,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,QAAO;AACjD,YAAA,YAAY,MAAM,IAAI,aAAa;AAAA,QACxCA,YAAA,YAAY,KAAK,QAAQ;AAAA,MAC1B;AAEA,UAAI,cAAc,MAAM;AAChB,eAAA;AAAA,MAAA;AAGJ,UAAA,UAAU,gBAAgB,MAAM;AAC5B,eAAA;AAAA,MAAA;AAIR,YAAM,KAAK,qBAAqB,KAAK,UAAU,EAAE;AACjD,YAAM,KAAK,uBAAuB,KAAK,UAAU,WAAW;AAErD,aAAA;AAAA,IAAA,CACP;AAED,YAAQ,QAAQ;AAAA,MACf,KAAK;AACG,eAAA,IAAIC,oBAAW,IAAI;AAAA,MAE3B,KAAK;AACG,eAAA,IAAIC,SAAAA,cAAc,QAAQ,2BAA2B;AAAA,MAE7D,KAAK;AACG,eAAA,IAAIA,SAAAA,cAAc,QAAQ,kBAAkB;AAAA,IAAA;AAAA,EACrD;AAAA,EAGD,MAAc,qBAAqB,WAA4B,UAAkB;AAChF,UAAM,UAAU,WAAW,QAAQ,IAAIC,qBAAA,qBAAqB,QAAQ,CAAC;AAAA,EAAA;AAAA,EAGtE,MAAc,uBAAuB,WAA4B,kBAA0B;AAC1F,UAAM,KAAK,cAAc,uBAAuB,WAAW,gBAAgB;AAAA,EAAA;AAE7E;;"}
+{"version":3,"file":"PersonAccessManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/PersonAccessManager.ts"],"sourcesContent":["import { PersonQuery, PersonRow } from '../queries'\nimport { DatabaseContext } from '../utils'\nimport { DisablePersonCommand } from '../commands/person/DisablePersonCommand'\nimport { ApiKeyManager } from './apiKey'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { DisablePersonErrorCode } from '../../schema'\n\nclass PersonAccessManager {\n\n\tconstructor(private readonly apiKeyManager: ApiKeyManager) {}\n\n\tasync disablePerson(dbContext: DatabaseContext, person: PersonRow): Promise<PersonDisableAccessResponse> {\n\t\treturn await dbContext.transaction(async trx => {\n\t\t\tif (person.disabled_at !== null) {\n\t\t\t\treturn new ResponseError('PERSON_ALREADY_DISABLED', 'Person is already disabled')\n\t\t\t}\n\n\t\t\t// Deactivate person & invalidate all api keys associated with person identity\n\t\t\tawait this.disablePersonAccount(trx, person.id)\n\t\t\tawait this.disableIdentityApiKeys(trx, person.identity_id)\n\n\t\t\treturn new ResponseOk(null)\n\t\t})\n\t}\n\n\tprivate async disablePersonAccount(dbContext: DatabaseContext, personId: string) {\n\t\tawait dbContext.commandBus.execute(new DisablePersonCommand(personId))\n\t}\n\n\tprivate async disableIdentityApiKeys(dbContext: DatabaseContext, personIdentityId: string) {\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(dbContext, personIdentityId)\n\t}\n}\n\nexport type PersonDisableAccessResponse = Response<null, DisablePersonErrorCode>\n\nexport { PersonAccessManager }\n"],"names":["ResponseError","ResponseOk","DisablePersonCommand"],"mappings":";;;;AAOA,MAAM,oBAAoB;AAAA,EAEzB,YAA6B,eAA8B;AAA9B,SAAA,gBAAA;AAAA,EAAA;AAAA,EAE7B,MAAM,cAAc,WAA4B,QAAyD;AACxG,WAAO,MAAM,UAAU,YAAY,OAAM,QAAO;AAC3C,UAAA,OAAO,gBAAgB,MAAM;AACzB,eAAA,IAAIA,SAAAA,cAAc,2BAA2B,4BAA4B;AAAA,MAAA;AAIjF,YAAM,KAAK,qBAAqB,KAAK,OAAO,EAAE;AAC9C,YAAM,KAAK,uBAAuB,KAAK,OAAO,WAAW;AAElD,aAAA,IAAIC,oBAAW,IAAI;AAAA,IAAA,CAC1B;AAAA,EAAA;AAAA,EAGF,MAAc,qBAAqB,WAA4B,UAAkB;AAChF,UAAM,UAAU,WAAW,QAAQ,IAAIC,qBAAA,qBAAqB,QAAQ,CAAC;AAAA,EAAA;AAAA,EAGtE,MAAc,uBAAuB,WAA4B,kBAA0B;AAC1F,UAAM,KAAK,cAAc,uBAAuB,WAAW,gBAAgB;AAAA,EAAA;AAE7E;;"}

package/dist/development/src/model/service/PersonAccessManager.js

@@ -1,40 +1,18 @@
-import "../queries/apiKey/ApiKeyQuery.js";
-import "@contember/database";
-import { PersonQuery } from "../queries/person/PersonQuery.js";
-import "../authorization/PermissionActions.js";
-import "@contember/authorization";
-import "../authorization/PermissionContext.js";
-import "../authorization/PermissionsFactory.js";
-import "@contember/schema";
 import { DisablePersonCommand } from "../commands/person/DisablePersonCommand.js";
 import { ResponseError, ResponseOk } from "../utils/Response.js";
 class PersonAccessManager {
   constructor(apiKeyManager) {
     this.apiKeyManager = apiKeyManager;
   }
-  async disablePerson(dbContext, personId) {
-    const result = await dbContext.transaction(async (trx) => {
-      const personRow = await trx.queryHandler.fetch(
-        PersonQuery.byId(personId)
-      );
-      if (personRow === null) {
-        return "PERSON_NOT_FOUND";
+  async disablePerson(dbContext, person) {
+    return await dbContext.transaction(async (trx) => {
+      if (person.disabled_at !== null) {
+        return new ResponseError("PERSON_ALREADY_DISABLED", "Person is already disabled");
       }
-      if (personRow.disabled_at !== null) {
-        return "PERSON_ALREADY_DISABLED";
-      }
-      await this.disablePersonAccount(trx, personRow.id);
-      await this.disableIdentityApiKeys(trx, personRow.identity_id);
-      return null;
+      await this.disablePersonAccount(trx, person.id);
+      await this.disableIdentityApiKeys(trx, person.identity_id);
+      return new ResponseOk(null);
     });
-    switch (result) {
-      case null:
-        return new ResponseOk(null);
-      case "PERSON_ALREADY_DISABLED":
-        return new ResponseError(result, "Person is already disable");
-      case "PERSON_NOT_FOUND":
-        return new ResponseError(result, "Person not found");
-    }
   }
   async disablePersonAccount(dbContext, personId) {
     await dbContext.commandBus.execute(new DisablePersonCommand(personId));

package/dist/development/src/model/service/PersonAccessManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"PersonAccessManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/PersonAccessManager.ts"],"sourcesContent":["import { PersonQuery } from '../queries'\nimport { DatabaseContext } from '../utils'\nimport { DisablePersonCommand } from '../commands/person/DisablePersonCommand'\nimport { ApiKeyManager } from './apiKey'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { DisablePersonErrorCode } from '../../schema'\n\nclass PersonAccessManager {\n\n\tconstructor(private readonly apiKeyManager: ApiKeyManager) {}\n\n\tasync disablePerson(dbContext: DatabaseContext, personId: string): Promise<PersonDisableAccessResponse> {\n\t\tconst result = await dbContext.transaction(async trx => {\n\t\t\tconst personRow = await trx.queryHandler.fetch(\n\t\t\t\tPersonQuery.byId(personId),\n\t\t\t)\n\n\t\t\tif (personRow === null) {\n\t\t\t\treturn 'PERSON_NOT_FOUND'\n\t\t\t}\n\n\t\t\tif (personRow.disabled_at !== null) {\n\t\t\t\treturn 'PERSON_ALREADY_DISABLED'\n\t\t\t}\n\n\t\t\t// Deactivate person & invalidate all api keys associated with person identity\n\t\t\tawait this.disablePersonAccount(trx, personRow.id)\n\t\t\tawait this.disableIdentityApiKeys(trx, personRow.identity_id)\n\n\t\t\treturn null\n\t\t})\n\n\t\tswitch (result) {\n\t\t\tcase null:\n\t\t\t\treturn new ResponseOk(null)\n\n\t\t\tcase 'PERSON_ALREADY_DISABLED':\n\t\t\t\treturn new ResponseError(result, 'Person is already disable')\n\n\t\t\tcase 'PERSON_NOT_FOUND':\n\t\t\t\treturn new ResponseError(result, 'Person not found')\n\t\t}\n\t}\n\n\tprivate async disablePersonAccount(dbContext: DatabaseContext, personId: string) {\n\t\tawait dbContext.commandBus.execute(new DisablePersonCommand(personId))\n\t}\n\n\tprivate async disableIdentityApiKeys(dbContext: DatabaseContext, personIdentityId: string) {\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(dbContext, personIdentityId)\n\t}\n}\n\nexport type PersonDisableAccessResponse = Response<null, DisablePersonErrorCode>\n\nexport { PersonAccessManager }\n"],"names":[],"mappings":";;;;;;;;;;AAOA,MAAM,oBAAoB;AAAA,EAEzB,YAA6B,eAA8B;AAA9B,SAAA,gBAAA;AAAA,EAAA;AAAA,EAE7B,MAAM,cAAc,WAA4B,UAAwD;AACvG,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,QAAO;AACjD,YAAA,YAAY,MAAM,IAAI,aAAa;AAAA,QACxC,YAAY,KAAK,QAAQ;AAAA,MAC1B;AAEA,UAAI,cAAc,MAAM;AAChB,eAAA;AAAA,MAAA;AAGJ,UAAA,UAAU,gBAAgB,MAAM;AAC5B,eAAA;AAAA,MAAA;AAIR,YAAM,KAAK,qBAAqB,KAAK,UAAU,EAAE;AACjD,YAAM,KAAK,uBAAuB,KAAK,UAAU,WAAW;AAErD,aAAA;AAAA,IAAA,CACP;AAED,YAAQ,QAAQ;AAAA,MACf,KAAK;AACG,eAAA,IAAI,WAAW,IAAI;AAAA,MAE3B,KAAK;AACG,eAAA,IAAI,cAAc,QAAQ,2BAA2B;AAAA,MAE7D,KAAK;AACG,eAAA,IAAI,cAAc,QAAQ,kBAAkB;AAAA,IAAA;AAAA,EACrD;AAAA,EAGD,MAAc,qBAAqB,WAA4B,UAAkB;AAChF,UAAM,UAAU,WAAW,QAAQ,IAAI,qBAAqB,QAAQ,CAAC;AAAA,EAAA;AAAA,EAGtE,MAAc,uBAAuB,WAA4B,kBAA0B;AAC1F,UAAM,KAAK,cAAc,uBAAuB,WAAW,gBAAgB;AAAA,EAAA;AAE7E;"}
+{"version":3,"file":"PersonAccessManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/PersonAccessManager.ts"],"sourcesContent":["import { PersonQuery, PersonRow } from '../queries'\nimport { DatabaseContext } from '../utils'\nimport { DisablePersonCommand } from '../commands/person/DisablePersonCommand'\nimport { ApiKeyManager } from './apiKey'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { DisablePersonErrorCode } from '../../schema'\n\nclass PersonAccessManager {\n\n\tconstructor(private readonly apiKeyManager: ApiKeyManager) {}\n\n\tasync disablePerson(dbContext: DatabaseContext, person: PersonRow): Promise<PersonDisableAccessResponse> {\n\t\treturn await dbContext.transaction(async trx => {\n\t\t\tif (person.disabled_at !== null) {\n\t\t\t\treturn new ResponseError('PERSON_ALREADY_DISABLED', 'Person is already disabled')\n\t\t\t}\n\n\t\t\t// Deactivate person & invalidate all api keys associated with person identity\n\t\t\tawait this.disablePersonAccount(trx, person.id)\n\t\t\tawait this.disableIdentityApiKeys(trx, person.identity_id)\n\n\t\t\treturn new ResponseOk(null)\n\t\t})\n\t}\n\n\tprivate async disablePersonAccount(dbContext: DatabaseContext, personId: string) {\n\t\tawait dbContext.commandBus.execute(new DisablePersonCommand(personId))\n\t}\n\n\tprivate async disableIdentityApiKeys(dbContext: DatabaseContext, personIdentityId: string) {\n\t\tawait this.apiKeyManager.disableIdentityApiKeys(dbContext, personIdentityId)\n\t}\n}\n\nexport type PersonDisableAccessResponse = Response<null, DisablePersonErrorCode>\n\nexport { PersonAccessManager }\n"],"names":[],"mappings":";;AAOA,MAAM,oBAAoB;AAAA,EAEzB,YAA6B,eAA8B;AAA9B,SAAA,gBAAA;AAAA,EAAA;AAAA,EAE7B,MAAM,cAAc,WAA4B,QAAyD;AACxG,WAAO,MAAM,UAAU,YAAY,OAAM,QAAO;AAC3C,UAAA,OAAO,gBAAgB,MAAM;AACzB,eAAA,IAAI,cAAc,2BAA2B,4BAA4B;AAAA,MAAA;AAIjF,YAAM,KAAK,qBAAqB,KAAK,OAAO,EAAE;AAC9C,YAAM,KAAK,uBAAuB,KAAK,OAAO,WAAW;AAElD,aAAA,IAAI,WAAW,IAAI;AAAA,IAAA,CAC1B;AAAA,EAAA;AAAA,EAGF,MAAc,qBAAqB,WAA4B,UAAkB;AAChF,UAAM,UAAU,WAAW,QAAQ,IAAI,qBAAqB,QAAQ,CAAC;AAAA,EAAA;AAAA,EAGtE,MAAc,uBAAuB,WAA4B,kBAA0B;AAC1F,UAAM,KAAK,cAAc,uBAAuB,WAAW,gBAAgB;AAAA,EAAA;AAE7E;"}

package/dist/development/src/model/service/SignInManager.cjs

@@ -10,6 +10,7 @@ require("../authorization/PermissionContext.cjs");
 require("../authorization/PermissionsFactory.cjs");
 require("@contember/schema");
 const Response = require("../utils/Response.cjs");
+const AuthLogService = require("./AuthLogService.cjs");
 class SignInManager {
   constructor(apiKeyManager, providers, otpAuthenticator) {
     this.apiKeyManager = apiKeyManager;
@@ -17,55 +18,79 @@ class SignInManager {
     this.otpAuthenticator = otpAuthenticator;
   }
   async signIn(dbContext, email, password, expiration, otpCode) {
-    const personRow = await dbContext.queryHandler.fetch(PersonQuery.PersonQuery.byEmail(email));
-    if (personRow === null) {
-      return new Response.ResponseError("UNKNOWN_EMAIL", `Person with email ${email} not found`);
+    const person = await dbContext.queryHandler.fetch(PersonQuery.PersonQuery.byEmail(email));
+    if (person === null) {
+      return new Response.ResponseError("UNKNOWN_EMAIL", `Person with email ${email} not found`, {
+        [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+          personInput: email
+        })
+      });
     }
-    if (!personRow.password_hash) {
-      return new Response.ResponseError("NO_PASSWORD_SET", `No password set`);
+    const authLogData = {
+      [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+        personInput: email,
+        personId: person.id
+      })
+    };
+    if (!person.password_hash) {
+      return new Response.ResponseError("NO_PASSWORD_SET", `No password set`, authLogData);
     }
-    if (personRow.disabled_at !== null) {
-      return new Response.ResponseError("PERSON_DISABLED", `Person is disabled`);
+    if (person.disabled_at !== null) {
+      return new Response.ResponseError("PERSON_DISABLED", `Person is disabled`, authLogData);
     }
-    const passwordValid = await this.providers.bcryptCompare(password, personRow.password_hash);
+    const passwordValid = await this.providers.bcryptCompare(password, person.password_hash);
     if (!passwordValid) {
-      return new Response.ResponseError("INVALID_PASSWORD", `Password does not match`);
+      return new Response.ResponseError("INVALID_PASSWORD", `Password does not match`, authLogData);
     }
-    if (personRow.otp_uri && personRow.otp_activated_at) {
+    if (person.otp_uri && person.otp_activated_at) {
       if (!otpCode) {
-        return new Response.ResponseError("OTP_REQUIRED", `2FA is enabled. OTP token is required`);
+        return new Response.ResponseError("OTP_REQUIRED", `2FA is enabled. OTP token is required`, authLogData);
       }
-      if (!this.otpAuthenticator.validate({ uri: personRow.otp_uri }, otpCode)) {
-        return new Response.ResponseError("INVALID_OTP_TOKEN", "OTP token validation has failed");
+      if (!this.otpAuthenticator.validate({ uri: person.otp_uri }, otpCode)) {
+        return new Response.ResponseError("INVALID_OTP_TOKEN", "OTP token validation has failed", authLogData);
       }
     }
-    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration);
-    return new Response.ResponseOk(new SignInResult(personRow, sessionToken));
+    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration);
+    return new Response.ResponseOk({ person, token: sessionToken, ...authLogData });
   }
   async createSessionToken(dbContext, personIdentifier, expiration, verifier) {
-    const personRow = await dbContext.queryHandler.fetch(PersonQuery.PersonQuery.byUniqueIdentifier(personIdentifier));
-    if (personRow === null) {
+    const person = await dbContext.queryHandler.fetch(PersonQuery.PersonQuery.byUniqueIdentifier(personIdentifier));
+    if (person === null) {
       if (personIdentifier.type === "email") {
-        return new Response.ResponseError("UNKNOWN_EMAIL", `Person with email ${personIdentifier.email} not found`);
+        return new Response.ResponseError("UNKNOWN_EMAIL", `Person with email ${personIdentifier.email} not found`, {
+          [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+            personInput: personIdentifier.email
+          })
+        });
       } else if (personIdentifier.type === "id") {
-        return new Response.ResponseError("UNKNOWN_PERSON_ID", `Person with id ${personIdentifier.id} not found`);
+        return new Response.ResponseError("UNKNOWN_PERSON_ID", `Person with id ${personIdentifier.id} not found`, {
+          [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+            personInput: personIdentifier.id
+          })
+        });
       }
       throw new exceptions.ImplementationException();
     }
-    if (personRow.disabled_at !== null) {
-      return new Response.ResponseError("PERSON_DISABLED", `Person with id ${personRow.id} is disabled`);
+    const inputValue = personIdentifier.type === "email" ? personIdentifier.email : personIdentifier.id;
+    if (person.disabled_at !== null) {
+      return new Response.ResponseError("PERSON_DISABLED", `Person with id ${person.id} is disabled`, {
+        [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+          personId: person.id,
+          personInput: inputValue
+        })
+      });
     }
-    await verifier?.(personRow);
-    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration);
-    return new Response.ResponseOk(new SignInResult(personRow, sessionToken));
-  }
-}
-class SignInResult {
-  constructor(person, token) {
-    this.person = person;
-    this.token = token;
+    await verifier?.(person);
+    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration);
+    return new Response.ResponseOk({
+      person,
+      token: sessionToken,
+      [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+        personId: person.id,
+        personInput: inputValue
+      })
+    });
   }
 }
 exports.SignInManager = SignInManager;
-exports.SignInResult = SignInResult;
 //# sourceMappingURL=SignInManager.cjs.map

package/dist/development/src/model/service/SignInManager.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SignInManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignInManager.ts"],"sourcesContent":["import { CreateSessionTokenErrorCode, SignInErrorCode } from '../../schema'\nimport { ApiKeyManager, OtpAuthenticator } from '../service'\nimport { PersonQuery, PersonRow, PersonUniqueIdentifier } from '../queries'\nimport { Providers } from '../providers'\nimport { DatabaseContext } from '../utils'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { ImplementationException } from '../../exceptions'\n\nclass SignInManager {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly providers: Providers,\n\t\tprivate readonly otpAuthenticator: OtpAuthenticator,\n\t) {}\n\n\tasync signIn(dbContext: DatabaseContext, email: string, password: string, expiration?: number, otpCode?: string): Promise<SignInResponse> {\n\t\tconst personRow = await dbContext.queryHandler.fetch(PersonQuery.byEmail(email))\n\n\t\tif (personRow === null) {\n\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${email} not found`)\n\t\t}\n\n\t\tif (!personRow.password_hash) {\n\t\t\treturn new ResponseError('NO_PASSWORD_SET', `No password set`)\n\t\t}\n\n\t\tif (personRow.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person is disabled`)\n\t\t}\n\n\t\tconst passwordValid = await this.providers.bcryptCompare(password, personRow.password_hash)\n\n\t\tif (!passwordValid) {\n\t\t\treturn new ResponseError('INVALID_PASSWORD', `Password does not match`)\n\t\t}\n\n\t\tif (personRow.otp_uri && personRow.otp_activated_at) {\n\t\t\tif (!otpCode) {\n\t\t\t\treturn new ResponseError('OTP_REQUIRED', `2FA is enabled. OTP token is required`)\n\t\t\t}\n\n\t\t\tif (!this.otpAuthenticator.validate({ uri: personRow.otp_uri }, otpCode)) {\n\t\t\t\treturn new ResponseError('INVALID_OTP_TOKEN', 'OTP token validation has failed')\n\t\t\t}\n\t\t}\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration)\n\n\t\treturn new ResponseOk(new SignInResult(personRow, sessionToken))\n\t}\n\n\tasync createSessionToken(\n\t\tdbContext: DatabaseContext,\n\t\tpersonIdentifier: PersonUniqueIdentifier,\n\t\texpiration?: number,\n\t\tverifier?: (person: PersonRow) => Promise<void>,\n\t): Promise<CreateSessionTokenResponse> {\n\t\tconst personRow = await dbContext.queryHandler.fetch(PersonQuery.byUniqueIdentifier(personIdentifier))\n\n\t\tif (personRow === null) {\n\t\t\tif (personIdentifier.type === 'email') {\n\t\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${personIdentifier.email} not found`)\n\n\t\t\t} else if (personIdentifier.type === 'id') {\n\t\t\t\treturn new ResponseError('UNKNOWN_PERSON_ID', `Person with id ${personIdentifier.id} not found`)\n\t\t\t}\n\n\t\t\tthrow new ImplementationException()\n\t\t}\n\n\t\tif (personRow.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person with id ${personRow.id} is disabled`)\n\t\t}\n\n\t\tawait verifier?.(personRow)\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration)\n\t\treturn new ResponseOk(new SignInResult(personRow, sessionToken))\n\t}\n}\n\nexport class SignInResult {\n\tconstructor(\n\t\tpublic readonly person: PersonRow,\n\t\tpublic readonly token: string,\n\t) {}\n}\n\nexport type SignInResponse = Response<SignInResult, SignInErrorCode>\nexport type CreateSessionTokenResponse = Response<SignInResult, CreateSessionTokenErrorCode>\n\nexport { SignInManager }\n"],"names":["PersonQuery","ResponseError","ResponseOk","ImplementationException"],"mappings":";;;;;;;;;;;;AAQA,MAAM,cAAc;AAAA,EACnB,YACkB,eACA,WACA,kBAChB;AAHgB,SAAA,gBAAA;AACA,SAAA,YAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGlB,MAAM,OAAO,WAA4B,OAAe,UAAkB,YAAqB,SAA2C;AACnI,UAAA,YAAY,MAAM,UAAU,aAAa,MAAMA,wBAAY,QAAQ,KAAK,CAAC;AAE/E,QAAI,cAAc,MAAM;AACvB,aAAO,IAAIC,SAAA,cAAc,iBAAiB,qBAAqB,KAAK,YAAY;AAAA,IAAA;AAG7E,QAAA,CAAC,UAAU,eAAe;AACtB,aAAA,IAAIA,SAAc,cAAA,mBAAmB,iBAAiB;AAAA,IAAA;AAG1D,QAAA,UAAU,gBAAgB,MAAM;AAC5B,aAAA,IAAIA,SAAc,cAAA,mBAAmB,oBAAoB;AAAA,IAAA;AAGjE,UAAM,gBAAgB,MAAM,KAAK,UAAU,cAAc,UAAU,UAAU,aAAa;AAE1F,QAAI,CAAC,eAAe;AACZ,aAAA,IAAIA,SAAc,cAAA,oBAAoB,yBAAyB;AAAA,IAAA;AAGnE,QAAA,UAAU,WAAW,UAAU,kBAAkB;AACpD,UAAI,CAAC,SAAS;AACN,eAAA,IAAIA,SAAc,cAAA,gBAAgB,uCAAuC;AAAA,MAAA;AAG7E,UAAA,CAAC,KAAK,iBAAiB,SAAS,EAAE,KAAK,UAAU,WAAW,OAAO,GAAG;AAClE,eAAA,IAAIA,SAAAA,cAAc,qBAAqB,iCAAiC;AAAA,MAAA;AAAA,IAChF;AAGK,UAAA,eAAe,MAAM,KAAK,cAAc,oBAAoB,WAAW,UAAU,aAAa,UAAU;AAE9G,WAAO,IAAIC,SAAAA,WAAW,IAAI,aAAa,WAAW,YAAY,CAAC;AAAA,EAAA;AAAA,EAGhE,MAAM,mBACL,WACA,kBACA,YACA,UACsC;AAChC,UAAA,YAAY,MAAM,UAAU,aAAa,MAAMF,wBAAY,mBAAmB,gBAAgB,CAAC;AAErG,QAAI,cAAc,MAAM;AACnB,UAAA,iBAAiB,SAAS,SAAS;AACtC,eAAO,IAAIC,SAAc,cAAA,iBAAiB,qBAAqB,iBAAiB,KAAK,YAAY;AAAA,MAAA,WAEvF,iBAAiB,SAAS,MAAM;AAC1C,eAAO,IAAIA,SAAc,cAAA,qBAAqB,kBAAkB,iBAAiB,EAAE,YAAY;AAAA,MAAA;AAGhG,YAAM,IAAIE,WAAAA,wBAAwB;AAAA,IAAA;AAG/B,QAAA,UAAU,gBAAgB,MAAM;AACnC,aAAO,IAAIF,SAAc,cAAA,mBAAmB,kBAAkB,UAAU,EAAE,cAAc;AAAA,IAAA;AAGzF,UAAM,WAAW,SAAS;AAEpB,UAAA,eAAe,MAAM,KAAK,cAAc,oBAAoB,WAAW,UAAU,aAAa,UAAU;AAC9G,WAAO,IAAIC,SAAAA,WAAW,IAAI,aAAa,WAAW,YAAY,CAAC;AAAA,EAAA;AAEjE;AAEO,MAAM,aAAa;AAAA,EACzB,YACiB,QACA,OACf;AAFe,SAAA,SAAA;AACA,SAAA,QAAA;AAAA,EAAA;AAElB;;;"}
+{"version":3,"file":"SignInManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignInManager.ts"],"sourcesContent":["import { CreateSessionTokenErrorCode, SignInErrorCode } from '../../schema'\nimport { ApiKeyManager, OtpAuthenticator } from '../service'\nimport { PersonQuery, PersonRow, PersonUniqueIdentifier } from '../queries'\nimport { Providers } from '../providers'\nimport { DatabaseContext } from '../utils'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { ImplementationException } from '../../exceptions'\nimport { AuthLogService } from './AuthLogService'\n\nclass SignInManager {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly providers: Providers,\n\t\tprivate readonly otpAuthenticator: OtpAuthenticator,\n\t) {}\n\n\tasync signIn(dbContext: DatabaseContext, email: string, password: string, expiration?: number, otpCode?: string): Promise<SignInResponse> {\n\t\tconst person = await dbContext.queryHandler.fetch(PersonQuery.byEmail(email))\n\n\t\tif (person === null) {\n\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${email} not found`, {\n\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\tpersonInput: email,\n\t\t\t\t}),\n\t\t\t})\n\t\t}\n\n\t\tconst authLogData = {\n\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\tpersonInput: email,\n\t\t\t\tpersonId: person.id,\n\t\t\t}),\n\t\t}\n\t\tif (!person.password_hash) {\n\t\t\treturn new ResponseError('NO_PASSWORD_SET', `No password set`, authLogData)\n\t\t}\n\n\t\tif (person.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person is disabled`, authLogData)\n\t\t}\n\n\t\tconst passwordValid = await this.providers.bcryptCompare(password, person.password_hash)\n\n\t\tif (!passwordValid) {\n\t\t\treturn new ResponseError('INVALID_PASSWORD', `Password does not match`, authLogData)\n\t\t}\n\n\t\tif (person.otp_uri && person.otp_activated_at) {\n\t\t\tif (!otpCode) {\n\t\t\t\treturn new ResponseError('OTP_REQUIRED', `2FA is enabled. OTP token is required`, authLogData)\n\t\t\t}\n\n\t\t\tif (!this.otpAuthenticator.validate({ uri: person.otp_uri }, otpCode)) {\n\t\t\t\treturn new ResponseError('INVALID_OTP_TOKEN', 'OTP token validation has failed', authLogData)\n\t\t\t}\n\t\t}\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration)\n\n\t\treturn new ResponseOk({ person, token: sessionToken, ...authLogData })\n\t}\n\n\tasync createSessionToken(\n\t\tdbContext: DatabaseContext,\n\t\tpersonIdentifier: PersonUniqueIdentifier,\n\t\texpiration?: number,\n\t\tverifier?: (person: PersonRow) => Promise<void>,\n\t): Promise<CreateSessionTokenResponse> {\n\t\tconst person = await dbContext.queryHandler.fetch(PersonQuery.byUniqueIdentifier(personIdentifier))\n\n\t\tif (person === null) {\n\t\t\tif (personIdentifier.type === 'email') {\n\t\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${personIdentifier.email} not found`, {\n\t\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\t\tpersonInput: personIdentifier.email,\n\t\t\t\t\t}),\n\t\t\t\t})\n\n\t\t\t} else if (personIdentifier.type === 'id') {\n\t\t\t\treturn new ResponseError('UNKNOWN_PERSON_ID', `Person with id ${personIdentifier.id} not found`, {\n\t\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\t\tpersonInput: personIdentifier.id,\n\t\t\t\t\t}),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\tthrow new ImplementationException()\n\t\t}\n\n\t\tconst inputValue = personIdentifier.type === 'email' ? personIdentifier.email : personIdentifier.id\n\t\tif (person.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person with id ${person.id} is disabled`, {\n\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\tpersonId: person.id,\n\t\t\t\t\tpersonInput: inputValue,\n\t\t\t\t}),\n\t\t\t})\n\t\t}\n\n\t\tawait verifier?.(person)\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration)\n\t\treturn new ResponseOk({\n\t\t\tperson,\n\t\t\ttoken: sessionToken,\n\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\tpersonId: person.id,\n\t\t\t\tpersonInput: inputValue,\n\t\t\t}),\n\t\t})\n\t}\n}\n\nexport interface SignInResult {\n\treadonly person: PersonRow\n\treadonly token: string\n\t[AuthLogService.Key]: AuthLogService.Bag\n}\n\nexport type SignInResponse = Response<SignInResult, SignInErrorCode, {\n\t[AuthLogService.Key]: AuthLogService.Bag\n}>\nexport type CreateSessionTokenResponse = Response<SignInResult, CreateSessionTokenErrorCode, {\n\t[AuthLogService.Key]: AuthLogService.Bag\n}>\n\nexport { SignInManager }\n"],"names":["PersonQuery","ResponseError","AuthLogService","ResponseOk","ImplementationException"],"mappings":"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"}

package/dist/development/src/model/service/SignInManager.js

@@ -8,6 +8,7 @@ import "../authorization/PermissionContext.js";
 import "../authorization/PermissionsFactory.js";
 import "@contember/schema";
 import { ResponseError, ResponseOk } from "../utils/Response.js";
+import { AuthLogService } from "./AuthLogService.js";
 class SignInManager {
   constructor(apiKeyManager, providers, otpAuthenticator) {
     this.apiKeyManager = apiKeyManager;
@@ -15,57 +16,81 @@ class SignInManager {
     this.otpAuthenticator = otpAuthenticator;
   }
   async signIn(dbContext, email, password, expiration, otpCode) {
-    const personRow = await dbContext.queryHandler.fetch(PersonQuery.byEmail(email));
-    if (personRow === null) {
-      return new ResponseError("UNKNOWN_EMAIL", `Person with email ${email} not found`);
+    const person = await dbContext.queryHandler.fetch(PersonQuery.byEmail(email));
+    if (person === null) {
+      return new ResponseError("UNKNOWN_EMAIL", `Person with email ${email} not found`, {
+        [AuthLogService.Key]: new AuthLogService.Bag({
+          personInput: email
+        })
+      });
     }
-    if (!personRow.password_hash) {
-      return new ResponseError("NO_PASSWORD_SET", `No password set`);
+    const authLogData = {
+      [AuthLogService.Key]: new AuthLogService.Bag({
+        personInput: email,
+        personId: person.id
+      })
+    };
+    if (!person.password_hash) {
+      return new ResponseError("NO_PASSWORD_SET", `No password set`, authLogData);
     }
-    if (personRow.disabled_at !== null) {
-      return new ResponseError("PERSON_DISABLED", `Person is disabled`);
+    if (person.disabled_at !== null) {
+      return new ResponseError("PERSON_DISABLED", `Person is disabled`, authLogData);
     }
-    const passwordValid = await this.providers.bcryptCompare(password, personRow.password_hash);
+    const passwordValid = await this.providers.bcryptCompare(password, person.password_hash);
     if (!passwordValid) {
-      return new ResponseError("INVALID_PASSWORD", `Password does not match`);
+      return new ResponseError("INVALID_PASSWORD", `Password does not match`, authLogData);
     }
-    if (personRow.otp_uri && personRow.otp_activated_at) {
+    if (person.otp_uri && person.otp_activated_at) {
       if (!otpCode) {
-        return new ResponseError("OTP_REQUIRED", `2FA is enabled. OTP token is required`);
+        return new ResponseError("OTP_REQUIRED", `2FA is enabled. OTP token is required`, authLogData);
       }
-      if (!this.otpAuthenticator.validate({ uri: personRow.otp_uri }, otpCode)) {
-        return new ResponseError("INVALID_OTP_TOKEN", "OTP token validation has failed");
+      if (!this.otpAuthenticator.validate({ uri: person.otp_uri }, otpCode)) {
+        return new ResponseError("INVALID_OTP_TOKEN", "OTP token validation has failed", authLogData);
       }
     }
-    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration);
-    return new ResponseOk(new SignInResult(personRow, sessionToken));
+    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration);
+    return new ResponseOk({ person, token: sessionToken, ...authLogData });
   }
   async createSessionToken(dbContext, personIdentifier, expiration, verifier) {
-    const personRow = await dbContext.queryHandler.fetch(PersonQuery.byUniqueIdentifier(personIdentifier));
-    if (personRow === null) {
+    const person = await dbContext.queryHandler.fetch(PersonQuery.byUniqueIdentifier(personIdentifier));
+    if (person === null) {
       if (personIdentifier.type === "email") {
-        return new ResponseError("UNKNOWN_EMAIL", `Person with email ${personIdentifier.email} not found`);
+        return new ResponseError("UNKNOWN_EMAIL", `Person with email ${personIdentifier.email} not found`, {
+          [AuthLogService.Key]: new AuthLogService.Bag({
+            personInput: personIdentifier.email
+          })
+        });
       } else if (personIdentifier.type === "id") {
-        return new ResponseError("UNKNOWN_PERSON_ID", `Person with id ${personIdentifier.id} not found`);
+        return new ResponseError("UNKNOWN_PERSON_ID", `Person with id ${personIdentifier.id} not found`, {
+          [AuthLogService.Key]: new AuthLogService.Bag({
+            personInput: personIdentifier.id
+          })
+        });
       }
       throw new ImplementationException();
     }
-    if (personRow.disabled_at !== null) {
-      return new ResponseError("PERSON_DISABLED", `Person with id ${personRow.id} is disabled`);
+    const inputValue = personIdentifier.type === "email" ? personIdentifier.email : personIdentifier.id;
+    if (person.disabled_at !== null) {
+      return new ResponseError("PERSON_DISABLED", `Person with id ${person.id} is disabled`, {
+        [AuthLogService.Key]: new AuthLogService.Bag({
+          personId: person.id,
+          personInput: inputValue
+        })
+      });
     }
-    await verifier?.(personRow);
-    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration);
-    return new ResponseOk(new SignInResult(personRow, sessionToken));
-  }
-}
-class SignInResult {
-  constructor(person, token) {
-    this.person = person;
-    this.token = token;
+    await verifier?.(person);
+    const sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration);
+    return new ResponseOk({
+      person,
+      token: sessionToken,
+      [AuthLogService.Key]: new AuthLogService.Bag({
+        personId: person.id,
+        personInput: inputValue
+      })
+    });
   }
 }
 export {
-  SignInManager,
-  SignInResult
+  SignInManager
 };
 //# sourceMappingURL=SignInManager.js.map

package/dist/development/src/model/service/SignInManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignInManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignInManager.ts"],"sourcesContent":["import { CreateSessionTokenErrorCode, SignInErrorCode } from '../../schema'\nimport { ApiKeyManager, OtpAuthenticator } from '../service'\nimport { PersonQuery, PersonRow, PersonUniqueIdentifier } from '../queries'\nimport { Providers } from '../providers'\nimport { DatabaseContext } from '../utils'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { ImplementationException } from '../../exceptions'\n\nclass SignInManager {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly providers: Providers,\n\t\tprivate readonly otpAuthenticator: OtpAuthenticator,\n\t) {}\n\n\tasync signIn(dbContext: DatabaseContext, email: string, password: string, expiration?: number, otpCode?: string): Promise<SignInResponse> {\n\t\tconst personRow = await dbContext.queryHandler.fetch(PersonQuery.byEmail(email))\n\n\t\tif (personRow === null) {\n\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${email} not found`)\n\t\t}\n\n\t\tif (!personRow.password_hash) {\n\t\t\treturn new ResponseError('NO_PASSWORD_SET', `No password set`)\n\t\t}\n\n\t\tif (personRow.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person is disabled`)\n\t\t}\n\n\t\tconst passwordValid = await this.providers.bcryptCompare(password, personRow.password_hash)\n\n\t\tif (!passwordValid) {\n\t\t\treturn new ResponseError('INVALID_PASSWORD', `Password does not match`)\n\t\t}\n\n\t\tif (personRow.otp_uri && personRow.otp_activated_at) {\n\t\t\tif (!otpCode) {\n\t\t\t\treturn new ResponseError('OTP_REQUIRED', `2FA is enabled. OTP token is required`)\n\t\t\t}\n\n\t\t\tif (!this.otpAuthenticator.validate({ uri: personRow.otp_uri }, otpCode)) {\n\t\t\t\treturn new ResponseError('INVALID_OTP_TOKEN', 'OTP token validation has failed')\n\t\t\t}\n\t\t}\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration)\n\n\t\treturn new ResponseOk(new SignInResult(personRow, sessionToken))\n\t}\n\n\tasync createSessionToken(\n\t\tdbContext: DatabaseContext,\n\t\tpersonIdentifier: PersonUniqueIdentifier,\n\t\texpiration?: number,\n\t\tverifier?: (person: PersonRow) => Promise<void>,\n\t): Promise<CreateSessionTokenResponse> {\n\t\tconst personRow = await dbContext.queryHandler.fetch(PersonQuery.byUniqueIdentifier(personIdentifier))\n\n\t\tif (personRow === null) {\n\t\t\tif (personIdentifier.type === 'email') {\n\t\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${personIdentifier.email} not found`)\n\n\t\t\t} else if (personIdentifier.type === 'id') {\n\t\t\t\treturn new ResponseError('UNKNOWN_PERSON_ID', `Person with id ${personIdentifier.id} not found`)\n\t\t\t}\n\n\t\t\tthrow new ImplementationException()\n\t\t}\n\n\t\tif (personRow.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person with id ${personRow.id} is disabled`)\n\t\t}\n\n\t\tawait verifier?.(personRow)\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, personRow.identity_id, expiration)\n\t\treturn new ResponseOk(new SignInResult(personRow, sessionToken))\n\t}\n}\n\nexport class SignInResult {\n\tconstructor(\n\t\tpublic readonly person: PersonRow,\n\t\tpublic readonly token: string,\n\t) {}\n}\n\nexport type SignInResponse = Response<SignInResult, SignInErrorCode>\nexport type CreateSessionTokenResponse = Response<SignInResult, CreateSessionTokenErrorCode>\n\nexport { SignInManager }\n"],"names":[],"mappings":";;;;;;;;;;AAQA,MAAM,cAAc;AAAA,EACnB,YACkB,eACA,WACA,kBAChB;AAHgB,SAAA,gBAAA;AACA,SAAA,YAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGlB,MAAM,OAAO,WAA4B,OAAe,UAAkB,YAAqB,SAA2C;AACnI,UAAA,YAAY,MAAM,UAAU,aAAa,MAAM,YAAY,QAAQ,KAAK,CAAC;AAE/E,QAAI,cAAc,MAAM;AACvB,aAAO,IAAI,cAAc,iBAAiB,qBAAqB,KAAK,YAAY;AAAA,IAAA;AAG7E,QAAA,CAAC,UAAU,eAAe;AACtB,aAAA,IAAI,cAAc,mBAAmB,iBAAiB;AAAA,IAAA;AAG1D,QAAA,UAAU,gBAAgB,MAAM;AAC5B,aAAA,IAAI,cAAc,mBAAmB,oBAAoB;AAAA,IAAA;AAGjE,UAAM,gBAAgB,MAAM,KAAK,UAAU,cAAc,UAAU,UAAU,aAAa;AAE1F,QAAI,CAAC,eAAe;AACZ,aAAA,IAAI,cAAc,oBAAoB,yBAAyB;AAAA,IAAA;AAGnE,QAAA,UAAU,WAAW,UAAU,kBAAkB;AACpD,UAAI,CAAC,SAAS;AACN,eAAA,IAAI,cAAc,gBAAgB,uCAAuC;AAAA,MAAA;AAG7E,UAAA,CAAC,KAAK,iBAAiB,SAAS,EAAE,KAAK,UAAU,WAAW,OAAO,GAAG;AAClE,eAAA,IAAI,cAAc,qBAAqB,iCAAiC;AAAA,MAAA;AAAA,IAChF;AAGK,UAAA,eAAe,MAAM,KAAK,cAAc,oBAAoB,WAAW,UAAU,aAAa,UAAU;AAE9G,WAAO,IAAI,WAAW,IAAI,aAAa,WAAW,YAAY,CAAC;AAAA,EAAA;AAAA,EAGhE,MAAM,mBACL,WACA,kBACA,YACA,UACsC;AAChC,UAAA,YAAY,MAAM,UAAU,aAAa,MAAM,YAAY,mBAAmB,gBAAgB,CAAC;AAErG,QAAI,cAAc,MAAM;AACnB,UAAA,iBAAiB,SAAS,SAAS;AACtC,eAAO,IAAI,cAAc,iBAAiB,qBAAqB,iBAAiB,KAAK,YAAY;AAAA,MAAA,WAEvF,iBAAiB,SAAS,MAAM;AAC1C,eAAO,IAAI,cAAc,qBAAqB,kBAAkB,iBAAiB,EAAE,YAAY;AAAA,MAAA;AAGhG,YAAM,IAAI,wBAAwB;AAAA,IAAA;AAG/B,QAAA,UAAU,gBAAgB,MAAM;AACnC,aAAO,IAAI,cAAc,mBAAmB,kBAAkB,UAAU,EAAE,cAAc;AAAA,IAAA;AAGzF,UAAM,WAAW,SAAS;AAEpB,UAAA,eAAe,MAAM,KAAK,cAAc,oBAAoB,WAAW,UAAU,aAAa,UAAU;AAC9G,WAAO,IAAI,WAAW,IAAI,aAAa,WAAW,YAAY,CAAC;AAAA,EAAA;AAEjE;AAEO,MAAM,aAAa;AAAA,EACzB,YACiB,QACA,OACf;AAFe,SAAA,SAAA;AACA,SAAA,QAAA;AAAA,EAAA;AAElB;"}
+{"version":3,"file":"SignInManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignInManager.ts"],"sourcesContent":["import { CreateSessionTokenErrorCode, SignInErrorCode } from '../../schema'\nimport { ApiKeyManager, OtpAuthenticator } from '../service'\nimport { PersonQuery, PersonRow, PersonUniqueIdentifier } from '../queries'\nimport { Providers } from '../providers'\nimport { DatabaseContext } from '../utils'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { ImplementationException } from '../../exceptions'\nimport { AuthLogService } from './AuthLogService'\n\nclass SignInManager {\n\tconstructor(\n\t\tprivate readonly apiKeyManager: ApiKeyManager,\n\t\tprivate readonly providers: Providers,\n\t\tprivate readonly otpAuthenticator: OtpAuthenticator,\n\t) {}\n\n\tasync signIn(dbContext: DatabaseContext, email: string, password: string, expiration?: number, otpCode?: string): Promise<SignInResponse> {\n\t\tconst person = await dbContext.queryHandler.fetch(PersonQuery.byEmail(email))\n\n\t\tif (person === null) {\n\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${email} not found`, {\n\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\tpersonInput: email,\n\t\t\t\t}),\n\t\t\t})\n\t\t}\n\n\t\tconst authLogData = {\n\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\tpersonInput: email,\n\t\t\t\tpersonId: person.id,\n\t\t\t}),\n\t\t}\n\t\tif (!person.password_hash) {\n\t\t\treturn new ResponseError('NO_PASSWORD_SET', `No password set`, authLogData)\n\t\t}\n\n\t\tif (person.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person is disabled`, authLogData)\n\t\t}\n\n\t\tconst passwordValid = await this.providers.bcryptCompare(password, person.password_hash)\n\n\t\tif (!passwordValid) {\n\t\t\treturn new ResponseError('INVALID_PASSWORD', `Password does not match`, authLogData)\n\t\t}\n\n\t\tif (person.otp_uri && person.otp_activated_at) {\n\t\t\tif (!otpCode) {\n\t\t\t\treturn new ResponseError('OTP_REQUIRED', `2FA is enabled. OTP token is required`, authLogData)\n\t\t\t}\n\n\t\t\tif (!this.otpAuthenticator.validate({ uri: person.otp_uri }, otpCode)) {\n\t\t\t\treturn new ResponseError('INVALID_OTP_TOKEN', 'OTP token validation has failed', authLogData)\n\t\t\t}\n\t\t}\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration)\n\n\t\treturn new ResponseOk({ person, token: sessionToken, ...authLogData })\n\t}\n\n\tasync createSessionToken(\n\t\tdbContext: DatabaseContext,\n\t\tpersonIdentifier: PersonUniqueIdentifier,\n\t\texpiration?: number,\n\t\tverifier?: (person: PersonRow) => Promise<void>,\n\t): Promise<CreateSessionTokenResponse> {\n\t\tconst person = await dbContext.queryHandler.fetch(PersonQuery.byUniqueIdentifier(personIdentifier))\n\n\t\tif (person === null) {\n\t\t\tif (personIdentifier.type === 'email') {\n\t\t\t\treturn new ResponseError('UNKNOWN_EMAIL', `Person with email ${personIdentifier.email} not found`, {\n\t\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\t\tpersonInput: personIdentifier.email,\n\t\t\t\t\t}),\n\t\t\t\t})\n\n\t\t\t} else if (personIdentifier.type === 'id') {\n\t\t\t\treturn new ResponseError('UNKNOWN_PERSON_ID', `Person with id ${personIdentifier.id} not found`, {\n\t\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\t\tpersonInput: personIdentifier.id,\n\t\t\t\t\t}),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\tthrow new ImplementationException()\n\t\t}\n\n\t\tconst inputValue = personIdentifier.type === 'email' ? personIdentifier.email : personIdentifier.id\n\t\tif (person.disabled_at !== null) {\n\t\t\treturn new ResponseError('PERSON_DISABLED', `Person with id ${person.id} is disabled`, {\n\t\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\t\tpersonId: person.id,\n\t\t\t\t\tpersonInput: inputValue,\n\t\t\t\t}),\n\t\t\t})\n\t\t}\n\n\t\tawait verifier?.(person)\n\n\t\tconst sessionToken = await this.apiKeyManager.createSessionApiKey(dbContext, person.identity_id, expiration)\n\t\treturn new ResponseOk({\n\t\t\tperson,\n\t\t\ttoken: sessionToken,\n\t\t\t[AuthLogService.Key]: new AuthLogService.Bag({\n\t\t\t\tpersonId: person.id,\n\t\t\t\tpersonInput: inputValue,\n\t\t\t}),\n\t\t})\n\t}\n}\n\nexport interface SignInResult {\n\treadonly person: PersonRow\n\treadonly token: string\n\t[AuthLogService.Key]: AuthLogService.Bag\n}\n\nexport type SignInResponse = Response<SignInResult, SignInErrorCode, {\n\t[AuthLogService.Key]: AuthLogService.Bag\n}>\nexport type CreateSessionTokenResponse = Response<SignInResult, CreateSessionTokenErrorCode, {\n\t[AuthLogService.Key]: AuthLogService.Bag\n}>\n\nexport { SignInManager }\n"],"names":[],"mappings":"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"}

package/dist/development/src/model/service/SignUpManager.cjs

@@ -6,30 +6,35 @@ require("node:crypto");
 const Response = require("../utils/Response.cjs");
 const CreatePersonCommand = require("../commands/person/CreatePersonCommand.cjs");
 const CreateIdentityCommand = require("../commands/identity/CreateIdentityCommand.cjs");
+require("../queries/apiKey/ApiKeyQuery.cjs");
+const ConfigurationQuery = require("../queries/configuration/ConfigurationQuery.cjs");
 require("../authorization/PermissionActions.cjs");
 require("@contember/authorization");
 const Roles = require("../authorization/Roles.cjs");
 require("../authorization/PermissionContext.cjs");
 require("../authorization/PermissionsFactory.cjs");
 require("@contember/schema");
-const password = require("../utils/password.cjs");
 class SignUpManager {
-  constructor(emailValidator) {
+  constructor(emailValidator, passwordStrengthValidator) {
     this.emailValidator = emailValidator;
+    this.passwordStrengthValidator = passwordStrengthValidator;
   }
-  async signUp(dbContext, { email, password: password$1, roles = [] }) {
+  async signUp(dbContext, { email, password, roles = [] }) {
     const validationError = await this.emailValidator.validateEmail(dbContext, email);
     if (validationError !== null) {
       return validationError;
     }
-    const plainPassword = password$1.getPlain();
-    const weakPassword = plainPassword ? password.getPasswordWeaknessMessage(plainPassword) : null;
-    if (weakPassword) {
-      return new Response.ResponseError("TOO_WEAK", weakPassword);
+    const plainPassword = password.getPlain();
+    if (plainPassword) {
+      const config = await dbContext.queryHandler.fetch(new ConfigurationQuery.ConfigurationQuery());
+      const passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, "TOO_WEAK");
+      if (!passwordVerifyResult.ok) {
+        return passwordVerifyResult;
+      }
     }
     const person = await dbContext.transaction(async (db) => {
       const identityId = await db.commandBus.execute(new CreateIdentityCommand.CreateIdentityCommand([...roles, Roles.TenantRole.PERSON]));
-      return await db.commandBus.execute(new CreatePersonCommand.CreatePersonCommand({ identityId, email, password: password$1 }));
+      return await db.commandBus.execute(new CreatePersonCommand.CreatePersonCommand({ identityId, email, password }));
     });
     return new Response.ResponseOk(new SignUpResult(person));
   }

package/dist/development/src/model/service/SignUpManager.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"SignUpManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignUpManager.ts"],"sourcesContent":["import { CreateIdentityCommand, CreatePersonCommand } from '../commands'\nimport { PersonQuery, PersonRow } from '../queries'\nimport { SignUpErrorCode } from '../../schema'\nimport { TenantRole } from '../authorization'\nimport { getPasswordWeaknessMessage } from '../utils/password'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { MaybePassword } from '../dtos'\nimport { EmailValidator } from './EmailValidator'\n\ntype SignUpUser = {\n\temail: string\n\tname?: string\n\tpassword: MaybePassword\n\troles?: readonly string[]\n}\n\nexport class SignUpManager {\n\tconstructor(\n\t\tprivate readonly emailValidator: EmailValidator,\n\t) {\n\t}\n\n\tasync signUp(dbContext: DatabaseContext, { email, password, roles = [] }: SignUpUser): Promise<SignUpResponse> {\n\t\tconst validationError = await this.emailValidator.validateEmail(dbContext, email)\n\t\tif (validationError !== null) {\n\t\t\treturn validationError\n\t\t}\n\t\tconst plainPassword = password.getPlain()\n\t\tconst weakPassword = plainPassword ? getPasswordWeaknessMessage(plainPassword) : null\n\t\tif (weakPassword) {\n\t\t\treturn new ResponseError('TOO_WEAK', weakPassword)\n\t\t}\n\t\tconst person = await dbContext.transaction(async db => {\n\t\t\tconst identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]))\n\t\t\treturn await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password }))\n\t\t})\n\t\treturn new ResponseOk(new SignUpResult(person))\n\t}\n}\n\nexport class SignUpResult {\n\tconstructor(public readonly person: Omit<PersonRow, 'roles'>) {}\n}\nexport type SignUpResponse = Response<SignUpResult, SignUpErrorCode>\n"],"names":["password","getPasswordWeaknessMessage","ResponseError","CreateIdentityCommand","TenantRole","CreatePersonCommand","ResponseOk"],"mappings":";;;;;;;;;;;;;;;AAiBO,MAAM,cAAc;AAAA,EAC1B,YACkB,gBAChB;AADgB,SAAA,iBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,OAAO,WAA4B,EAAE,OAAOA,UAAAA,YAAU,QAAQ,CAAA,KAA2C;AAC9G,UAAM,kBAAkB,MAAM,KAAK,eAAe,cAAc,WAAW,KAAK;AAChF,QAAI,oBAAoB,MAAM;AACtB,aAAA;AAAA,IAAA;AAEF,UAAA,gBAAgBA,WAAS,SAAS;AACxC,UAAM,eAAe,gBAAgBC,oCAA2B,aAAa,IAAI;AACjF,QAAI,cAAc;AACV,aAAA,IAAIC,SAAAA,cAAc,YAAY,YAAY;AAAA,IAAA;AAElD,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,OAAM;AACtD,YAAM,aAAa,MAAM,GAAG,WAAW,QAAQ,IAAIC,4CAAsB,CAAC,GAAG,OAAOC,iBAAW,MAAM,CAAC,CAAC;AAChG,aAAA,MAAM,GAAG,WAAW,QAAQ,IAAIC,wCAAoB,EAAE,YAAY,iBAAOL,WAAS,CAAC,CAAC;AAAA,IAAA,CAC3F;AACD,WAAO,IAAIM,SAAA,WAAW,IAAI,aAAa,MAAM,CAAC;AAAA,EAAA;AAEhD;AAEO,MAAM,aAAa;AAAA,EACzB,YAA4B,QAAkC;AAAlC,SAAA,SAAA;AAAA,EAAA;AAC7B;;;"}
+{"version":3,"file":"SignUpManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignUpManager.ts"],"sourcesContent":["import { CreateIdentityCommand, CreatePersonCommand } from '../commands'\nimport { ConfigurationQuery, PersonRow } from '../queries'\nimport { SignUpErrorCode, WeakPasswordReason } from '../../schema'\nimport { TenantRole } from '../authorization'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { MaybePassword } from '../dtos'\nimport { EmailValidator } from './EmailValidator'\nimport { PasswordStrengthValidator } from './PasswordStrengthValidator'\n\ntype SignUpUser = {\n\temail: string\n\tname?: string\n\tpassword: MaybePassword\n\troles?: readonly string[]\n}\n\nexport class SignUpManager {\n\tconstructor(\n\t\tprivate readonly emailValidator: EmailValidator,\n\t\tprivate readonly passwordStrengthValidator: PasswordStrengthValidator,\n\t) {\n\t}\n\n\tasync signUp(dbContext: DatabaseContext, { email, password, roles = [] }: SignUpUser): Promise<SignUpResponse> {\n\t\tconst validationError = await this.emailValidator.validateEmail(dbContext, email)\n\t\tif (validationError !== null) {\n\t\t\treturn validationError\n\t\t}\n\t\tconst plainPassword = password.getPlain()\n\n\t\tif (plainPassword) {\n\t\t\tconst config = await dbContext.queryHandler.fetch(new ConfigurationQuery())\n\t\t\tconst passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, 'TOO_WEAK')\n\t\t\tif (!passwordVerifyResult.ok) {\n\t\t\t\treturn passwordVerifyResult\n\t\t\t}\n\t\t}\n\n\t\tconst person = await dbContext.transaction(async db => {\n\t\t\tconst identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]))\n\t\t\treturn await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password }))\n\t\t})\n\t\treturn new ResponseOk(new SignUpResult(person))\n\t}\n}\n\nexport class SignUpResult {\n\tconstructor(public readonly person: Omit<PersonRow, 'roles'>) {}\n}\nexport type SignUpResponse = Response<SignUpResult, SignUpErrorCode, {\n\tweakPasswordReasons?: WeakPasswordReason[]\n}>\n"],"names":["ConfigurationQuery","CreateIdentityCommand","TenantRole","CreatePersonCommand","ResponseOk"],"mappings":";;;;;;;;;;;;;;;;AAiBO,MAAM,cAAc;AAAA,EAC1B,YACkB,gBACA,2BAChB;AAFgB,SAAA,iBAAA;AACA,SAAA,4BAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,OAAO,WAA4B,EAAE,OAAO,UAAU,QAAQ,CAAA,KAA2C;AAC9G,UAAM,kBAAkB,MAAM,KAAK,eAAe,cAAc,WAAW,KAAK;AAChF,QAAI,oBAAoB,MAAM;AACtB,aAAA;AAAA,IAAA;AAEF,UAAA,gBAAgB,SAAS,SAAS;AAExC,QAAI,eAAe;AAClB,YAAM,SAAS,MAAM,UAAU,aAAa,MAAM,IAAIA,mBAAAA,oBAAoB;AACpE,YAAA,uBAAuB,MAAM,KAAK,0BAA0B,OAAO,eAAe,OAAO,UAAU,UAAU;AAC/G,UAAA,CAAC,qBAAqB,IAAI;AACtB,eAAA;AAAA,MAAA;AAAA,IACR;AAGD,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,OAAM;AACtD,YAAM,aAAa,MAAM,GAAG,WAAW,QAAQ,IAAIC,4CAAsB,CAAC,GAAG,OAAOC,iBAAW,MAAM,CAAC,CAAC;AAChG,aAAA,MAAM,GAAG,WAAW,QAAQ,IAAIC,wCAAoB,EAAE,YAAY,OAAO,SAAS,CAAC,CAAC;AAAA,IAAA,CAC3F;AACD,WAAO,IAAIC,SAAA,WAAW,IAAI,aAAa,MAAM,CAAC;AAAA,EAAA;AAEhD;AAEO,MAAM,aAAa;AAAA,EACzB,YAA4B,QAAkC;AAAlC,SAAA,SAAA;AAAA,EAAA;AAC7B;;;"}

package/dist/development/src/model/service/SignUpManager.js

@@ -1,19 +1,21 @@
 import "../type/ApiKey.js";
 import "@contember/database";
 import "node:crypto";
-import { ResponseError, ResponseOk } from "../utils/Response.js";
+import { ResponseOk } from "../utils/Response.js";
 import { CreatePersonCommand } from "../commands/person/CreatePersonCommand.js";
 import { CreateIdentityCommand } from "../commands/identity/CreateIdentityCommand.js";
+import "../queries/apiKey/ApiKeyQuery.js";
+import { ConfigurationQuery } from "../queries/configuration/ConfigurationQuery.js";
 import "../authorization/PermissionActions.js";
 import "@contember/authorization";
 import { TenantRole } from "../authorization/Roles.js";
 import "../authorization/PermissionContext.js";
 import "../authorization/PermissionsFactory.js";
 import "@contember/schema";
-import { getPasswordWeaknessMessage } from "../utils/password.js";
 class SignUpManager {
-  constructor(emailValidator) {
+  constructor(emailValidator, passwordStrengthValidator) {
     this.emailValidator = emailValidator;
+    this.passwordStrengthValidator = passwordStrengthValidator;
   }
   async signUp(dbContext, { email, password, roles = [] }) {
     const validationError = await this.emailValidator.validateEmail(dbContext, email);
@@ -21,9 +23,12 @@ class SignUpManager {
       return validationError;
     }
     const plainPassword = password.getPlain();
-    const weakPassword = plainPassword ? getPasswordWeaknessMessage(plainPassword) : null;
-    if (weakPassword) {
-      return new ResponseError("TOO_WEAK", weakPassword);
+    if (plainPassword) {
+      const config = await dbContext.queryHandler.fetch(new ConfigurationQuery());
+      const passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, "TOO_WEAK");
+      if (!passwordVerifyResult.ok) {
+        return passwordVerifyResult;
+      }
     }
     const person = await dbContext.transaction(async (db) => {
       const identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]));

package/dist/development/src/model/service/SignUpManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignUpManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignUpManager.ts"],"sourcesContent":["import { CreateIdentityCommand, CreatePersonCommand } from '../commands'\nimport { PersonQuery, PersonRow } from '../queries'\nimport { SignUpErrorCode } from '../../schema'\nimport { TenantRole } from '../authorization'\nimport { getPasswordWeaknessMessage } from '../utils/password'\nimport { Response, ResponseError, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { MaybePassword } from '../dtos'\nimport { EmailValidator } from './EmailValidator'\n\ntype SignUpUser = {\n\temail: string\n\tname?: string\n\tpassword: MaybePassword\n\troles?: readonly string[]\n}\n\nexport class SignUpManager {\n\tconstructor(\n\t\tprivate readonly emailValidator: EmailValidator,\n\t) {\n\t}\n\n\tasync signUp(dbContext: DatabaseContext, { email, password, roles = [] }: SignUpUser): Promise<SignUpResponse> {\n\t\tconst validationError = await this.emailValidator.validateEmail(dbContext, email)\n\t\tif (validationError !== null) {\n\t\t\treturn validationError\n\t\t}\n\t\tconst plainPassword = password.getPlain()\n\t\tconst weakPassword = plainPassword ? getPasswordWeaknessMessage(plainPassword) : null\n\t\tif (weakPassword) {\n\t\t\treturn new ResponseError('TOO_WEAK', weakPassword)\n\t\t}\n\t\tconst person = await dbContext.transaction(async db => {\n\t\t\tconst identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]))\n\t\t\treturn await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password }))\n\t\t})\n\t\treturn new ResponseOk(new SignUpResult(person))\n\t}\n}\n\nexport class SignUpResult {\n\tconstructor(public readonly person: Omit<PersonRow, 'roles'>) {}\n}\nexport type SignUpResponse = Response<SignUpResult, SignUpErrorCode>\n"],"names":[],"mappings":";;;;;;;;;;;;;AAiBO,MAAM,cAAc;AAAA,EAC1B,YACkB,gBAChB;AADgB,SAAA,iBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,OAAO,WAA4B,EAAE,OAAO,UAAU,QAAQ,CAAA,KAA2C;AAC9G,UAAM,kBAAkB,MAAM,KAAK,eAAe,cAAc,WAAW,KAAK;AAChF,QAAI,oBAAoB,MAAM;AACtB,aAAA;AAAA,IAAA;AAEF,UAAA,gBAAgB,SAAS,SAAS;AACxC,UAAM,eAAe,gBAAgB,2BAA2B,aAAa,IAAI;AACjF,QAAI,cAAc;AACV,aAAA,IAAI,cAAc,YAAY,YAAY;AAAA,IAAA;AAElD,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,OAAM;AACtD,YAAM,aAAa,MAAM,GAAG,WAAW,QAAQ,IAAI,sBAAsB,CAAC,GAAG,OAAO,WAAW,MAAM,CAAC,CAAC;AAChG,aAAA,MAAM,GAAG,WAAW,QAAQ,IAAI,oBAAoB,EAAE,YAAY,OAAO,SAAS,CAAC,CAAC;AAAA,IAAA,CAC3F;AACD,WAAO,IAAI,WAAW,IAAI,aAAa,MAAM,CAAC;AAAA,EAAA;AAEhD;AAEO,MAAM,aAAa;AAAA,EACzB,YAA4B,QAAkC;AAAlC,SAAA,SAAA;AAAA,EAAA;AAC7B;"}
+{"version":3,"file":"SignUpManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/SignUpManager.ts"],"sourcesContent":["import { CreateIdentityCommand, CreatePersonCommand } from '../commands'\nimport { ConfigurationQuery, PersonRow } from '../queries'\nimport { SignUpErrorCode, WeakPasswordReason } from '../../schema'\nimport { TenantRole } from '../authorization'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { MaybePassword } from '../dtos'\nimport { EmailValidator } from './EmailValidator'\nimport { PasswordStrengthValidator } from './PasswordStrengthValidator'\n\ntype SignUpUser = {\n\temail: string\n\tname?: string\n\tpassword: MaybePassword\n\troles?: readonly string[]\n}\n\nexport class SignUpManager {\n\tconstructor(\n\t\tprivate readonly emailValidator: EmailValidator,\n\t\tprivate readonly passwordStrengthValidator: PasswordStrengthValidator,\n\t) {\n\t}\n\n\tasync signUp(dbContext: DatabaseContext, { email, password, roles = [] }: SignUpUser): Promise<SignUpResponse> {\n\t\tconst validationError = await this.emailValidator.validateEmail(dbContext, email)\n\t\tif (validationError !== null) {\n\t\t\treturn validationError\n\t\t}\n\t\tconst plainPassword = password.getPlain()\n\n\t\tif (plainPassword) {\n\t\t\tconst config = await dbContext.queryHandler.fetch(new ConfigurationQuery())\n\t\t\tconst passwordVerifyResult = await this.passwordStrengthValidator.verify(plainPassword, config.password, 'TOO_WEAK')\n\t\t\tif (!passwordVerifyResult.ok) {\n\t\t\t\treturn passwordVerifyResult\n\t\t\t}\n\t\t}\n\n\t\tconst person = await dbContext.transaction(async db => {\n\t\t\tconst identityId = await db.commandBus.execute(new CreateIdentityCommand([...roles, TenantRole.PERSON]))\n\t\t\treturn await db.commandBus.execute(new CreatePersonCommand({ identityId, email, password }))\n\t\t})\n\t\treturn new ResponseOk(new SignUpResult(person))\n\t}\n}\n\nexport class SignUpResult {\n\tconstructor(public readonly person: Omit<PersonRow, 'roles'>) {}\n}\nexport type SignUpResponse = Response<SignUpResult, SignUpErrorCode, {\n\tweakPasswordReasons?: WeakPasswordReason[]\n}>\n"],"names":[],"mappings":";;;;;;;;;;;;;;AAiBO,MAAM,cAAc;AAAA,EAC1B,YACkB,gBACA,2BAChB;AAFgB,SAAA,iBAAA;AACA,SAAA,4BAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,OAAO,WAA4B,EAAE,OAAO,UAAU,QAAQ,CAAA,KAA2C;AAC9G,UAAM,kBAAkB,MAAM,KAAK,eAAe,cAAc,WAAW,KAAK;AAChF,QAAI,oBAAoB,MAAM;AACtB,aAAA;AAAA,IAAA;AAEF,UAAA,gBAAgB,SAAS,SAAS;AAExC,QAAI,eAAe;AAClB,YAAM,SAAS,MAAM,UAAU,aAAa,MAAM,IAAI,oBAAoB;AACpE,YAAA,uBAAuB,MAAM,KAAK,0BAA0B,OAAO,eAAe,OAAO,UAAU,UAAU;AAC/G,UAAA,CAAC,qBAAqB,IAAI;AACtB,eAAA;AAAA,MAAA;AAAA,IACR;AAGD,UAAM,SAAS,MAAM,UAAU,YAAY,OAAM,OAAM;AACtD,YAAM,aAAa,MAAM,GAAG,WAAW,QAAQ,IAAI,sBAAsB,CAAC,GAAG,OAAO,WAAW,MAAM,CAAC,CAAC;AAChG,aAAA,MAAM,GAAG,WAAW,QAAQ,IAAI,oBAAoB,EAAE,YAAY,OAAO,SAAS,CAAC,CAAC;AAAA,IAAA,CAC3F;AACD,WAAO,IAAI,WAAW,IAAI,aAAa,MAAM,CAAC;AAAA,EAAA;AAEhD;AAEO,MAAM,aAAa;AAAA,EACzB,YAA4B,QAAkC;AAAlC,SAAA,SAAA;AAAA,EAAA;AAC7B;"}

package/dist/development/src/model/service/apiKey/ApiKeyManager.cjs

@@ -11,11 +11,13 @@ require("node:crypto");
 const ApiKey = require("../../type/ApiKey.cjs");
 const assert = require("node:assert");
 const ApiKeyQuery = require("../../queries/apiKey/ApiKeyQuery.cjs");
+const ConfigurationQuery = require("../../queries/configuration/ConfigurationQuery.cjs");
 require("../../authorization/PermissionActions.cjs");
 require("@contember/authorization");
 require("../../authorization/PermissionContext.cjs");
 require("../../authorization/PermissionsFactory.cjs");
 require("@contember/schema");
+const interval = require("../../utils/interval.cjs");
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
@@ -51,7 +53,10 @@ class ApiKeyManager {
     return new Response.ResponseOk(new VerifyResult(apiKeyRow.identity_id, apiKeyRow.id, apiKeyRow.roles, apiKeyRow.person_id));
   }
   async createSessionApiKey(dbContext, identityId, expiration) {
-    const command = new CreateApiKeyCommand.CreateApiKeyCommand({ type: ApiKey.ApiKey.Type.SESSION, identityId, expiration });
+    const config = await dbContext.queryHandler.fetch(new ConfigurationQuery.ConfigurationQuery());
+    const expirationResolved = expiration ?? interval.intervalToSeconds(config.login.defaultTokenExpiration) / 60;
+    const expirationCapped = config.login.maxTokenExpiration ? Math.min(expirationResolved, interval.intervalToSeconds(config.login.maxTokenExpiration) / 60) : expirationResolved;
+    const command = new CreateApiKeyCommand.CreateApiKeyCommand({ type: ApiKey.ApiKey.Type.SESSION, identityId, expiration: expirationCapped });
     const token = (await dbContext.commandBus.execute(command)).token;
     assert(token !== void 0);
     return token;