@contember/engine-tenant-api 2.1.0-alpha.16 → 2.1.0-alpha.17

package/dist/production/src/model/commands/apiKey/CreateApiKeyCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"CreateApiKeyCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/apiKey/CreateApiKeyCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ApiKey } from '../../type'\nimport { ApiKeyHelper } from './ApiKeyHelper'\nimport { InsertBuilder } from '@contember/database'\nimport { computeTokenHash, generateToken, TokenHash } from '../../utils'\n\ninterface CreateSessionApiKeyArgs {\n\ttype: ApiKey.Type.SESSION\n\tidentityId: string\n\texpiration?: number\n\ttokenHash?: string\n}\n\ninterface CreatePermanentApiKeyArgs {\n\ttype: ApiKey.Type.PERMANENT\n\tidentityId: string\n\ttokenHash?: TokenHash\n\texpiration?: undefined\n}\n\nexport type CreateApiKeyArgs =\n\t| CreateSessionApiKeyArgs\n\t| CreatePermanentApiKeyArgs\n\nexport class CreateApiKeyCommand implements Command<CreateApiKeyCommandResult> {\n\tconstructor(private args: CreateApiKeyArgs) {}\n\n\tasync execute({ db, providers }: Command.Args): Promise<CreateApiKeyCommandResult> {\n\t\tconst apiKeyId = providers.uuid()\n\t\tlet token = undefined\n\t\tlet tokenHash = this.args.tokenHash\n\t\tif (!tokenHash) {\n\t\t\ttoken = await generateToken(providers)\n\t\t\ttokenHash = computeTokenHash(token)\n\t\t}\n\n\t\tawait InsertBuilder.create()\n\t\t\t.into('api_key')\n\t\t\t.values({\n\t\t\t\tid: apiKeyId,\n\t\t\t\ttoken_hash: tokenHash,\n\t\t\t\ttype: this.args.type,\n\t\t\t\tidentity_id: this.args.identityId,\n\t\t\t\tdisabled_at: null,\n\t\t\t\texpires_at: ApiKeyHelper.getExpiration(providers, this.args.type, this.args.expiration),\n\t\t\t\texpiration: this.args.expiration || null,\n\t\t\t\tcreated_at: providers.now(),\n\t\t\t})\n\t\t\t.execute(db)\n\n\t\treturn new CreateApiKeyCommandResult(apiKeyId, token)\n\t}\n}\n\nexport class CreateApiKeyCommandResult {\n\tconstructor(public readonly id: string, public readonly token?: string) {\n\t}\n}\n"],"names":["generateToken","computeTokenHash","InsertBuilder","ApiKeyHelper"],"mappings":";;;;;;AAwBO,MAAM,oBAAkE;AAAA,EAC9E,YAAoB,MAAwB;AAAxB,SAAA,OAAA;AAAA,EAAA;AAAA,EAEpB,MAAM,QAAQ,EAAE,IAAI,aAA+D;AAC5E,UAAA,WAAW,UAAU,KAAK;AAChC,QAAI,QAAQ;AACR,QAAA,YAAY,KAAK,KAAK;AAC1B,QAAI,CAAC,WAAW;AACP,cAAA,MAAMA,yBAAc,SAAS;AACrC,kBAAYC,4BAAiB,KAAK;AAAA,IAAA;AAGnC,UAAMC,SAAAA,cAAc,OAAO,EACzB,KAAK,SAAS,EACd,OAAO;AAAA,MACP,IAAI;AAAA,MACJ,YAAY;AAAA,MACZ,MAAM,KAAK,KAAK;AAAA,MAChB,aAAa,KAAK,KAAK;AAAA,MACvB,aAAa;AAAA,MACb,YAAYC,aAAAA,aAAa,cAAc,WAAW,KAAK,KAAK,MAAM,KAAK,KAAK,UAAU;AAAA,MACtF,YAAY,KAAK,KAAK,cAAc;AAAA,MACpC,YAAY,UAAU,IAAI;AAAA,IAAA,CAC1B,EACA,QAAQ,EAAE;AAEL,WAAA,IAAI,0BAA0B,UAAU,KAAK;AAAA,EAAA;AAEtD;AAEO,MAAM,0BAA0B;AAAA,EACtC,YAA4B,IAA4B,OAAgB;AAA5C,SAAA,KAAA;AAA4B,SAAA,QAAA;AAAA,EAAA;AAEzD;;;"}
+{"version":3,"file":"CreateApiKeyCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/apiKey/CreateApiKeyCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ApiKey } from '../../type'\nimport { ApiKeyHelper } from './ApiKeyHelper'\nimport { InsertBuilder } from '@contember/database'\nimport { computeTokenHash, generateToken, TokenHash } from '../../utils'\n\ninterface CreateSessionApiKeyArgs {\n\ttype: ApiKey.Type.SESSION\n\tidentityId: string\n\texpiration?: number\n\ttokenHash?: string\n}\n\ninterface CreatePermanentApiKeyArgs {\n\ttype: ApiKey.Type.PERMANENT\n\tidentityId: string\n\ttokenHash?: TokenHash\n\texpiration?: undefined\n}\n\nexport type CreateApiKeyArgs =\n\t| CreateSessionApiKeyArgs\n\t| CreatePermanentApiKeyArgs\n\nexport class CreateApiKeyCommand implements Command<CreateApiKeyCommandResult> {\n\tconstructor(private args: CreateApiKeyArgs) {}\n\n\tasync execute({ db, providers }: Command.Args): Promise<CreateApiKeyCommandResult> {\n\t\tconst apiKeyId = providers.uuid()\n\t\tlet token = undefined\n\t\tlet tokenHash = this.args.tokenHash\n\t\tif (!tokenHash) {\n\t\t\ttoken = await generateToken(providers)\n\t\t\ttokenHash = computeTokenHash(token)\n\t\t}\n\n\t\tawait InsertBuilder.create()\n\t\t\t.into('api_key')\n\t\t\t.values({\n\t\t\t\tid: apiKeyId,\n\t\t\t\ttoken_hash: tokenHash,\n\t\t\t\ttype: this.args.type,\n\t\t\t\tidentity_id: this.args.identityId,\n\t\t\t\tdisabled_at: null,\n\t\t\t\texpires_at: ApiKeyHelper.getExpiration(providers, this.args.type, this.args.expiration),\n\t\t\t\texpiration: this.args.expiration || null,\n\t\t\t\tcreated_at: providers.now(),\n\t\t\t})\n\t\t\t.execute(db)\n\n\t\treturn new CreateApiKeyCommandResult(apiKeyId, token)\n\t}\n}\n\nexport class CreateApiKeyCommandResult {\n\tconstructor(public readonly id: string, public readonly token?: string) {\n\t}\n}\n"],"names":["token","generateToken","computeTokenHash","InsertBuilder","ApiKeyHelper"],"mappings":";;;;;;AAwBO,MAAM,oBAAkE;AAAA,EAC9E,YAAoB,MAAwB;AAAxB,SAAA,OAAA;AAAA,EAAA;AAAA,EAEpB,MAAM,QAAQ,EAAE,IAAI,aAA+D;AAC5E,UAAA,WAAW,UAAU,KAAK;AAChC,QAAIA,UAAQ;AACR,QAAA,YAAY,KAAK,KAAK;AAC1B,QAAI,CAAC,WAAW;AACPA,gBAAA,MAAMC,oBAAc,SAAS;AACrC,kBAAYC,uBAAiBF,OAAK;AAAA,IAAA;AAGnC,UAAMG,SAAAA,cAAc,OAAO,EACzB,KAAK,SAAS,EACd,OAAO;AAAA,MACP,IAAI;AAAA,MACJ,YAAY;AAAA,MACZ,MAAM,KAAK,KAAK;AAAA,MAChB,aAAa,KAAK,KAAK;AAAA,MACvB,aAAa;AAAA,MACb,YAAYC,aAAAA,aAAa,cAAc,WAAW,KAAK,KAAK,MAAM,KAAK,KAAK,UAAU;AAAA,MACtF,YAAY,KAAK,KAAK,cAAc;AAAA,MACpC,YAAY,UAAU,IAAI;AAAA,IAAA,CAC1B,EACA,QAAQ,EAAE;AAEL,WAAA,IAAI,0BAA0B,UAAUJ,OAAK;AAAA,EAAA;AAEtD;AAEO,MAAM,0BAA0B;AAAA,EACtC,YAA4B,IAA4BA,QAAgB;AAA5C,SAAA,KAAA;AAA4B,SAAA,QAAAA;AAAA,EAAA;AAEzD;;;"}

package/dist/production/src/model/commands/apiKey/CreateApiKeyCommand.js

@@ -1,7 +1,7 @@
 import { ApiKeyHelper } from "./ApiKeyHelper.js";
 import { InsertBuilder as InsertBuilder$1 } from "@contember/database";
 import "../../type/ApiKey.js";
-import { generateToken, computeTokenHash } from "../../utils/tokenUtils.js";
+import { generateToken, computeTokenHash } from "../../utils/token.js";
 class CreateApiKeyCommand {
   constructor(args) {
     this.args = args;

package/dist/production/src/model/commands/authLog/CreateAuthLogEntryCommand.cjs

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const Database = require("@contember/database");
+class CreateAuthLogEntryCommand {
+  constructor(data) {
+    this.data = data;
+  }
+  async execute({ db, providers }) {
+    await Database.InsertBuilder.create().into("person_auth_log").values({
+      id: providers.uuid(),
+      invoked_by_id: this.data.invokedById,
+      person_id: this.data.personId,
+      person_input_identifier: this.data.personInputIdentifier,
+      person_token_id: this.data.personTokenId,
+      type: this.data.type,
+      success: this.data.success,
+      error_code: this.data.errorCode,
+      error_message: this.data.errorMessage,
+      ip_address: this.data.ipAddress,
+      user_agent: this.data.userAgent,
+      identity_provider_id: this.data.identityProviderId,
+      metadata: this.data.metadata ?? {}
+    }).execute(db);
+  }
+}
+exports.CreateAuthLogEntryCommand = CreateAuthLogEntryCommand;
+//# sourceMappingURL=CreateAuthLogEntryCommand.cjs.map

package/dist/production/src/model/commands/authLog/CreateAuthLogEntryCommand.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateAuthLogEntryCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/authLog/CreateAuthLogEntryCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { AuthActionType } from '../../type/AuthLog'\nimport { InsertBuilder } from '@contember/database'\nimport { JSONValue } from '@contember/schema'\n\nexport class CreateAuthLogEntryCommand implements Command<void> {\n\tconstructor(\n\t\tprivate readonly data: CreateAuthLogEntryCommand.Entry,\n\t) {\n\t}\n\n\n\tasync execute({ db, providers }: Command.Args): Promise<void> {\n\t\tawait InsertBuilder.create()\n\t\t\t.into('person_auth_log')\n\t\t\t.values({\n\t\t\t\tid: providers.uuid(),\n\t\t\t\tinvoked_by_id: this.data.invokedById,\n\t\t\t\tperson_id: this.data.personId,\n\t\t\t\tperson_input_identifier: this.data.personInputIdentifier,\n\t\t\t\tperson_token_id: this.data.personTokenId,\n\t\t\t\ttype: this.data.type,\n\t\t\t\tsuccess: this.data.success,\n\t\t\t\terror_code: this.data.errorCode,\n\t\t\t\terror_message: this.data.errorMessage,\n\t\t\t\tip_address: this.data.ipAddress,\n\t\t\t\tuser_agent: this.data.userAgent,\n\t\t\t\tidentity_provider_id: this.data.identityProviderId,\n\t\t\t\tmetadata: this.data.metadata ?? {},\n\t\t\t})\n\t\t\t.execute(db)\n\n\t}\n}\n\nnamespace CreateAuthLogEntryCommand {\n\texport type Entry = {\n\t\ttype: AuthActionType\n\t\tinvokedById: string\n\t\tpersonInputIdentifier?: string\n\t\tpersonId?: string\n\t\tpersonTokenId?: string\n\t\tsuccess: boolean\n\t\terrorCode?: string\n\t\terrorMessage?: string\n\t\tipAddress?: string\n\t\tuserAgent?: string\n\t\tidentityProviderId?: string\n\t\tmetadata?: JSONValue\n\t}\n}\n"],"names":["InsertBuilder"],"mappings":";;;AAKO,MAAM,0BAAmD;AAAA,EAC/D,YACkB,MAChB;AADgB,SAAA,OAAA;AAAA,EAAA;AAAA,EAKlB,MAAM,QAAQ,EAAE,IAAI,aAA0C;AAC7D,UAAMA,SAAAA,cAAc,OAAO,EACzB,KAAK,iBAAiB,EACtB,OAAO;AAAA,MACP,IAAI,UAAU,KAAK;AAAA,MACnB,eAAe,KAAK,KAAK;AAAA,MACzB,WAAW,KAAK,KAAK;AAAA,MACrB,yBAAyB,KAAK,KAAK;AAAA,MACnC,iBAAiB,KAAK,KAAK;AAAA,MAC3B,MAAM,KAAK,KAAK;AAAA,MAChB,SAAS,KAAK,KAAK;AAAA,MACnB,YAAY,KAAK,KAAK;AAAA,MACtB,eAAe,KAAK,KAAK;AAAA,MACzB,YAAY,KAAK,KAAK;AAAA,MACtB,YAAY,KAAK,KAAK;AAAA,MACtB,sBAAsB,KAAK,KAAK;AAAA,MAChC,UAAU,KAAK,KAAK,YAAY,CAAA;AAAA,IAAC,CACjC,EACA,QAAQ,EAAE;AAAA,EAAA;AAGd;;"}

package/dist/production/src/model/commands/authLog/CreateAuthLogEntryCommand.js

@@ -0,0 +1,27 @@
+import { InsertBuilder as InsertBuilder$1 } from "@contember/database";
+class CreateAuthLogEntryCommand {
+  constructor(data) {
+    this.data = data;
+  }
+  async execute({ db, providers }) {
+    await InsertBuilder$1.create().into("person_auth_log").values({
+      id: providers.uuid(),
+      invoked_by_id: this.data.invokedById,
+      person_id: this.data.personId,
+      person_input_identifier: this.data.personInputIdentifier,
+      person_token_id: this.data.personTokenId,
+      type: this.data.type,
+      success: this.data.success,
+      error_code: this.data.errorCode,
+      error_message: this.data.errorMessage,
+      ip_address: this.data.ipAddress,
+      user_agent: this.data.userAgent,
+      identity_provider_id: this.data.identityProviderId,
+      metadata: this.data.metadata ?? {}
+    }).execute(db);
+  }
+}
+export {
+  CreateAuthLogEntryCommand
+};
+//# sourceMappingURL=CreateAuthLogEntryCommand.js.map

package/dist/production/src/model/commands/authLog/CreateAuthLogEntryCommand.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CreateAuthLogEntryCommand.js","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/authLog/CreateAuthLogEntryCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { AuthActionType } from '../../type/AuthLog'\nimport { InsertBuilder } from '@contember/database'\nimport { JSONValue } from '@contember/schema'\n\nexport class CreateAuthLogEntryCommand implements Command<void> {\n\tconstructor(\n\t\tprivate readonly data: CreateAuthLogEntryCommand.Entry,\n\t) {\n\t}\n\n\n\tasync execute({ db, providers }: Command.Args): Promise<void> {\n\t\tawait InsertBuilder.create()\n\t\t\t.into('person_auth_log')\n\t\t\t.values({\n\t\t\t\tid: providers.uuid(),\n\t\t\t\tinvoked_by_id: this.data.invokedById,\n\t\t\t\tperson_id: this.data.personId,\n\t\t\t\tperson_input_identifier: this.data.personInputIdentifier,\n\t\t\t\tperson_token_id: this.data.personTokenId,\n\t\t\t\ttype: this.data.type,\n\t\t\t\tsuccess: this.data.success,\n\t\t\t\terror_code: this.data.errorCode,\n\t\t\t\terror_message: this.data.errorMessage,\n\t\t\t\tip_address: this.data.ipAddress,\n\t\t\t\tuser_agent: this.data.userAgent,\n\t\t\t\tidentity_provider_id: this.data.identityProviderId,\n\t\t\t\tmetadata: this.data.metadata ?? {},\n\t\t\t})\n\t\t\t.execute(db)\n\n\t}\n}\n\nnamespace CreateAuthLogEntryCommand {\n\texport type Entry = {\n\t\ttype: AuthActionType\n\t\tinvokedById: string\n\t\tpersonInputIdentifier?: string\n\t\tpersonId?: string\n\t\tpersonTokenId?: string\n\t\tsuccess: boolean\n\t\terrorCode?: string\n\t\terrorMessage?: string\n\t\tipAddress?: string\n\t\tuserAgent?: string\n\t\tidentityProviderId?: string\n\t\tmetadata?: JSONValue\n\t}\n}\n"],"names":["InsertBuilder"],"mappings":";AAKO,MAAM,0BAAmD;AAAA,EAC/D,YACkB,MAChB;AADgB,SAAA,OAAA;AAAA,EAAA;AAAA,EAKlB,MAAM,QAAQ,EAAE,IAAI,aAA0C;AAC7D,UAAMA,gBAAc,OAAO,EACzB,KAAK,iBAAiB,EACtB,OAAO;AAAA,MACP,IAAI,UAAU,KAAK;AAAA,MACnB,eAAe,KAAK,KAAK;AAAA,MACzB,WAAW,KAAK,KAAK;AAAA,MACrB,yBAAyB,KAAK,KAAK;AAAA,MACnC,iBAAiB,KAAK,KAAK;AAAA,MAC3B,MAAM,KAAK,KAAK;AAAA,MAChB,SAAS,KAAK,KAAK;AAAA,MACnB,YAAY,KAAK,KAAK;AAAA,MACtB,eAAe,KAAK,KAAK;AAAA,MACzB,YAAY,KAAK,KAAK;AAAA,MACtB,YAAY,KAAK,KAAK;AAAA,MACtB,sBAAsB,KAAK,KAAK;AAAA,MAChC,UAAU,KAAK,KAAK,YAAY,CAAA;AAAA,IAAC,CACjC,EACA,QAAQ,EAAE;AAAA,EAAA;AAGd;"}

package/dist/production/src/model/commands/configuration/UpdateConfigurationCommand.cjs

@@ -7,9 +7,22 @@ class UpdateConfigurationCommand {
   }
   async execute({ db }) {
     const result = await Database.UpdateBuilder.create().table("config").where({ id: "singleton" }).values({
-      passwordless_enabled: this.configuration.passwordless?.enabled,
+      passwordless_enabled: this.configuration.passwordless?.enabled ?? void 0,
       passwordless_url: this.configuration.passwordless?.url,
-      passwordless_expiration_minutes: this.configuration.passwordless?.expirationMinutes
+      passwordless_expiration: this.configuration.passwordless?.expiration ?? void 0,
+      password_min_length: this.configuration.password?.minLength ?? void 0,
+      password_require_uppercase: this.configuration.password?.requireUppercase ?? void 0,
+      password_require_lowercase: this.configuration.password?.requireLowercase ?? void 0,
+      password_require_digit: this.configuration.password?.requireDigit ?? void 0,
+      password_require_special: this.configuration.password?.requireSpecial ?? void 0,
+      password_pattern: this.configuration.password?.pattern,
+      password_check_blacklist: this.configuration.password?.checkBlacklist ?? void 0,
+      login_base_backoff: this.configuration.login?.baseBackoff ?? void 0,
+      login_max_backoff: this.configuration.login?.maxBackoff ?? void 0,
+      login_attempt_window: this.configuration.login?.attemptWindow ?? void 0,
+      login_reveal_user_exits: this.configuration.login?.revealUserExists ?? void 0,
+      login_default_token_expiration: this.configuration.login?.defaultTokenExpiration ?? void 0,
+      login_max_token_expiration: this.configuration.login?.maxTokenExpiration
     }).execute(db);
     if (!result) {
       throw new Error("Configuration not found");

package/dist/production/src/model/commands/configuration/UpdateConfigurationCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateConfigurationCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/configuration/UpdateConfigurationCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ConfigInput } from '../../../schema'\nimport { UpdateBuilder } from '@contember/database'\n\nexport class UpdateConfigurationCommand implements Command<void> {\n\tconstructor(\n\t\tprivate readonly configuration: ConfigInput,\n\t) {\n\t}\n\n\tasync execute({ db }: Command.Args): Promise<void> {\n\t\tconst result = await UpdateBuilder.create()\n\t\t\t.table('config')\n\t\t\t.where({ id: 'singleton' })\n\t\t\t.values({\n\t\t\t\tpasswordless_enabled: this.configuration.passwordless?.enabled,\n\t\t\t\tpasswordless_url: this.configuration.passwordless?.url,\n\t\t\t\tpasswordless_expiration_minutes: this.configuration.passwordless?.expirationMinutes,\n\t\t\t})\n\t\t\t.execute(db)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\t}\n\n}\n"],"names":["UpdateBuilder"],"mappings":";;;AAIO,MAAM,2BAAoD;AAAA,EAChE,YACkB,eAChB;AADgB,SAAA,gBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,QAAQ,EAAE,MAAmC;AAClD,UAAM,SAAS,MAAMA,SAAAA,cAAc,OAAA,EACjC,MAAM,QAAQ,EACd,MAAM,EAAE,IAAI,YAAa,CAAA,EACzB,OAAO;AAAA,MACP,sBAAsB,KAAK,cAAc,cAAc;AAAA,MACvD,kBAAkB,KAAK,cAAc,cAAc;AAAA,MACnD,iCAAiC,KAAK,cAAc,cAAc;AAAA,IAAA,CAClE,EACA,QAAQ,EAAE;AACZ,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAAA,EAC1C;AAGF;;"}
+{"version":3,"file":"UpdateConfigurationCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/configuration/UpdateConfigurationCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ConfigInput } from '../../../schema'\nimport { UpdateBuilder } from '@contember/database'\nimport { ConfigRow } from '../../type/Config'\nimport { IPostgresInterval } from 'postgres-interval'\n\nexport class UpdateConfigurationCommand implements Command<void> {\n\tconstructor(\n\t\tprivate readonly configuration: ConfigInput,\n\t) {\n\t}\n\n\tasync execute({ db }: Command.Args): Promise<void> {\n\n\t\tconst result = await UpdateBuilder.create()\n\t\t\t.table('config')\n\t\t\t.where({ id: 'singleton' })\n\t\t\t.values({\n\t\t\t\tpasswordless_enabled: this.configuration.passwordless?.enabled ?? undefined,\n\t\t\t\tpasswordless_url: this.configuration.passwordless?.url,\n\t\t\t\tpasswordless_expiration: this.configuration.passwordless?.expiration ?? undefined,\n\t\t\t\tpassword_min_length: this.configuration.password?.minLength ?? undefined,\n\t\t\t\tpassword_require_uppercase: this.configuration.password?.requireUppercase ?? undefined,\n\t\t\t\tpassword_require_lowercase: this.configuration.password?.requireLowercase ?? undefined,\n\t\t\t\tpassword_require_digit: this.configuration.password?.requireDigit ?? undefined,\n\t\t\t\tpassword_require_special: this.configuration.password?.requireSpecial ?? undefined,\n\t\t\t\tpassword_pattern: this.configuration.password?.pattern,\n\t\t\t\tpassword_check_blacklist: this.configuration.password?.checkBlacklist ?? undefined,\n\t\t\t\tlogin_base_backoff: this.configuration.login?.baseBackoff ?? undefined,\n\t\t\t\tlogin_max_backoff: this.configuration.login?.maxBackoff ?? undefined,\n\t\t\t\tlogin_attempt_window: this.configuration.login?.attemptWindow ?? undefined,\n\t\t\t\tlogin_reveal_user_exits: this.configuration.login?.revealUserExists ?? undefined,\n\t\t\t\tlogin_default_token_expiration: this.configuration.login?.defaultTokenExpiration ?? undefined,\n\t\t\t\tlogin_max_token_expiration: this.configuration.login?.maxTokenExpiration,\n\t\t\t} satisfies {\n\t\t\t\t[K in keyof ConfigRow]: (IPostgresInterval extends ConfigRow[K] ? string : never) | Exclude<ConfigRow[K], IPostgresInterval> | undefined\n\t\t\t})\n\t\t\t.execute(db)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\t}\n\n}\n"],"names":["UpdateBuilder"],"mappings":";;;AAMO,MAAM,2BAAoD;AAAA,EAChE,YACkB,eAChB;AADgB,SAAA,gBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,QAAQ,EAAE,MAAmC;AAElD,UAAM,SAAS,MAAMA,SAAAA,cAAc,OAAA,EACjC,MAAM,QAAQ,EACd,MAAM,EAAE,IAAI,YAAa,CAAA,EACzB,OAAO;AAAA,MACP,sBAAsB,KAAK,cAAc,cAAc,WAAW;AAAA,MAClE,kBAAkB,KAAK,cAAc,cAAc;AAAA,MACnD,yBAAyB,KAAK,cAAc,cAAc,cAAc;AAAA,MACxE,qBAAqB,KAAK,cAAc,UAAU,aAAa;AAAA,MAC/D,4BAA4B,KAAK,cAAc,UAAU,oBAAoB;AAAA,MAC7E,4BAA4B,KAAK,cAAc,UAAU,oBAAoB;AAAA,MAC7E,wBAAwB,KAAK,cAAc,UAAU,gBAAgB;AAAA,MACrE,0BAA0B,KAAK,cAAc,UAAU,kBAAkB;AAAA,MACzE,kBAAkB,KAAK,cAAc,UAAU;AAAA,MAC/C,0BAA0B,KAAK,cAAc,UAAU,kBAAkB;AAAA,MACzE,oBAAoB,KAAK,cAAc,OAAO,eAAe;AAAA,MAC7D,mBAAmB,KAAK,cAAc,OAAO,cAAc;AAAA,MAC3D,sBAAsB,KAAK,cAAc,OAAO,iBAAiB;AAAA,MACjE,yBAAyB,KAAK,cAAc,OAAO,oBAAoB;AAAA,MACvE,gCAAgC,KAAK,cAAc,OAAO,0BAA0B;AAAA,MACpF,4BAA4B,KAAK,cAAc,OAAO;AAAA,IAAA,CAGtD,EACA,QAAQ,EAAE;AACZ,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAAA,EAC1C;AAGF;;"}

package/dist/production/src/model/commands/configuration/UpdateConfigurationCommand.js

@@ -5,9 +5,22 @@ class UpdateConfigurationCommand {
   }
   async execute({ db }) {
     const result = await UpdateBuilder$1.create().table("config").where({ id: "singleton" }).values({
-      passwordless_enabled: this.configuration.passwordless?.enabled,
+      passwordless_enabled: this.configuration.passwordless?.enabled ?? void 0,
       passwordless_url: this.configuration.passwordless?.url,
-      passwordless_expiration_minutes: this.configuration.passwordless?.expirationMinutes
+      passwordless_expiration: this.configuration.passwordless?.expiration ?? void 0,
+      password_min_length: this.configuration.password?.minLength ?? void 0,
+      password_require_uppercase: this.configuration.password?.requireUppercase ?? void 0,
+      password_require_lowercase: this.configuration.password?.requireLowercase ?? void 0,
+      password_require_digit: this.configuration.password?.requireDigit ?? void 0,
+      password_require_special: this.configuration.password?.requireSpecial ?? void 0,
+      password_pattern: this.configuration.password?.pattern,
+      password_check_blacklist: this.configuration.password?.checkBlacklist ?? void 0,
+      login_base_backoff: this.configuration.login?.baseBackoff ?? void 0,
+      login_max_backoff: this.configuration.login?.maxBackoff ?? void 0,
+      login_attempt_window: this.configuration.login?.attemptWindow ?? void 0,
+      login_reveal_user_exits: this.configuration.login?.revealUserExists ?? void 0,
+      login_default_token_expiration: this.configuration.login?.defaultTokenExpiration ?? void 0,
+      login_max_token_expiration: this.configuration.login?.maxTokenExpiration
     }).execute(db);
     if (!result) {
       throw new Error("Configuration not found");

package/dist/production/src/model/commands/configuration/UpdateConfigurationCommand.js.map

@@ -1 +1 @@
-{"version":3,"file":"UpdateConfigurationCommand.js","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/configuration/UpdateConfigurationCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ConfigInput } from '../../../schema'\nimport { UpdateBuilder } from '@contember/database'\n\nexport class UpdateConfigurationCommand implements Command<void> {\n\tconstructor(\n\t\tprivate readonly configuration: ConfigInput,\n\t) {\n\t}\n\n\tasync execute({ db }: Command.Args): Promise<void> {\n\t\tconst result = await UpdateBuilder.create()\n\t\t\t.table('config')\n\t\t\t.where({ id: 'singleton' })\n\t\t\t.values({\n\t\t\t\tpasswordless_enabled: this.configuration.passwordless?.enabled,\n\t\t\t\tpasswordless_url: this.configuration.passwordless?.url,\n\t\t\t\tpasswordless_expiration_minutes: this.configuration.passwordless?.expirationMinutes,\n\t\t\t})\n\t\t\t.execute(db)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\t}\n\n}\n"],"names":["UpdateBuilder"],"mappings":";AAIO,MAAM,2BAAoD;AAAA,EAChE,YACkB,eAChB;AADgB,SAAA,gBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,QAAQ,EAAE,MAAmC;AAClD,UAAM,SAAS,MAAMA,gBAAc,OAAA,EACjC,MAAM,QAAQ,EACd,MAAM,EAAE,IAAI,YAAa,CAAA,EACzB,OAAO;AAAA,MACP,sBAAsB,KAAK,cAAc,cAAc;AAAA,MACvD,kBAAkB,KAAK,cAAc,cAAc;AAAA,MACnD,iCAAiC,KAAK,cAAc,cAAc;AAAA,IAAA,CAClE,EACA,QAAQ,EAAE;AACZ,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAAA,EAC1C;AAGF;"}
+{"version":3,"file":"UpdateConfigurationCommand.js","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/configuration/UpdateConfigurationCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ConfigInput } from '../../../schema'\nimport { UpdateBuilder } from '@contember/database'\nimport { ConfigRow } from '../../type/Config'\nimport { IPostgresInterval } from 'postgres-interval'\n\nexport class UpdateConfigurationCommand implements Command<void> {\n\tconstructor(\n\t\tprivate readonly configuration: ConfigInput,\n\t) {\n\t}\n\n\tasync execute({ db }: Command.Args): Promise<void> {\n\n\t\tconst result = await UpdateBuilder.create()\n\t\t\t.table('config')\n\t\t\t.where({ id: 'singleton' })\n\t\t\t.values({\n\t\t\t\tpasswordless_enabled: this.configuration.passwordless?.enabled ?? undefined,\n\t\t\t\tpasswordless_url: this.configuration.passwordless?.url,\n\t\t\t\tpasswordless_expiration: this.configuration.passwordless?.expiration ?? undefined,\n\t\t\t\tpassword_min_length: this.configuration.password?.minLength ?? undefined,\n\t\t\t\tpassword_require_uppercase: this.configuration.password?.requireUppercase ?? undefined,\n\t\t\t\tpassword_require_lowercase: this.configuration.password?.requireLowercase ?? undefined,\n\t\t\t\tpassword_require_digit: this.configuration.password?.requireDigit ?? undefined,\n\t\t\t\tpassword_require_special: this.configuration.password?.requireSpecial ?? undefined,\n\t\t\t\tpassword_pattern: this.configuration.password?.pattern,\n\t\t\t\tpassword_check_blacklist: this.configuration.password?.checkBlacklist ?? undefined,\n\t\t\t\tlogin_base_backoff: this.configuration.login?.baseBackoff ?? undefined,\n\t\t\t\tlogin_max_backoff: this.configuration.login?.maxBackoff ?? undefined,\n\t\t\t\tlogin_attempt_window: this.configuration.login?.attemptWindow ?? undefined,\n\t\t\t\tlogin_reveal_user_exits: this.configuration.login?.revealUserExists ?? undefined,\n\t\t\t\tlogin_default_token_expiration: this.configuration.login?.defaultTokenExpiration ?? undefined,\n\t\t\t\tlogin_max_token_expiration: this.configuration.login?.maxTokenExpiration,\n\t\t\t} satisfies {\n\t\t\t\t[K in keyof ConfigRow]: (IPostgresInterval extends ConfigRow[K] ? string : never) | Exclude<ConfigRow[K], IPostgresInterval> | undefined\n\t\t\t})\n\t\t\t.execute(db)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\t}\n\n}\n"],"names":["UpdateBuilder"],"mappings":";AAMO,MAAM,2BAAoD;AAAA,EAChE,YACkB,eAChB;AADgB,SAAA,gBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,QAAQ,EAAE,MAAmC;AAElD,UAAM,SAAS,MAAMA,gBAAc,OAAA,EACjC,MAAM,QAAQ,EACd,MAAM,EAAE,IAAI,YAAa,CAAA,EACzB,OAAO;AAAA,MACP,sBAAsB,KAAK,cAAc,cAAc,WAAW;AAAA,MAClE,kBAAkB,KAAK,cAAc,cAAc;AAAA,MACnD,yBAAyB,KAAK,cAAc,cAAc,cAAc;AAAA,MACxE,qBAAqB,KAAK,cAAc,UAAU,aAAa;AAAA,MAC/D,4BAA4B,KAAK,cAAc,UAAU,oBAAoB;AAAA,MAC7E,4BAA4B,KAAK,cAAc,UAAU,oBAAoB;AAAA,MAC7E,wBAAwB,KAAK,cAAc,UAAU,gBAAgB;AAAA,MACrE,0BAA0B,KAAK,cAAc,UAAU,kBAAkB;AAAA,MACzE,kBAAkB,KAAK,cAAc,UAAU;AAAA,MAC/C,0BAA0B,KAAK,cAAc,UAAU,kBAAkB;AAAA,MACzE,oBAAoB,KAAK,cAAc,OAAO,eAAe;AAAA,MAC7D,mBAAmB,KAAK,cAAc,OAAO,cAAc;AAAA,MAC3D,sBAAsB,KAAK,cAAc,OAAO,iBAAiB;AAAA,MACjE,yBAAyB,KAAK,cAAc,OAAO,oBAAoB;AAAA,MACvE,gCAAgC,KAAK,cAAc,OAAO,0BAA0B;AAAA,MACpF,4BAA4B,KAAK,cAAc,OAAO;AAAA,IAAA,CAGtD,EACA,QAAQ,EAAE;AACZ,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAAA,EAC1C;AAGF;"}

package/dist/production/src/model/commands/personToken/CreatePersonTokenCommand.cjs

@@ -4,7 +4,7 @@ require("@contember/database");
 require("../../type/ApiKey.cjs");
 const SavePersonTokenCommand = require("./SavePersonTokenCommand.cjs");
 const expirations = require("../../consts/expirations.cjs");
-const tokenUtils = require("../../utils/tokenUtils.cjs");
+const token = require("../../utils/token.cjs");
 class CreatePersonTokenCommand {
   constructor(personId, type, expirationMinutes) {
     this.personId = personId;
@@ -18,15 +18,15 @@ class CreatePersonTokenCommand {
     return new CreatePersonTokenCommand(personId, "passwordless", expirationMinutes);
   }
   async execute({ db, providers, bus }) {
-    const token = await tokenUtils.generateToken(providers);
-    const tokenHash = tokenUtils.computeTokenHash(token);
+    const token$1 = await token.generateToken(providers);
+    const tokenHash = token.computeTokenHash(token$1);
     const result = await bus.execute(new SavePersonTokenCommand.SavePersonTokenCommand(
       this.personId,
       tokenHash,
       this.type,
       this.expirationMinutes
     ));
-    return { ...result, token };
+    return { ...result, token: token$1 };
   }
 }
 exports.CreatePersonTokenCommand = CreatePersonTokenCommand;

package/dist/production/src/model/commands/personToken/CreatePersonTokenCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"CreatePersonTokenCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/personToken/CreatePersonTokenCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { computeTokenHash, generateToken } from '../../utils'\nimport { SavePersonTokenCommand } from './SavePersonTokenCommand'\nimport { PersonToken } from '../../type'\nimport { PASSWORD_RESET_EXPIRATION_MINUTES } from '../../consts/expirations'\n\nexport class CreatePersonTokenCommand implements Command<CreatePersonTokenCommand.Result> {\n\tprivate constructor(\n\t\tprivate readonly personId: string,\n\t\tprivate readonly type: PersonToken.Type,\n\t\tprivate readonly expirationMinutes: number,\n\t) {}\n\n\tstatic createPasswordResetRequest(personId: string, expirationMinutes: number = PASSWORD_RESET_EXPIRATION_MINUTES): CreatePersonTokenCommand {\n\t\treturn new CreatePersonTokenCommand(personId, 'password_reset', expirationMinutes)\n\t}\n\n\tstatic createPasswordlessRequest(personId: string, expirationMinutes: number): CreatePersonTokenCommand {\n\t\treturn new CreatePersonTokenCommand(personId, 'passwordless', expirationMinutes)\n\t}\n\n\tasync execute({ db, providers, bus }: Command.Args): Promise<CreatePersonTokenCommand.Result> {\n\t\tconst token = await generateToken(providers)\n\t\tconst tokenHash = computeTokenHash(token)\n\t\tconst result = await bus.execute(new SavePersonTokenCommand(\n\t\t\tthis.personId,\n\t\t\ttokenHash,\n\t\t\tthis.type,\n\t\t\tthis.expirationMinutes,\n\t\t))\n\n\t\treturn { ...result, token }\n\t}\n}\n\nnamespace CreatePersonTokenCommand {\n\texport interface Result {\n\t\treadonly id: string\n\t\treadonly token: string\n\t\treadonly expiresAt: Date\n\t}\n}\n"],"names":["PASSWORD_RESET_EXPIRATION_MINUTES","generateToken","computeTokenHash","SavePersonTokenCommand"],"mappings":";;;;;;;AAMO,MAAM,yBAA6E;AAAA,EACjF,YACU,UACA,MACA,mBAChB;AAHgB,SAAA,WAAA;AACA,SAAA,OAAA;AACA,SAAA,oBAAA;AAAA,EAAA;AAAA,EAGlB,OAAO,2BAA2B,UAAkB,oBAA4BA,+CAA6D;AAC5I,WAAO,IAAI,yBAAyB,UAAU,kBAAkB,iBAAiB;AAAA,EAAA;AAAA,EAGlF,OAAO,0BAA0B,UAAkB,mBAAqD;AACvG,WAAO,IAAI,yBAAyB,UAAU,gBAAgB,iBAAiB;AAAA,EAAA;AAAA,EAGhF,MAAM,QAAQ,EAAE,IAAI,WAAW,OAA+D;AACvF,UAAA,QAAQ,MAAMC,WAAA,cAAc,SAAS;AACrC,UAAA,YAAYC,4BAAiB,KAAK;AACxC,UAAM,SAAS,MAAM,IAAI,QAAQ,IAAIC,uBAAA;AAAA,MACpC,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IAAA,CACL;AAEM,WAAA,EAAE,GAAG,QAAQ,MAAM;AAAA,EAAA;AAE5B;;"}
+{"version":3,"file":"CreatePersonTokenCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/personToken/CreatePersonTokenCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { computeTokenHash, generateToken } from '../../utils'\nimport { SavePersonTokenCommand } from './SavePersonTokenCommand'\nimport { PersonToken } from '../../type'\nimport { PASSWORD_RESET_EXPIRATION_MINUTES } from '../../consts/expirations'\n\nexport class CreatePersonTokenCommand implements Command<CreatePersonTokenCommand.Result> {\n\tprivate constructor(\n\t\tprivate readonly personId: string,\n\t\tprivate readonly type: PersonToken.Type,\n\t\tprivate readonly expirationMinutes: number,\n\t) {}\n\n\tstatic createPasswordResetRequest(personId: string, expirationMinutes: number = PASSWORD_RESET_EXPIRATION_MINUTES): CreatePersonTokenCommand {\n\t\treturn new CreatePersonTokenCommand(personId, 'password_reset', expirationMinutes)\n\t}\n\n\tstatic createPasswordlessRequest(personId: string, expirationMinutes: number): CreatePersonTokenCommand {\n\t\treturn new CreatePersonTokenCommand(personId, 'passwordless', expirationMinutes)\n\t}\n\n\tasync execute({ db, providers, bus }: Command.Args): Promise<CreatePersonTokenCommand.Result> {\n\t\tconst token = await generateToken(providers)\n\t\tconst tokenHash = computeTokenHash(token)\n\t\tconst result = await bus.execute(new SavePersonTokenCommand(\n\t\t\tthis.personId,\n\t\t\ttokenHash,\n\t\t\tthis.type,\n\t\t\tthis.expirationMinutes,\n\t\t))\n\n\t\treturn { ...result, token }\n\t}\n}\n\nnamespace CreatePersonTokenCommand {\n\texport interface Result {\n\t\treadonly id: string\n\t\treadonly token: string\n\t\treadonly expiresAt: Date\n\t}\n}\n"],"names":["PASSWORD_RESET_EXPIRATION_MINUTES","token","generateToken","computeTokenHash","SavePersonTokenCommand"],"mappings":";;;;;;;AAMO,MAAM,yBAA6E;AAAA,EACjF,YACU,UACA,MACA,mBAChB;AAHgB,SAAA,WAAA;AACA,SAAA,OAAA;AACA,SAAA,oBAAA;AAAA,EAAA;AAAA,EAGlB,OAAO,2BAA2B,UAAkB,oBAA4BA,+CAA6D;AAC5I,WAAO,IAAI,yBAAyB,UAAU,kBAAkB,iBAAiB;AAAA,EAAA;AAAA,EAGlF,OAAO,0BAA0B,UAAkB,mBAAqD;AACvG,WAAO,IAAI,yBAAyB,UAAU,gBAAgB,iBAAiB;AAAA,EAAA;AAAA,EAGhF,MAAM,QAAQ,EAAE,IAAI,WAAW,OAA+D;AACvF,UAAAC,UAAQ,MAAMC,MAAA,cAAc,SAAS;AACrC,UAAA,YAAYC,uBAAiBF,OAAK;AACxC,UAAM,SAAS,MAAM,IAAI,QAAQ,IAAIG,uBAAA;AAAA,MACpC,KAAK;AAAA,MACL;AAAA,MACA,KAAK;AAAA,MACL,KAAK;AAAA,IAAA,CACL;AAEM,WAAA,EAAE,GAAG,QAAA,OAAQH,QAAM;AAAA,EAAA;AAE5B;;"}

package/dist/production/src/model/commands/personToken/CreatePersonTokenCommand.js

@@ -2,7 +2,7 @@ import "@contember/database";
 import "../../type/ApiKey.js";
 import { SavePersonTokenCommand } from "./SavePersonTokenCommand.js";
 import { PASSWORD_RESET_EXPIRATION_MINUTES } from "../../consts/expirations.js";
-import { generateToken, computeTokenHash } from "../../utils/tokenUtils.js";
+import { generateToken, computeTokenHash } from "../../utils/token.js";
 class CreatePersonTokenCommand {
   constructor(personId, type, expirationMinutes) {
     this.personId = personId;

package/dist/production/src/model/commands/personToken/ResetPasswordCommand.cjs

@@ -6,16 +6,16 @@ const PersonTokenQuery = require("../../queries/personToken/PersonTokenQuery.cjs
 const InvalidateTokenCommand = require("./InvalidateTokenCommand.cjs");
 require("@contember/database");
 require("../../type/ApiKey.cjs");
-const tokenUtils = require("../../utils/tokenUtils.cjs");
+const token = require("../../utils/token.cjs");
 class ResetPasswordCommand {
-  constructor(token, password) {
-    this.token = token;
+  constructor(token2, password) {
+    this.token = token2;
     this.password = password;
   }
   async execute({ db, providers, bus }) {
     const now = providers.now();
-    const token = await db.createQueryHandler().fetch(PersonTokenQuery.PersonTokenQuery.byToken(this.token, "password_reset"));
-    const tokenValidationResult = tokenUtils.validateToken({ entry: token, token: this.token, now, validationType: "token" });
+    const token$1 = await db.createQueryHandler().fetch(PersonTokenQuery.PersonTokenQuery.byToken(this.token, "password_reset"));
+    const tokenValidationResult = token.validateToken({ entry: token$1, token: this.token, now, validationType: "token" });
     if (!tokenValidationResult.ok) {
       return tokenValidationResult;
     }

package/dist/production/src/model/commands/personToken/ResetPasswordCommand.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ResetPasswordCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/personToken/ResetPasswordCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ChangePasswordCommand } from '../person/ChangePasswordCommand'\nimport { Response, ResponseOk } from '../../utils/Response'\nimport { PersonTokenQuery } from '../../queries/personToken/PersonTokenQuery'\nimport { InvalidateTokenCommand } from './InvalidateTokenCommand'\nimport { validateToken } from '../../utils'\nimport { PersonToken } from '../../type'\n\nexport class ResetPasswordCommand implements Command<ResetPasswordCommandResponse> {\n\tconstructor(private readonly token: string, private readonly password: string) {}\n\n\tasync execute({ db, providers, bus }: Command.Args): Promise<ResetPasswordCommandResponse> {\n\t\tconst now = providers.now()\n\t\tconst token = await db.createQueryHandler().fetch(PersonTokenQuery.byToken(this.token, 'password_reset'))\n\t\tconst tokenValidationResult = validateToken({ entry: token, token: this.token, now, validationType: 'token' })\n\t\tif (!tokenValidationResult.ok) {\n\t\t\treturn tokenValidationResult\n\t\t}\n\t\tawait bus.execute(new InvalidateTokenCommand(tokenValidationResult.result.id))\n\t\tawait bus.execute(new ChangePasswordCommand(tokenValidationResult.result.person_id, this.password))\n\n\t\treturn new ResponseOk(null)\n\t}\n}\nexport type ResetPasswordCommandErrorCode =\n\t| PersonToken.TokenValidationError\n\nexport type ResetPasswordCommandResponse = Response<null, PersonToken.TokenValidationError>\n"],"names":["PersonTokenQuery","validateToken","InvalidateTokenCommand","ChangePasswordCommand","ResponseOk"],"mappings":";;;;;;;;;AAQO,MAAM,qBAAsE;AAAA,EAClF,YAA6B,OAAgC,UAAkB;AAAlD,SAAA,QAAA;AAAgC,SAAA,WAAA;AAAA,EAAA;AAAA,EAE7D,MAAM,QAAQ,EAAE,IAAI,WAAW,OAA4D;AACpF,UAAA,MAAM,UAAU,IAAI;AACpB,UAAA,QAAQ,MAAM,GAAG,qBAAqB,MAAMA,iBAAA,iBAAiB,QAAQ,KAAK,OAAO,gBAAgB,CAAC;AAClG,UAAA,wBAAwBC,WAAAA,cAAc,EAAE,OAAO,OAAO,OAAO,KAAK,OAAO,KAAK,gBAAgB,QAAA,CAAS;AACzG,QAAA,CAAC,sBAAsB,IAAI;AACvB,aAAA;AAAA,IAAA;AAER,UAAM,IAAI,QAAQ,IAAIC,uBAAAA,uBAAuB,sBAAsB,OAAO,EAAE,CAAC;AACvE,UAAA,IAAI,QAAQ,IAAIC,4CAAsB,sBAAsB,OAAO,WAAW,KAAK,QAAQ,CAAC;AAE3F,WAAA,IAAIC,oBAAW,IAAI;AAAA,EAAA;AAE5B;;"}
+{"version":3,"file":"ResetPasswordCommand.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/commands/personToken/ResetPasswordCommand.ts"],"sourcesContent":["import { Command } from '../Command'\nimport { ChangePasswordCommand } from '../person/ChangePasswordCommand'\nimport { Response, ResponseOk } from '../../utils/Response'\nimport { PersonTokenQuery } from '../../queries/personToken/PersonTokenQuery'\nimport { InvalidateTokenCommand } from './InvalidateTokenCommand'\nimport { validateToken } from '../../utils'\nimport { PersonToken } from '../../type'\n\nexport class ResetPasswordCommand implements Command<ResetPasswordCommandResponse> {\n\tconstructor(private readonly token: string, private readonly password: string) {}\n\n\tasync execute({ db, providers, bus }: Command.Args): Promise<ResetPasswordCommandResponse> {\n\t\tconst now = providers.now()\n\t\tconst token = await db.createQueryHandler().fetch(PersonTokenQuery.byToken(this.token, 'password_reset'))\n\t\tconst tokenValidationResult = validateToken({ entry: token, token: this.token, now, validationType: 'token' })\n\t\tif (!tokenValidationResult.ok) {\n\t\t\treturn tokenValidationResult\n\t\t}\n\t\tawait bus.execute(new InvalidateTokenCommand(tokenValidationResult.result.id))\n\t\tawait bus.execute(new ChangePasswordCommand(tokenValidationResult.result.person_id, this.password))\n\n\t\treturn new ResponseOk(null)\n\t}\n}\nexport type ResetPasswordCommandErrorCode =\n\t| PersonToken.TokenValidationError\n\nexport type ResetPasswordCommandResponse = Response<null, PersonToken.TokenValidationError>\n"],"names":["token","PersonTokenQuery","validateToken","InvalidateTokenCommand","ChangePasswordCommand","ResponseOk"],"mappings":";;;;;;;;;AAQO,MAAM,qBAAsE;AAAA,EAClF,YAA6BA,QAAgC,UAAkB;AAAlD,SAAA,QAAAA;AAAgC,SAAA,WAAA;AAAA,EAAA;AAAA,EAE7D,MAAM,QAAQ,EAAE,IAAI,WAAW,OAA4D;AACpF,UAAA,MAAM,UAAU,IAAI;AACpB,UAAAA,UAAQ,MAAM,GAAG,qBAAqB,MAAMC,iBAAA,iBAAiB,QAAQ,KAAK,OAAO,gBAAgB,CAAC;AAClG,UAAA,wBAAwBC,MAAAA,cAAc,EAAE,OAAOF,SAAO,OAAO,KAAK,OAAO,KAAK,gBAAgB,QAAA,CAAS;AACzG,QAAA,CAAC,sBAAsB,IAAI;AACvB,aAAA;AAAA,IAAA;AAER,UAAM,IAAI,QAAQ,IAAIG,uBAAAA,uBAAuB,sBAAsB,OAAO,EAAE,CAAC;AACvE,UAAA,IAAI,QAAQ,IAAIC,4CAAsB,sBAAsB,OAAO,WAAW,KAAK,QAAQ,CAAC;AAE3F,WAAA,IAAIC,oBAAW,IAAI;AAAA,EAAA;AAE5B;;"}

package/dist/production/src/model/commands/personToken/ResetPasswordCommand.js

@@ -4,7 +4,7 @@ import { PersonTokenQuery } from "../../queries/personToken/PersonTokenQuery.js"
 import { InvalidateTokenCommand } from "./InvalidateTokenCommand.js";
 import "@contember/database";
 import "../../type/ApiKey.js";
-import { validateToken } from "../../utils/tokenUtils.js";
+import { validateToken } from "../../utils/token.js";
 class ResetPasswordCommand {
   constructor(token, password) {
     this.token = token;

package/dist/production/src/model/queries/apiKey/ApiKeyQuery.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Database = require("@contember/database");
 require("../../type/ApiKey.cjs");
-const tokenUtils = require("../../utils/tokenUtils.cjs");
+const token = require("../../utils/token.cjs");
 class ApiKeyByIdQuery extends Database.DatabaseQuery {
   constructor(apiKeyId) {
     super();
@@ -16,12 +16,12 @@ class ApiKeyByIdQuery extends Database.DatabaseQuery {
   }
 }
 class ApiKeyByTokenQuery extends Database.DatabaseQuery {
-  constructor(token) {
+  constructor(token2) {
     super();
-    this.token = token;
+    this.token = token2;
   }
   async fetch({ db }) {
-    const tokenHash = tokenUtils.computeTokenHash(this.token);
+    const tokenHash = token.computeTokenHash(this.token);
     const rows = await apiKeyBaseQuery.where({ token_hash: tokenHash }).getResult(db);
     return this.fetchOneOrNull(rows);
   }

package/dist/production/src/model/queries/apiKey/ApiKeyQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ApiKeyQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/apiKey/ApiKeyQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Operator, SelectBuilder } from '@contember/database'\nimport { ApiKey } from '../../type'\nimport { computeTokenHash } from '../../utils'\n\nexport class ApiKeyByIdQuery extends DatabaseQuery<null | ApiKeyRow> {\n\tconstructor(private readonly apiKeyId: string) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<null | ApiKeyRow> {\n\t\tconst rows = await apiKeyBaseQuery\n\t\t\t.where(\n\t\t\t\twhere => where.compare(['api_key', 'id'], Operator.eq, this.apiKeyId),\n\t\t\t)\n\t\t\t.getResult(db)\n\n\t\treturn this.fetchOneOrNull(rows)\n\t}\n}\n\nexport class ApiKeyByTokenQuery extends DatabaseQuery<null | ApiKeyRow> {\n\tconstructor(private readonly token: string) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<null | ApiKeyRow> {\n\t\tconst tokenHash = computeTokenHash(this.token)\n\t\tconst rows = await apiKeyBaseQuery\n\t\t\t.where({ token_hash: tokenHash })\n\t\t\t.getResult(db)\n\n\t\treturn this.fetchOneOrNull(rows)\n\t}\n}\n\nexport type ApiKeyRow = {\n\treadonly id: string\n\treadonly type: ApiKey.Type\n\treadonly identity_id: string\n\treadonly disabled_at: Date | null\n\treadonly expires_at: Date | null\n\treadonly expiration: number | null\n\treadonly roles: string[]\n\treadonly person_id: string | null\n}\n\nconst apiKeyBaseQuery = SelectBuilder.create<null | ApiKeyRow>()\n\t.select(['api_key', 'id'])\n\t.select(['api_key', 'type'])\n\t.select(['api_key', 'identity_id'])\n\t.select(['api_key', 'disabled_at'])\n\t.select(['api_key', 'expires_at'])\n\t.select(['identity', 'roles'])\n\t.select(['api_key', 'expiration'])\n\t.select(['person', 'id'], 'person_id')\n\t.from('api_key')\n\t.join('identity', 'identity', joinClause =>\n\t\tjoinClause.compareColumns(['api_key', 'identity_id'], Operator.eq, ['identity', 'id']),\n\t)\n\t.leftJoin(\n\t\t'person', 'person', on => on.compareColumns(\n\t\t\t['person', 'identity_id'], Operator.eq, ['identity', 'id'],\n\t\t),\n\t)\n"],"names":["DatabaseQuery","Operator","computeTokenHash","SelectBuilder"],"mappings":";;;;;AAIO,MAAM,wBAAwBA,SAAAA,cAAgC;AAAA,EACpE,YAA6B,UAAkB;AACxC,UAAA;AADsB,SAAA,WAAA;AAAA,EAAA;AAAA,EAI7B,MAAM,MAAM,EAAE,MAAoD;AAC3D,UAAA,OAAO,MAAM,gBACjB;AAAA,MACA,CAAA,UAAS,MAAM,QAAQ,CAAC,WAAW,IAAI,GAAGC,SAAA,SAAS,IAAI,KAAK,QAAQ;AAAA,IAAA,EAEpE,UAAU,EAAE;AAEP,WAAA,KAAK,eAAe,IAAI;AAAA,EAAA;AAEjC;AAEO,MAAM,2BAA2BD,SAAAA,cAAgC;AAAA,EACvE,YAA6B,OAAe;AACrC,UAAA;AADsB,SAAA,QAAA;AAAA,EAAA;AAAA,EAI7B,MAAM,MAAM,EAAE,MAAoD;AAC3D,UAAA,YAAYE,WAAAA,iBAAiB,KAAK,KAAK;AACvC,UAAA,OAAO,MAAM,gBACjB,MAAM,EAAE,YAAY,UAAW,CAAA,EAC/B,UAAU,EAAE;AAEP,WAAA,KAAK,eAAe,IAAI;AAAA,EAAA;AAEjC;AAaA,MAAM,kBAAkBC,SAAAA,cAAc,OAAA,EACpC,OAAO,CAAC,WAAW,IAAI,CAAC,EACxB,OAAO,CAAC,WAAW,MAAM,CAAC,EAC1B,OAAO,CAAC,WAAW,aAAa,CAAC,EACjC,OAAO,CAAC,WAAW,aAAa,CAAC,EACjC,OAAO,CAAC,WAAW,YAAY,CAAC,EAChC,OAAO,CAAC,YAAY,OAAO,CAAC,EAC5B,OAAO,CAAC,WAAW,YAAY,CAAC,EAChC,OAAO,CAAC,UAAU,IAAI,GAAG,WAAW,EACpC,KAAK,SAAS,EACd;AAAA,EAAK;AAAA,EAAY;AAAA,EAAY,CAC7B,eAAA,WAAW,eAAe,CAAC,WAAW,aAAa,GAAGF,kBAAS,IAAI,CAAC,YAAY,IAAI,CAAC;AACtF,EACC;AAAA,EACA;AAAA,EAAU;AAAA,EAAU,QAAM,GAAG;AAAA,IAC5B,CAAC,UAAU,aAAa;AAAA,IAAGA,SAAAA,SAAS;AAAA,IAAI,CAAC,YAAY,IAAI;AAAA,EAAA;AAE3D;;;"}
+{"version":3,"file":"ApiKeyQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/apiKey/ApiKeyQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Operator, SelectBuilder } from '@contember/database'\nimport { ApiKey } from '../../type'\nimport { computeTokenHash } from '../../utils'\n\nexport class ApiKeyByIdQuery extends DatabaseQuery<null | ApiKeyRow> {\n\tconstructor(private readonly apiKeyId: string) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<null | ApiKeyRow> {\n\t\tconst rows = await apiKeyBaseQuery\n\t\t\t.where(\n\t\t\t\twhere => where.compare(['api_key', 'id'], Operator.eq, this.apiKeyId),\n\t\t\t)\n\t\t\t.getResult(db)\n\n\t\treturn this.fetchOneOrNull(rows)\n\t}\n}\n\nexport class ApiKeyByTokenQuery extends DatabaseQuery<null | ApiKeyRow> {\n\tconstructor(private readonly token: string) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<null | ApiKeyRow> {\n\t\tconst tokenHash = computeTokenHash(this.token)\n\t\tconst rows = await apiKeyBaseQuery\n\t\t\t.where({ token_hash: tokenHash })\n\t\t\t.getResult(db)\n\n\t\treturn this.fetchOneOrNull(rows)\n\t}\n}\n\nexport type ApiKeyRow = {\n\treadonly id: string\n\treadonly type: ApiKey.Type\n\treadonly identity_id: string\n\treadonly disabled_at: Date | null\n\treadonly expires_at: Date | null\n\treadonly expiration: number | null\n\treadonly roles: string[]\n\treadonly person_id: string | null\n}\n\nconst apiKeyBaseQuery = SelectBuilder.create<null | ApiKeyRow>()\n\t.select(['api_key', 'id'])\n\t.select(['api_key', 'type'])\n\t.select(['api_key', 'identity_id'])\n\t.select(['api_key', 'disabled_at'])\n\t.select(['api_key', 'expires_at'])\n\t.select(['identity', 'roles'])\n\t.select(['api_key', 'expiration'])\n\t.select(['person', 'id'], 'person_id')\n\t.from('api_key')\n\t.join('identity', 'identity', joinClause =>\n\t\tjoinClause.compareColumns(['api_key', 'identity_id'], Operator.eq, ['identity', 'id']),\n\t)\n\t.leftJoin(\n\t\t'person', 'person', on => on.compareColumns(\n\t\t\t['person', 'identity_id'], Operator.eq, ['identity', 'id'],\n\t\t),\n\t)\n"],"names":["DatabaseQuery","Operator","token","computeTokenHash","SelectBuilder"],"mappings":";;;;;AAIO,MAAM,wBAAwBA,SAAAA,cAAgC;AAAA,EACpE,YAA6B,UAAkB;AACxC,UAAA;AADsB,SAAA,WAAA;AAAA,EAAA;AAAA,EAI7B,MAAM,MAAM,EAAE,MAAoD;AAC3D,UAAA,OAAO,MAAM,gBACjB;AAAA,MACA,CAAA,UAAS,MAAM,QAAQ,CAAC,WAAW,IAAI,GAAGC,SAAA,SAAS,IAAI,KAAK,QAAQ;AAAA,IAAA,EAEpE,UAAU,EAAE;AAEP,WAAA,KAAK,eAAe,IAAI;AAAA,EAAA;AAEjC;AAEO,MAAM,2BAA2BD,SAAAA,cAAgC;AAAA,EACvE,YAA6BE,QAAe;AACrC,UAAA;AADsB,SAAA,QAAAA;AAAA,EAAA;AAAA,EAI7B,MAAM,MAAM,EAAE,MAAoD;AAC3D,UAAA,YAAYC,MAAAA,iBAAiB,KAAK,KAAK;AACvC,UAAA,OAAO,MAAM,gBACjB,MAAM,EAAE,YAAY,UAAW,CAAA,EAC/B,UAAU,EAAE;AAEP,WAAA,KAAK,eAAe,IAAI;AAAA,EAAA;AAEjC;AAaA,MAAM,kBAAkBC,SAAAA,cAAc,OAAA,EACpC,OAAO,CAAC,WAAW,IAAI,CAAC,EACxB,OAAO,CAAC,WAAW,MAAM,CAAC,EAC1B,OAAO,CAAC,WAAW,aAAa,CAAC,EACjC,OAAO,CAAC,WAAW,aAAa,CAAC,EACjC,OAAO,CAAC,WAAW,YAAY,CAAC,EAChC,OAAO,CAAC,YAAY,OAAO,CAAC,EAC5B,OAAO,CAAC,WAAW,YAAY,CAAC,EAChC,OAAO,CAAC,UAAU,IAAI,GAAG,WAAW,EACpC,KAAK,SAAS,EACd;AAAA,EAAK;AAAA,EAAY;AAAA,EAAY,CAC7B,eAAA,WAAW,eAAe,CAAC,WAAW,aAAa,GAAGH,kBAAS,IAAI,CAAC,YAAY,IAAI,CAAC;AACtF,EACC;AAAA,EACA;AAAA,EAAU;AAAA,EAAU,QAAM,GAAG;AAAA,IAC5B,CAAC,UAAU,aAAa;AAAA,IAAGA,SAAAA,SAAS;AAAA,IAAI,CAAC,YAAY,IAAI;AAAA,EAAA;AAE3D;;;"}

package/dist/production/src/model/queries/apiKey/ApiKeyQuery.js

@@ -1,6 +1,6 @@
 import { SelectBuilder, Operator, DatabaseQuery } from "@contember/database";
 import "../../type/ApiKey.js";
-import { computeTokenHash } from "../../utils/tokenUtils.js";
+import { computeTokenHash } from "../../utils/token.js";
 class ApiKeyByIdQuery extends DatabaseQuery {
   constructor(apiKeyId) {
     super();

package/dist/production/src/model/queries/authLog/NextLoginAttemptQuery.cjs

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const Database = require("@contember/database");
+class NextLoginAttemptQuery extends Database.DatabaseQuery {
+  constructor(email) {
+    super();
+    this.email = email;
+  }
+  async fetch({ db }) {
+    const qb = Database.SelectBuilder.create().with("cfg", (it) => it.from("config")).with(
+      "last_successful_reset",
+      (it) => it.select(new Database.Literal("MAX(person_auth_log.created_at)"), "created_at").from("person_auth_log").join("person", "person", (it2) => it2.columnsEq(["person", "id"], ["person_auth_log", "person_id"])).where({
+        type: "password_reset",
+        success: true,
+        email: this.email
+      })
+    ).with(
+      "window_start",
+      (it) => it.select(new Database.Literal(`
+					GREATEST(
+						COALESCE(last_successful_reset.created_at, NOW() - cfg.login_attempt_window), 
+						NOW() - cfg.login_attempt_window
+					)`), "start_time").from("cfg").from("last_successful_reset")
+    ).with(
+      "failed_logins",
+      (it) => it.select(new Database.Literal("COUNT(*)"), "fails").select(new Database.Literal("MAX(person_auth_log.created_at)"), "last_fail").from("person_auth_log").from("window_start").where({
+        person_input_identifier: this.email,
+        type: "login",
+        success: false
+      }).where(new Database.Literal("person_auth_log.created_at >= window_start.start_time"))
+    ).select(new Database.Literal(`
+				CASE WHEN failed_logins.fails = 0 
+				THEN NOW() 
+				ELSE LEAST(
+					failed_logins.last_fail + cfg.login_max_backoff, 
+					failed_logins.last_fail + cfg.login_base_backoff * (POWER(2, failed_logins.fails - 1))
+				) END`), "next_allowed_login").from("failed_logins").from("cfg");
+    const result = await qb.getResult(db);
+    if (result.length === 0) {
+      return /* @__PURE__ */ new Date();
+    }
+    return result[0].next_allowed_login;
+  }
+}
+exports.NextLoginAttemptQuery = NextLoginAttemptQuery;
+//# sourceMappingURL=NextLoginAttemptQuery.cjs.map

package/dist/production/src/model/queries/authLog/NextLoginAttemptQuery.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"NextLoginAttemptQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/authLog/NextLoginAttemptQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\n\nexport class NextLoginAttemptQuery extends DatabaseQuery<Date> {\n\n\tconstructor(\n\t\tprivate readonly email: string,\n\t) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<Date> {\n\t\tconst qb = SelectBuilder.create()\n\t\t\t.with('cfg', it => it.from('config'))\n\t\t\t.with('last_successful_reset', it => it\n\t\t\t\t.select(new Literal('MAX(person_auth_log.created_at)'), 'created_at')\n\t\t\t\t.from('person_auth_log')\n\t\t\t\t.join('person', 'person', it => it.columnsEq(['person', 'id'], ['person_auth_log', 'person_id']))\n\t\t\t\t.where({\n\t\t\t\t\ttype: 'password_reset',\n\t\t\t\t\tsuccess: true,\n\t\t\t\t\temail: this.email,\n\t\t\t\t}),\n\t\t\t)\n\t\t\t.with('window_start', it => it\n\t\t\t\t.select(new Literal(`\n\t\t\t\t\tGREATEST(\n\t\t\t\t\t\tCOALESCE(last_successful_reset.created_at, NOW() - cfg.login_attempt_window), \n\t\t\t\t\t\tNOW() - cfg.login_attempt_window\n\t\t\t\t\t)`), 'start_time')\n\t\t\t\t.from('cfg')\n\t\t\t\t.from('last_successful_reset'),\n\t\t\t)\n\t\t\t.with('failed_logins', it => it\n\t\t\t\t.select(new Literal('COUNT(*)'), 'fails')\n\t\t\t\t.select(new Literal('MAX(person_auth_log.created_at)'), 'last_fail')\n\t\t\t\t.from('person_auth_log')\n\t\t\t\t.from('window_start')\n\t\t\t\t.where({\n\t\t\t\t\tperson_input_identifier: this.email,\n\t\t\t\t\ttype: 'login',\n\t\t\t\t\tsuccess: false,\n\t\t\t\t})\n\t\t\t\t.where(new Literal('person_auth_log.created_at >= window_start.start_time')),\n\t\t\t)\n\t\t\t.select(new Literal(`\n\t\t\t\tCASE WHEN failed_logins.fails = 0 \n\t\t\t\tTHEN NOW() \n\t\t\t\tELSE LEAST(\n\t\t\t\t\tfailed_logins.last_fail + cfg.login_max_backoff, \n\t\t\t\t\tfailed_logins.last_fail + cfg.login_base_backoff * (POWER(2, failed_logins.fails - 1))\n\t\t\t\t) END`), 'next_allowed_login')\n\t\t\t.from('failed_logins')\n\t\t\t.from('cfg')\n\n\t\tconst result = await qb.getResult(db)\n\t\tif (result.length === 0) {\n\t\t\treturn new Date()\n\t\t}\n\t\treturn result[0].next_allowed_login\n\t}\n\n\n}\n"],"names":["DatabaseQuery","SelectBuilder","Literal","it"],"mappings":";;;AAEO,MAAM,8BAA8BA,SAAAA,cAAoB;AAAA,EAE9D,YACkB,OAChB;AACK,UAAA;AAFW,SAAA,QAAA;AAAA,EAAA;AAAA,EAKlB,MAAM,MAAM,EAAE,MAAwC;AAC/C,UAAA,KAAKC,SAAAA,cAAc,OAAA,EACvB,KAAK,OAAO,CAAA,OAAM,GAAG,KAAK,QAAQ,CAAC,EACnC;AAAA,MAAK;AAAA,MAAyB,CAAM,OAAA,GACnC,OAAO,IAAIC,SAAAA,QAAQ,iCAAiC,GAAG,YAAY,EACnE,KAAK,iBAAiB,EACtB,KAAK,UAAU,UAAU,CAAAC,QAAMA,IAAG,UAAU,CAAC,UAAU,IAAI,GAAG,CAAC,mBAAmB,WAAW,CAAC,CAAC,EAC/F,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS;AAAA,QACT,OAAO,KAAK;AAAA,MACZ,CAAA;AAAA,IAAA,EAED;AAAA,MAAK;AAAA,MAAgB,CAAM,OAAA,GAC1B,OAAO,IAAID,SAAAA,QAAQ;AAAA;AAAA;AAAA;AAAA,OAIjB,GAAG,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,uBAAuB;AAAA,IAAA,EAE7B;AAAA,MAAK;AAAA,MAAiB,CAAA,OAAM,GAC3B,OAAO,IAAIA,iBAAQ,UAAU,GAAG,OAAO,EACvC,OAAO,IAAIA,iBAAQ,iCAAiC,GAAG,WAAW,EAClE,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,MAAM;AAAA,QACN,yBAAyB,KAAK;AAAA,QAC9B,MAAM;AAAA,QACN,SAAS;AAAA,MACT,CAAA,EACA,MAAM,IAAIA,SAAA,QAAQ,uDAAuD,CAAC;AAAA,IAAA,EAE3E,OAAO,IAAIA,iBAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAMb,GAAG,oBAAoB,EAC7B,KAAK,eAAe,EACpB,KAAK,KAAK;AAEZ,UAAM,SAAS,MAAM,GAAG,UAAU,EAAE;AAChC,QAAA,OAAO,WAAW,GAAG;AACxB,iCAAW,KAAK;AAAA,IAAA;AAEV,WAAA,OAAO,CAAC,EAAE;AAAA,EAAA;AAInB;;"}

package/dist/production/src/model/queries/authLog/NextLoginAttemptQuery.js

@@ -0,0 +1,46 @@
+import { DatabaseQuery, SelectBuilder, Literal } from "@contember/database";
+class NextLoginAttemptQuery extends DatabaseQuery {
+  constructor(email) {
+    super();
+    this.email = email;
+  }
+  async fetch({ db }) {
+    const qb = SelectBuilder.create().with("cfg", (it) => it.from("config")).with(
+      "last_successful_reset",
+      (it) => it.select(new Literal("MAX(person_auth_log.created_at)"), "created_at").from("person_auth_log").join("person", "person", (it2) => it2.columnsEq(["person", "id"], ["person_auth_log", "person_id"])).where({
+        type: "password_reset",
+        success: true,
+        email: this.email
+      })
+    ).with(
+      "window_start",
+      (it) => it.select(new Literal(`
+					GREATEST(
+						COALESCE(last_successful_reset.created_at, NOW() - cfg.login_attempt_window), 
+						NOW() - cfg.login_attempt_window
+					)`), "start_time").from("cfg").from("last_successful_reset")
+    ).with(
+      "failed_logins",
+      (it) => it.select(new Literal("COUNT(*)"), "fails").select(new Literal("MAX(person_auth_log.created_at)"), "last_fail").from("person_auth_log").from("window_start").where({
+        person_input_identifier: this.email,
+        type: "login",
+        success: false
+      }).where(new Literal("person_auth_log.created_at >= window_start.start_time"))
+    ).select(new Literal(`
+				CASE WHEN failed_logins.fails = 0 
+				THEN NOW() 
+				ELSE LEAST(
+					failed_logins.last_fail + cfg.login_max_backoff, 
+					failed_logins.last_fail + cfg.login_base_backoff * (POWER(2, failed_logins.fails - 1))
+				) END`), "next_allowed_login").from("failed_logins").from("cfg");
+    const result = await qb.getResult(db);
+    if (result.length === 0) {
+      return /* @__PURE__ */ new Date();
+    }
+    return result[0].next_allowed_login;
+  }
+}
+export {
+  NextLoginAttemptQuery
+};
+//# sourceMappingURL=NextLoginAttemptQuery.js.map

package/dist/production/src/model/queries/authLog/NextLoginAttemptQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NextLoginAttemptQuery.js","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/authLog/NextLoginAttemptQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\n\nexport class NextLoginAttemptQuery extends DatabaseQuery<Date> {\n\n\tconstructor(\n\t\tprivate readonly email: string,\n\t) {\n\t\tsuper()\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<Date> {\n\t\tconst qb = SelectBuilder.create()\n\t\t\t.with('cfg', it => it.from('config'))\n\t\t\t.with('last_successful_reset', it => it\n\t\t\t\t.select(new Literal('MAX(person_auth_log.created_at)'), 'created_at')\n\t\t\t\t.from('person_auth_log')\n\t\t\t\t.join('person', 'person', it => it.columnsEq(['person', 'id'], ['person_auth_log', 'person_id']))\n\t\t\t\t.where({\n\t\t\t\t\ttype: 'password_reset',\n\t\t\t\t\tsuccess: true,\n\t\t\t\t\temail: this.email,\n\t\t\t\t}),\n\t\t\t)\n\t\t\t.with('window_start', it => it\n\t\t\t\t.select(new Literal(`\n\t\t\t\t\tGREATEST(\n\t\t\t\t\t\tCOALESCE(last_successful_reset.created_at, NOW() - cfg.login_attempt_window), \n\t\t\t\t\t\tNOW() - cfg.login_attempt_window\n\t\t\t\t\t)`), 'start_time')\n\t\t\t\t.from('cfg')\n\t\t\t\t.from('last_successful_reset'),\n\t\t\t)\n\t\t\t.with('failed_logins', it => it\n\t\t\t\t.select(new Literal('COUNT(*)'), 'fails')\n\t\t\t\t.select(new Literal('MAX(person_auth_log.created_at)'), 'last_fail')\n\t\t\t\t.from('person_auth_log')\n\t\t\t\t.from('window_start')\n\t\t\t\t.where({\n\t\t\t\t\tperson_input_identifier: this.email,\n\t\t\t\t\ttype: 'login',\n\t\t\t\t\tsuccess: false,\n\t\t\t\t})\n\t\t\t\t.where(new Literal('person_auth_log.created_at >= window_start.start_time')),\n\t\t\t)\n\t\t\t.select(new Literal(`\n\t\t\t\tCASE WHEN failed_logins.fails = 0 \n\t\t\t\tTHEN NOW() \n\t\t\t\tELSE LEAST(\n\t\t\t\t\tfailed_logins.last_fail + cfg.login_max_backoff, \n\t\t\t\t\tfailed_logins.last_fail + cfg.login_base_backoff * (POWER(2, failed_logins.fails - 1))\n\t\t\t\t) END`), 'next_allowed_login')\n\t\t\t.from('failed_logins')\n\t\t\t.from('cfg')\n\n\t\tconst result = await qb.getResult(db)\n\t\tif (result.length === 0) {\n\t\t\treturn new Date()\n\t\t}\n\t\treturn result[0].next_allowed_login\n\t}\n\n\n}\n"],"names":["it"],"mappings":";AAEO,MAAM,8BAA8B,cAAoB;AAAA,EAE9D,YACkB,OAChB;AACK,UAAA;AAFW,SAAA,QAAA;AAAA,EAAA;AAAA,EAKlB,MAAM,MAAM,EAAE,MAAwC;AAC/C,UAAA,KAAK,cAAc,OAAA,EACvB,KAAK,OAAO,CAAA,OAAM,GAAG,KAAK,QAAQ,CAAC,EACnC;AAAA,MAAK;AAAA,MAAyB,CAAM,OAAA,GACnC,OAAO,IAAI,QAAQ,iCAAiC,GAAG,YAAY,EACnE,KAAK,iBAAiB,EACtB,KAAK,UAAU,UAAU,CAAAA,QAAMA,IAAG,UAAU,CAAC,UAAU,IAAI,GAAG,CAAC,mBAAmB,WAAW,CAAC,CAAC,EAC/F,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS;AAAA,QACT,OAAO,KAAK;AAAA,MACZ,CAAA;AAAA,IAAA,EAED;AAAA,MAAK;AAAA,MAAgB,CAAM,OAAA,GAC1B,OAAO,IAAI,QAAQ;AAAA;AAAA;AAAA;AAAA,OAIjB,GAAG,YAAY,EACjB,KAAK,KAAK,EACV,KAAK,uBAAuB;AAAA,IAAA,EAE7B;AAAA,MAAK;AAAA,MAAiB,CAAA,OAAM,GAC3B,OAAO,IAAI,QAAQ,UAAU,GAAG,OAAO,EACvC,OAAO,IAAI,QAAQ,iCAAiC,GAAG,WAAW,EAClE,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,MAAM;AAAA,QACN,yBAAyB,KAAK;AAAA,QAC9B,MAAM;AAAA,QACN,SAAS;AAAA,MACT,CAAA,EACA,MAAM,IAAI,QAAQ,uDAAuD,CAAC;AAAA,IAAA,EAE3E,OAAO,IAAI,QAAQ;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,UAMb,GAAG,oBAAoB,EAC7B,KAAK,eAAe,EACpB,KAAK,KAAK;AAEZ,UAAM,SAAS,MAAM,GAAG,UAAU,EAAE;AAChC,QAAA,OAAO,WAAW,GAAG;AACxB,iCAAW,KAAK;AAAA,IAAA;AAEV,WAAA,OAAO,CAAC,EAAE;AAAA,EAAA;AAInB;"}

package/dist/production/src/model/queries/configuration/ConfigurationQuery.cjs

@@ -12,7 +12,24 @@ class ConfigurationQuery extends Database.DatabaseQuery {
       passwordless: {
         enabled: result.passwordless_enabled,
         url: result.passwordless_url,
-        expirationMinutes: result.passwordless_expiration_minutes
+        expiration: result.passwordless_expiration
+      },
+      password: {
+        minLength: result.password_min_length,
+        requireUppercase: result.password_require_uppercase,
+        requireLowercase: result.password_require_lowercase,
+        requireDigit: result.password_require_digit,
+        requireSpecial: result.password_require_special,
+        pattern: result.password_pattern,
+        checkBlacklist: result.password_check_blacklist
+      },
+      login: {
+        baseBackoff: result.login_base_backoff,
+        maxBackoff: result.login_max_backoff,
+        attemptWindow: result.login_attempt_window,
+        revealUserExists: result.login_reveal_user_exits,
+        defaultTokenExpiration: result.login_default_token_expiration,
+        maxTokenExpiration: result.login_max_token_expiration
       }
     };
   }

package/dist/production/src/model/queries/configuration/ConfigurationQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigurationQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/configuration/ConfigurationQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { Config, ConfigPolicy } from '../../../schema'\n\nexport class ConfigurationQuery extends DatabaseQuery<Config> {\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<Config> {\n\t\tconst rows = await SelectBuilder.create<ConfigurationRow>()\n\t\t\t.from('config')\n\t\t\t.select(new Literal('*'))\n\t\t\t.getResult(db)\n\t\tconst result = this.fetchOneOrNull(rows)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\n\t\treturn {\n\t\t\tpasswordless: {\n\t\t\t\tenabled: result.passwordless_enabled,\n\t\t\t\turl: result.passwordless_url,\n\t\t\t\texpirationMinutes: result.passwordless_expiration_minutes,\n\t\t\t},\n\t\t}\n\t}\n}\n\ninterface ConfigurationRow {\n\tpasswordless_enabled: ConfigPolicy\n\tpasswordless_url: string | null\n\tpasswordless_expiration_minutes: number\n}\n"],"names":["DatabaseQuery","SelectBuilder","Literal"],"mappings":";;;AAGO,MAAM,2BAA2BA,SAAAA,cAAsB;AAAA,EAE7D,MAAM,MAAM,EAAE,MAA0C;AACvD,UAAM,OAAO,MAAMC,SAAAA,cAAc,SAC/B,KAAK,QAAQ,EACb,OAAO,IAAIC,SAAAA,QAAQ,GAAG,CAAC,EACvB,UAAU,EAAE;AACR,UAAA,SAAS,KAAK,eAAe,IAAI;AACvC,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAGnC,WAAA;AAAA,MACN,cAAc;AAAA,QACb,SAAS,OAAO;AAAA,QAChB,KAAK,OAAO;AAAA,QACZ,mBAAmB,OAAO;AAAA,MAAA;AAAA,IAE5B;AAAA,EAAA;AAEF;;"}
+{"version":3,"file":"ConfigurationQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/configuration/ConfigurationQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { Config, ConfigRow } from '../../type/Config'\n\nexport class ConfigurationQuery extends DatabaseQuery<Config> {\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<Config> {\n\t\tconst rows = await SelectBuilder.create<ConfigRow>()\n\t\t\t.from('config')\n\t\t\t.select(new Literal('*'))\n\t\t\t.getResult(db)\n\t\tconst result = this.fetchOneOrNull(rows)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\n\t\treturn {\n\t\t\tpasswordless: {\n\t\t\t\tenabled: result.passwordless_enabled,\n\t\t\t\turl: result.passwordless_url,\n\t\t\t\texpiration: result.passwordless_expiration,\n\t\t\t},\n\t\t\tpassword: {\n\t\t\t\tminLength: result.password_min_length,\n\t\t\t\trequireUppercase: result.password_require_uppercase,\n\t\t\t\trequireLowercase: result.password_require_lowercase,\n\t\t\t\trequireDigit: result.password_require_digit,\n\t\t\t\trequireSpecial: result.password_require_special,\n\t\t\t\tpattern: result.password_pattern,\n\t\t\t\tcheckBlacklist: result.password_check_blacklist,\n\t\t\t},\n\t\t\tlogin: {\n\t\t\t\tbaseBackoff: result.login_base_backoff,\n\t\t\t\tmaxBackoff: result.login_max_backoff,\n\t\t\t\tattemptWindow: result.login_attempt_window,\n\t\t\t\trevealUserExists: result.login_reveal_user_exits,\n\t\t\t\tdefaultTokenExpiration: result.login_default_token_expiration,\n\t\t\t\tmaxTokenExpiration: result.login_max_token_expiration,\n\t\t\t},\n\t\t}\n\t}\n}\n\n"],"names":["DatabaseQuery","SelectBuilder","Literal"],"mappings":";;;AAGO,MAAM,2BAA2BA,SAAAA,cAAsB;AAAA,EAE7D,MAAM,MAAM,EAAE,MAA0C;AACvD,UAAM,OAAO,MAAMC,SAAAA,cAAc,SAC/B,KAAK,QAAQ,EACb,OAAO,IAAIC,SAAAA,QAAQ,GAAG,CAAC,EACvB,UAAU,EAAE;AACR,UAAA,SAAS,KAAK,eAAe,IAAI;AACvC,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAGnC,WAAA;AAAA,MACN,cAAc;AAAA,QACb,SAAS,OAAO;AAAA,QAChB,KAAK,OAAO;AAAA,QACZ,YAAY,OAAO;AAAA,MACpB;AAAA,MACA,UAAU;AAAA,QACT,WAAW,OAAO;AAAA,QAClB,kBAAkB,OAAO;AAAA,QACzB,kBAAkB,OAAO;AAAA,QACzB,cAAc,OAAO;AAAA,QACrB,gBAAgB,OAAO;AAAA,QACvB,SAAS,OAAO;AAAA,QAChB,gBAAgB,OAAO;AAAA,MACxB;AAAA,MACA,OAAO;AAAA,QACN,aAAa,OAAO;AAAA,QACpB,YAAY,OAAO;AAAA,QACnB,eAAe,OAAO;AAAA,QACtB,kBAAkB,OAAO;AAAA,QACzB,wBAAwB,OAAO;AAAA,QAC/B,oBAAoB,OAAO;AAAA,MAAA;AAAA,IAE7B;AAAA,EAAA;AAEF;;"}

package/dist/production/src/model/queries/configuration/ConfigurationQuery.js

@@ -10,7 +10,24 @@ class ConfigurationQuery extends DatabaseQuery {
       passwordless: {
         enabled: result.passwordless_enabled,
         url: result.passwordless_url,
-        expirationMinutes: result.passwordless_expiration_minutes
+        expiration: result.passwordless_expiration
+      },
+      password: {
+        minLength: result.password_min_length,
+        requireUppercase: result.password_require_uppercase,
+        requireLowercase: result.password_require_lowercase,
+        requireDigit: result.password_require_digit,
+        requireSpecial: result.password_require_special,
+        pattern: result.password_pattern,
+        checkBlacklist: result.password_check_blacklist
+      },
+      login: {
+        baseBackoff: result.login_base_backoff,
+        maxBackoff: result.login_max_backoff,
+        attemptWindow: result.login_attempt_window,
+        revealUserExists: result.login_reveal_user_exits,
+        defaultTokenExpiration: result.login_default_token_expiration,
+        maxTokenExpiration: result.login_max_token_expiration
       }
     };
   }

package/dist/production/src/model/queries/configuration/ConfigurationQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigurationQuery.js","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/configuration/ConfigurationQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { Config, ConfigPolicy } from '../../../schema'\n\nexport class ConfigurationQuery extends DatabaseQuery<Config> {\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<Config> {\n\t\tconst rows = await SelectBuilder.create<ConfigurationRow>()\n\t\t\t.from('config')\n\t\t\t.select(new Literal('*'))\n\t\t\t.getResult(db)\n\t\tconst result = this.fetchOneOrNull(rows)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\n\t\treturn {\n\t\t\tpasswordless: {\n\t\t\t\tenabled: result.passwordless_enabled,\n\t\t\t\turl: result.passwordless_url,\n\t\t\t\texpirationMinutes: result.passwordless_expiration_minutes,\n\t\t\t},\n\t\t}\n\t}\n}\n\ninterface ConfigurationRow {\n\tpasswordless_enabled: ConfigPolicy\n\tpasswordless_url: string | null\n\tpasswordless_expiration_minutes: number\n}\n"],"names":[],"mappings":";AAGO,MAAM,2BAA2B,cAAsB;AAAA,EAE7D,MAAM,MAAM,EAAE,MAA0C;AACvD,UAAM,OAAO,MAAM,cAAc,SAC/B,KAAK,QAAQ,EACb,OAAO,IAAI,QAAQ,GAAG,CAAC,EACvB,UAAU,EAAE;AACR,UAAA,SAAS,KAAK,eAAe,IAAI;AACvC,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAGnC,WAAA;AAAA,MACN,cAAc;AAAA,QACb,SAAS,OAAO;AAAA,QAChB,KAAK,OAAO;AAAA,QACZ,mBAAmB,OAAO;AAAA,MAAA;AAAA,IAE5B;AAAA,EAAA;AAEF;"}
+{"version":3,"file":"ConfigurationQuery.js","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/configuration/ConfigurationQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { Config, ConfigRow } from '../../type/Config'\n\nexport class ConfigurationQuery extends DatabaseQuery<Config> {\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<Config> {\n\t\tconst rows = await SelectBuilder.create<ConfigRow>()\n\t\t\t.from('config')\n\t\t\t.select(new Literal('*'))\n\t\t\t.getResult(db)\n\t\tconst result = this.fetchOneOrNull(rows)\n\t\tif (!result) {\n\t\t\tthrow new Error('Configuration not found')\n\t\t}\n\n\t\treturn {\n\t\t\tpasswordless: {\n\t\t\t\tenabled: result.passwordless_enabled,\n\t\t\t\turl: result.passwordless_url,\n\t\t\t\texpiration: result.passwordless_expiration,\n\t\t\t},\n\t\t\tpassword: {\n\t\t\t\tminLength: result.password_min_length,\n\t\t\t\trequireUppercase: result.password_require_uppercase,\n\t\t\t\trequireLowercase: result.password_require_lowercase,\n\t\t\t\trequireDigit: result.password_require_digit,\n\t\t\t\trequireSpecial: result.password_require_special,\n\t\t\t\tpattern: result.password_pattern,\n\t\t\t\tcheckBlacklist: result.password_check_blacklist,\n\t\t\t},\n\t\t\tlogin: {\n\t\t\t\tbaseBackoff: result.login_base_backoff,\n\t\t\t\tmaxBackoff: result.login_max_backoff,\n\t\t\t\tattemptWindow: result.login_attempt_window,\n\t\t\t\trevealUserExists: result.login_reveal_user_exits,\n\t\t\t\tdefaultTokenExpiration: result.login_default_token_expiration,\n\t\t\t\tmaxTokenExpiration: result.login_max_token_expiration,\n\t\t\t},\n\t\t}\n\t}\n}\n\n"],"names":[],"mappings":";AAGO,MAAM,2BAA2B,cAAsB;AAAA,EAE7D,MAAM,MAAM,EAAE,MAA0C;AACvD,UAAM,OAAO,MAAM,cAAc,SAC/B,KAAK,QAAQ,EACb,OAAO,IAAI,QAAQ,GAAG,CAAC,EACvB,UAAU,EAAE;AACR,UAAA,SAAS,KAAK,eAAe,IAAI;AACvC,QAAI,CAAC,QAAQ;AACN,YAAA,IAAI,MAAM,yBAAyB;AAAA,IAAA;AAGnC,WAAA;AAAA,MACN,cAAc;AAAA,QACb,SAAS,OAAO;AAAA,QAChB,KAAK,OAAO;AAAA,QACZ,YAAY,OAAO;AAAA,MACpB;AAAA,MACA,UAAU;AAAA,QACT,WAAW,OAAO;AAAA,QAClB,kBAAkB,OAAO;AAAA,QACzB,kBAAkB,OAAO;AAAA,QACzB,cAAc,OAAO;AAAA,QACrB,gBAAgB,OAAO;AAAA,QACvB,SAAS,OAAO;AAAA,QAChB,gBAAgB,OAAO;AAAA,MACxB;AAAA,MACA,OAAO;AAAA,QACN,aAAa,OAAO;AAAA,QACpB,YAAY,OAAO;AAAA,QACnB,eAAe,OAAO;AAAA,QACtB,kBAAkB,OAAO;AAAA,QACzB,wBAAwB,OAAO;AAAA,QAC/B,oBAAoB,OAAO;AAAA,MAAA;AAAA,IAE7B;AAAA,EAAA;AAEF;"}

package/dist/production/src/model/queries/personToken/PersonTokenQuery.cjs

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Database = require("@contember/database");
 require("../../type/ApiKey.cjs");
-const tokenUtils = require("../../utils/tokenUtils.cjs");
+const token = require("../../utils/token.cjs");
 class PersonTokenQuery extends Database.DatabaseQuery {
   constructor(identifierType, identifier, type) {
     super();
@@ -13,8 +13,8 @@ class PersonTokenQuery extends Database.DatabaseQuery {
   static byId(id, type) {
     return new PersonTokenQuery("id", id, type);
   }
-  static byToken(token, type) {
-    const tokenHash = tokenUtils.computeTokenHash(token);
+  static byToken(token$1, type) {
+    const tokenHash = token.computeTokenHash(token$1);
     return new PersonTokenQuery("token_hash", tokenHash, type);
   }
   async fetch({ db }) {

package/dist/production/src/model/queries/personToken/PersonTokenQuery.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"PersonTokenQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/personToken/PersonTokenQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { PersonToken } from '../../type'\nimport { computeTokenHash } from '../../utils'\n\nexport class PersonTokenQuery extends DatabaseQuery<PersonToken.Row | null> {\n\n\tprivate constructor(\n\t\tprivate readonly identifierType: 'id' | 'token_hash',\n\t\tprivate readonly identifier: string,\n\t\tprivate readonly type: PersonToken.Type,\n\t) {\n\t\tsuper()\n\t}\n\n\tpublic static byId(id: string, type: PersonToken.Type): PersonTokenQuery {\n\t\treturn new PersonTokenQuery('id', id, type)\n\t}\n\n\tpublic static byToken(token: string, type: PersonToken.Type): PersonTokenQuery {\n\t\tconst tokenHash = computeTokenHash(token)\n\t\treturn new PersonTokenQuery('token_hash', tokenHash, type)\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<PersonToken.Row | null> {\n\t\tconst result = await SelectBuilder.create<PersonToken.Row>()\n\t\t\t.from('person_token')\n\t\t\t.select(new Literal('*'))\n\t\t\t.where({\n\t\t\t\t[this.identifierType]: this.identifier,\n\t\t\t\ttype: this.type,\n\t\t\t})\n\t\t\t.getResult(db)\n\t\treturn this.fetchOneOrNull(result)\n\t}\n}\n"],"names":["DatabaseQuery","computeTokenHash","SelectBuilder","Literal"],"mappings":";;;;;AAIO,MAAM,yBAAyBA,SAAAA,cAAsC;AAAA,EAEnE,YACU,gBACA,YACA,MAChB;AACK,UAAA;AAJW,SAAA,iBAAA;AACA,SAAA,aAAA;AACA,SAAA,OAAA;AAAA,EAAA;AAAA,EAKlB,OAAc,KAAK,IAAY,MAA0C;AACxE,WAAO,IAAI,iBAAiB,MAAM,IAAI,IAAI;AAAA,EAAA;AAAA,EAG3C,OAAc,QAAQ,OAAe,MAA0C;AACxE,UAAA,YAAYC,4BAAiB,KAAK;AACxC,WAAO,IAAI,iBAAiB,cAAc,WAAW,IAAI;AAAA,EAAA;AAAA,EAG1D,MAAM,MAAM,EAAE,MAA0D;AACvE,UAAM,SAAS,MAAMC,SAAAA,cAAc,OAAA,EACjC,KAAK,cAAc,EACnB,OAAO,IAAIC,SAAA,QAAQ,GAAG,CAAC,EACvB,MAAM;AAAA,MACN,CAAC,KAAK,cAAc,GAAG,KAAK;AAAA,MAC5B,MAAM,KAAK;AAAA,IAAA,CACX,EACA,UAAU,EAAE;AACP,WAAA,KAAK,eAAe,MAAM;AAAA,EAAA;AAEnC;;"}
+{"version":3,"file":"PersonTokenQuery.cjs","sources":["../../../../../../../packages/engine-tenant-api/src/model/queries/personToken/PersonTokenQuery.ts"],"sourcesContent":["import { DatabaseQuery, DatabaseQueryable, Literal, SelectBuilder } from '@contember/database'\nimport { PersonToken } from '../../type'\nimport { computeTokenHash } from '../../utils'\n\nexport class PersonTokenQuery extends DatabaseQuery<PersonToken.Row | null> {\n\n\tprivate constructor(\n\t\tprivate readonly identifierType: 'id' | 'token_hash',\n\t\tprivate readonly identifier: string,\n\t\tprivate readonly type: PersonToken.Type,\n\t) {\n\t\tsuper()\n\t}\n\n\tpublic static byId(id: string, type: PersonToken.Type): PersonTokenQuery {\n\t\treturn new PersonTokenQuery('id', id, type)\n\t}\n\n\tpublic static byToken(token: string, type: PersonToken.Type): PersonTokenQuery {\n\t\tconst tokenHash = computeTokenHash(token)\n\t\treturn new PersonTokenQuery('token_hash', tokenHash, type)\n\t}\n\n\tasync fetch({ db }: DatabaseQueryable): Promise<PersonToken.Row | null> {\n\t\tconst result = await SelectBuilder.create<PersonToken.Row>()\n\t\t\t.from('person_token')\n\t\t\t.select(new Literal('*'))\n\t\t\t.where({\n\t\t\t\t[this.identifierType]: this.identifier,\n\t\t\t\ttype: this.type,\n\t\t\t})\n\t\t\t.getResult(db)\n\t\treturn this.fetchOneOrNull(result)\n\t}\n}\n"],"names":["DatabaseQuery","token","computeTokenHash","SelectBuilder","Literal"],"mappings":";;;;;AAIO,MAAM,yBAAyBA,SAAAA,cAAsC;AAAA,EAEnE,YACU,gBACA,YACA,MAChB;AACK,UAAA;AAJW,SAAA,iBAAA;AACA,SAAA,aAAA;AACA,SAAA,OAAA;AAAA,EAAA;AAAA,EAKlB,OAAc,KAAK,IAAY,MAA0C;AACxE,WAAO,IAAI,iBAAiB,MAAM,IAAI,IAAI;AAAA,EAAA;AAAA,EAG3C,OAAc,QAAQC,SAAe,MAA0C;AACxE,UAAA,YAAYC,uBAAiBD,OAAK;AACxC,WAAO,IAAI,iBAAiB,cAAc,WAAW,IAAI;AAAA,EAAA;AAAA,EAG1D,MAAM,MAAM,EAAE,MAA0D;AACvE,UAAM,SAAS,MAAME,SAAAA,cAAc,OAAA,EACjC,KAAK,cAAc,EACnB,OAAO,IAAIC,SAAA,QAAQ,GAAG,CAAC,EACvB,MAAM;AAAA,MACN,CAAC,KAAK,cAAc,GAAG,KAAK;AAAA,MAC5B,MAAM,KAAK;AAAA,IAAA,CACX,EACA,UAAU,EAAE;AACP,WAAA,KAAK,eAAe,MAAM;AAAA,EAAA;AAEnC;;"}

package/dist/production/src/model/queries/personToken/PersonTokenQuery.js

@@ -1,6 +1,6 @@
 import { DatabaseQuery, SelectBuilder, Literal } from "@contember/database";
 import "../../type/ApiKey.js";
-import { computeTokenHash } from "../../utils/tokenUtils.js";
+import { computeTokenHash } from "../../utils/token.js";
 class PersonTokenQuery extends DatabaseQuery {
   constructor(identifierType, identifier, type) {
     super();