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

package/dist/development/src/model/mailing/UserMailer.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"UserMailer.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/mailing/UserMailer.ts"],"sourcesContent":["import { Mailer, TemplateRenderer } from '../../utils'\nimport NewUserInvited from './templates/NewUserInvited.mustache'\nimport ExistingUserInvited from './templates/ExistingUserInvited.mustache'\nimport PasswordReset from './templates/PasswordReset.mustache'\nimport PasswordlessSignIn from './templates/PasswordlessSignIn.mustache'\nimport { MailTemplateData, MailTemplateIdentifier, MailType } from './type'\nimport { MailTemplateQuery } from '../queries'\nimport Layout from './templates/Layout.mustache'\nimport { DatabaseContext } from '../utils'\nimport { Acl } from '@contember/schema'\n\nexport class UserMailer {\n\tconstructor(\n\t\tprivate readonly mailer: Mailer,\n\t\tprivate readonly templateRenderer: TemplateRenderer,\n\t) { }\n\n\tasync sendNewUserInvitedMail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; password: string | null; token: string | null; project: string; projectSlug: string; memberships: readonly Acl.Membership[]},\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.newUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: NewUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendExistingUserInvitedEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; project: string; projectSlug: string; memberships: readonly Acl.Membership[] },\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.existingUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: ExistingUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordResetEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordReset, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Password reset',\n\t\t\tcontent: PasswordReset,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordlessEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string; url?: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordlessSignIn, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Sign in here',\n\t\t\tcontent: PasswordlessSignIn,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tprivate async sendMail(\n\t\ttemplateId: MailTemplateIdentifier,\n\t\ttemplate: Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'>,\n\t\tvariables: Record<string, any>,\n\t) {\n\t\tconst html = await this.templateRenderer.render(template.content, variables)\n\t\tawait this.mailer.send({\n\t\t\tto: variables.email,\n\t\t\tsubject: await this.templateRenderer.render(template.subject, variables),\n\t\t\thtml,\n\t\t\tvariables,\n\t\t\ttemplate: templateId,\n\t\t\t...(template.replyTo ? {\n\t\t\t\treplyTo: template.replyTo,\n\t\t\t} : {}),\n\t\t})\n\t}\n\n\tprivate async getCustomTemplate(\n\t\tdbContext: DatabaseContext,\n\t\tidentifier: MailTemplateIdentifier,\n\t): Promise<Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'> | null> {\n\t\tconst customTemplate =\n\t\t\t(await dbContext.queryHandler.fetch(new MailTemplateQuery(identifier)))\n\t\t\t?? (await dbContext.queryHandler.fetch(new MailTemplateQuery({ ...identifier, projectId: null })))\n\n\t\tif (!customTemplate) {\n\t\t\treturn null\n\t\t}\n\t\tconst content = customTemplate.useLayout ? Layout(customTemplate.content) : customTemplate.content\n\t\treturn { content, subject: customTemplate.subject, replyTo: customTemplate.replyTo }\n\t}\n}\n"],"names":["MailType","NewUserInvited","ExistingUserInvited","PasswordReset","PasswordlessSignIn","MailTemplateQuery","Layout"],"mappings":";;;;;;;;;;;;;;;;AAWO,MAAM,WAAW;AAAA,EACvB,YACkB,QACA,kBAChB;AAFgB,SAAA,SAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGlB,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMA,KAAS,SAAA,gBAAgB,GAAG,kBAAkB;AACzE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASC;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,6BACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMD,KAAS,SAAA,qBAAqB,GAAG,kBAAkB;AAC9E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASE;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMF,KAAS,SAAA,eAAe,GAAG,kBAAkB;AACxE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASG;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,sBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMH,KAAS,SAAA,oBAAoB,GAAG,kBAAkB;AAC7E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASI;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAc,SACb,YACA,UACA,WACC;AACD,UAAM,OAAO,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AACrE,UAAA,KAAK,OAAO,KAAK;AAAA,MACtB,IAAI,UAAU;AAAA,MACd,SAAS,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AAAA,MACvE;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV,GAAI,SAAS,UAAU;AAAA,QACtB,SAAS,SAAS;AAAA,MAAA,IACf,CAAA;AAAA,IAAC,CACL;AAAA,EAAA;AAAA,EAGF,MAAc,kBACb,WACA,YAC4E;AACtE,UAAA,iBACJ,MAAM,UAAU,aAAa,MAAM,IAAIC,kBAAA,kBAAkB,UAAU,CAAC,KACjE,MAAM,UAAU,aAAa,MAAM,IAAIA,oCAAkB,EAAE,GAAG,YAAY,WAAW,KAAK,CAAC,CAAC;AAEjG,QAAI,CAAC,gBAAgB;AACb,aAAA;AAAA,IAAA;AAER,UAAM,UAAU,eAAe,YAAYC,gBAAO,eAAe,OAAO,IAAI,eAAe;AAC3F,WAAO,EAAE,SAAS,SAAS,eAAe,SAAS,SAAS,eAAe,QAAQ;AAAA,EAAA;AAErF;;"}
+{"version":3,"file":"UserMailer.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/mailing/UserMailer.ts"],"sourcesContent":["import { Mailer, TemplateRenderer } from '../../utils'\nimport NewUserInvited from './templates/NewUserInvited.mustache'\nimport ExistingUserInvited from './templates/ExistingUserInvited.mustache'\nimport PasswordReset from './templates/PasswordReset.mustache'\nimport PasswordlessSignIn from './templates/PasswordlessSignIn.mustache'\nimport { MailTemplateData, MailTemplateIdentifier, MailType } from './type'\nimport { MailTemplateQuery } from '../queries'\nimport Layout from './templates/Layout.mustache'\nimport { DatabaseContext } from '../utils'\nimport { Acl } from '@contember/schema'\n\nexport class UserMailer {\n\tconstructor(\n\t\tprivate readonly mailer: Mailer,\n\t\tprivate readonly templateRenderer: TemplateRenderer,\n\t) { }\n\n\tasync sendNewUserInvitedMail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; password: string | null; token: string | null; project: string; projectSlug: string; memberships: readonly Acl.Membership[]},\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.newUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: NewUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendExistingUserInvitedEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; project: string; projectSlug: string; memberships: readonly Acl.Membership[] },\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.existingUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: ExistingUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordResetEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordReset, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Password reset',\n\t\t\tcontent: PasswordReset,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordlessEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string; url?: string; requestId: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordlessSignIn, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Sign in here',\n\t\t\tcontent: PasswordlessSignIn,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tprivate async sendMail(\n\t\ttemplateId: MailTemplateIdentifier,\n\t\ttemplate: Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'>,\n\t\tvariables: Record<string, any>,\n\t) {\n\t\tconst html = await this.templateRenderer.render(template.content, variables)\n\t\tawait this.mailer.send({\n\t\t\tto: variables.email,\n\t\t\tsubject: await this.templateRenderer.render(template.subject, variables),\n\t\t\thtml,\n\t\t\tvariables,\n\t\t\ttemplate: templateId,\n\t\t\t...(template.replyTo ? {\n\t\t\t\treplyTo: template.replyTo,\n\t\t\t} : {}),\n\t\t})\n\t}\n\n\tprivate async getCustomTemplate(\n\t\tdbContext: DatabaseContext,\n\t\tidentifier: MailTemplateIdentifier,\n\t): Promise<Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'> | null> {\n\t\tconst customTemplate =\n\t\t\t(await dbContext.queryHandler.fetch(new MailTemplateQuery(identifier)))\n\t\t\t?? (await dbContext.queryHandler.fetch(new MailTemplateQuery({ ...identifier, projectId: null })))\n\n\t\tif (!customTemplate) {\n\t\t\treturn null\n\t\t}\n\t\tconst content = customTemplate.useLayout ? Layout(customTemplate.content) : customTemplate.content\n\t\treturn { content, subject: customTemplate.subject, replyTo: customTemplate.replyTo }\n\t}\n}\n"],"names":["MailType","NewUserInvited","ExistingUserInvited","PasswordReset","PasswordlessSignIn","MailTemplateQuery","Layout"],"mappings":";;;;;;;;;;;;;;;;AAWO,MAAM,WAAW;AAAA,EACvB,YACkB,QACA,kBAChB;AAFgB,SAAA,SAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGlB,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMA,KAAS,SAAA,gBAAgB,GAAG,kBAAkB;AACzE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASC;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,6BACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMD,KAAS,SAAA,qBAAqB,GAAG,kBAAkB;AAC9E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASE;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMF,KAAS,SAAA,eAAe,GAAG,kBAAkB;AACxE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASG;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,sBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAMH,KAAS,SAAA,oBAAoB,GAAG,kBAAkB;AAC7E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAASI;AAAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAc,SACb,YACA,UACA,WACC;AACD,UAAM,OAAO,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AACrE,UAAA,KAAK,OAAO,KAAK;AAAA,MACtB,IAAI,UAAU;AAAA,MACd,SAAS,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AAAA,MACvE;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV,GAAI,SAAS,UAAU;AAAA,QACtB,SAAS,SAAS;AAAA,MAAA,IACf,CAAA;AAAA,IAAC,CACL;AAAA,EAAA;AAAA,EAGF,MAAc,kBACb,WACA,YAC4E;AACtE,UAAA,iBACJ,MAAM,UAAU,aAAa,MAAM,IAAIC,kBAAA,kBAAkB,UAAU,CAAC,KACjE,MAAM,UAAU,aAAa,MAAM,IAAIA,oCAAkB,EAAE,GAAG,YAAY,WAAW,KAAK,CAAC,CAAC;AAEjG,QAAI,CAAC,gBAAgB;AACb,aAAA;AAAA,IAAA;AAER,UAAM,UAAU,eAAe,YAAYC,gBAAO,eAAe,OAAO,IAAI,eAAe;AAC3F,WAAO,EAAE,SAAS,SAAS,eAAe,SAAS,SAAS,eAAe,QAAQ;AAAA,EAAA;AAErF;;"}

package/dist/development/src/model/mailing/UserMailer.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserMailer.js","sources":["../../../../../../packages/engine-tenant-api/src/model/mailing/UserMailer.ts"],"sourcesContent":["import { Mailer, TemplateRenderer } from '../../utils'\nimport NewUserInvited from './templates/NewUserInvited.mustache'\nimport ExistingUserInvited from './templates/ExistingUserInvited.mustache'\nimport PasswordReset from './templates/PasswordReset.mustache'\nimport PasswordlessSignIn from './templates/PasswordlessSignIn.mustache'\nimport { MailTemplateData, MailTemplateIdentifier, MailType } from './type'\nimport { MailTemplateQuery } from '../queries'\nimport Layout from './templates/Layout.mustache'\nimport { DatabaseContext } from '../utils'\nimport { Acl } from '@contember/schema'\n\nexport class UserMailer {\n\tconstructor(\n\t\tprivate readonly mailer: Mailer,\n\t\tprivate readonly templateRenderer: TemplateRenderer,\n\t) { }\n\n\tasync sendNewUserInvitedMail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; password: string | null; token: string | null; project: string; projectSlug: string; memberships: readonly Acl.Membership[]},\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.newUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: NewUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendExistingUserInvitedEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; project: string; projectSlug: string; memberships: readonly Acl.Membership[] },\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.existingUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: ExistingUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordResetEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordReset, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Password reset',\n\t\t\tcontent: PasswordReset,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordlessEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string; url?: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordlessSignIn, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Sign in here',\n\t\t\tcontent: PasswordlessSignIn,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tprivate async sendMail(\n\t\ttemplateId: MailTemplateIdentifier,\n\t\ttemplate: Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'>,\n\t\tvariables: Record<string, any>,\n\t) {\n\t\tconst html = await this.templateRenderer.render(template.content, variables)\n\t\tawait this.mailer.send({\n\t\t\tto: variables.email,\n\t\t\tsubject: await this.templateRenderer.render(template.subject, variables),\n\t\t\thtml,\n\t\t\tvariables,\n\t\t\ttemplate: templateId,\n\t\t\t...(template.replyTo ? {\n\t\t\t\treplyTo: template.replyTo,\n\t\t\t} : {}),\n\t\t})\n\t}\n\n\tprivate async getCustomTemplate(\n\t\tdbContext: DatabaseContext,\n\t\tidentifier: MailTemplateIdentifier,\n\t): Promise<Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'> | null> {\n\t\tconst customTemplate =\n\t\t\t(await dbContext.queryHandler.fetch(new MailTemplateQuery(identifier)))\n\t\t\t?? (await dbContext.queryHandler.fetch(new MailTemplateQuery({ ...identifier, projectId: null })))\n\n\t\tif (!customTemplate) {\n\t\t\treturn null\n\t\t}\n\t\tconst content = customTemplate.useLayout ? Layout(customTemplate.content) : customTemplate.content\n\t\treturn { content, subject: customTemplate.subject, replyTo: customTemplate.replyTo }\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;AAWO,MAAM,WAAW;AAAA,EACvB,YACkB,QACA,kBAChB;AAFgB,SAAA,SAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGlB,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,gBAAgB,GAAG,kBAAkB;AACzE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,6BACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,qBAAqB,GAAG,kBAAkB;AAC9E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,eAAe,GAAG,kBAAkB;AACxE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,sBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,oBAAoB,GAAG,kBAAkB;AAC7E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAc,SACb,YACA,UACA,WACC;AACD,UAAM,OAAO,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AACrE,UAAA,KAAK,OAAO,KAAK;AAAA,MACtB,IAAI,UAAU;AAAA,MACd,SAAS,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AAAA,MACvE;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV,GAAI,SAAS,UAAU;AAAA,QACtB,SAAS,SAAS;AAAA,MAAA,IACf,CAAA;AAAA,IAAC,CACL;AAAA,EAAA;AAAA,EAGF,MAAc,kBACb,WACA,YAC4E;AACtE,UAAA,iBACJ,MAAM,UAAU,aAAa,MAAM,IAAI,kBAAkB,UAAU,CAAC,KACjE,MAAM,UAAU,aAAa,MAAM,IAAI,kBAAkB,EAAE,GAAG,YAAY,WAAW,KAAK,CAAC,CAAC;AAEjG,QAAI,CAAC,gBAAgB;AACb,aAAA;AAAA,IAAA;AAER,UAAM,UAAU,eAAe,YAAY,OAAO,eAAe,OAAO,IAAI,eAAe;AAC3F,WAAO,EAAE,SAAS,SAAS,eAAe,SAAS,SAAS,eAAe,QAAQ;AAAA,EAAA;AAErF;"}
+{"version":3,"file":"UserMailer.js","sources":["../../../../../../packages/engine-tenant-api/src/model/mailing/UserMailer.ts"],"sourcesContent":["import { Mailer, TemplateRenderer } from '../../utils'\nimport NewUserInvited from './templates/NewUserInvited.mustache'\nimport ExistingUserInvited from './templates/ExistingUserInvited.mustache'\nimport PasswordReset from './templates/PasswordReset.mustache'\nimport PasswordlessSignIn from './templates/PasswordlessSignIn.mustache'\nimport { MailTemplateData, MailTemplateIdentifier, MailType } from './type'\nimport { MailTemplateQuery } from '../queries'\nimport Layout from './templates/Layout.mustache'\nimport { DatabaseContext } from '../utils'\nimport { Acl } from '@contember/schema'\n\nexport class UserMailer {\n\tconstructor(\n\t\tprivate readonly mailer: Mailer,\n\t\tprivate readonly templateRenderer: TemplateRenderer,\n\t) { }\n\n\tasync sendNewUserInvitedMail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; password: string | null; token: string | null; project: string; projectSlug: string; memberships: readonly Acl.Membership[]},\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.newUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: NewUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendExistingUserInvitedEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; project: string; projectSlug: string; memberships: readonly Acl.Membership[] },\n\t\tcustomMailOptions: { projectId: string; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.existingUserInvited, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'You have been invited to {{project}}',\n\t\t\tcontent: ExistingUserInvited,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordResetEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordReset, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Password reset',\n\t\t\tcontent: PasswordReset,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tasync sendPasswordlessEmail(\n\t\tdbContext: DatabaseContext,\n\t\tmailArguments: { email: string; token: string; project?: string; projectSlug?: string; url?: string; requestId: string },\n\t\tcustomMailOptions: { projectId: string | null; variant: string },\n\t): Promise<void> {\n\t\tconst templateId = { type: MailType.passwordlessSignIn, ...customMailOptions }\n\t\tconst template = (await this.getCustomTemplate(dbContext, templateId)) || {\n\t\t\tsubject: 'Sign in here',\n\t\t\tcontent: PasswordlessSignIn,\n\t\t\treplyTo: null,\n\t\t}\n\t\tawait this.sendMail(templateId, template, mailArguments)\n\t}\n\n\tprivate async sendMail(\n\t\ttemplateId: MailTemplateIdentifier,\n\t\ttemplate: Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'>,\n\t\tvariables: Record<string, any>,\n\t) {\n\t\tconst html = await this.templateRenderer.render(template.content, variables)\n\t\tawait this.mailer.send({\n\t\t\tto: variables.email,\n\t\t\tsubject: await this.templateRenderer.render(template.subject, variables),\n\t\t\thtml,\n\t\t\tvariables,\n\t\t\ttemplate: templateId,\n\t\t\t...(template.replyTo ? {\n\t\t\t\treplyTo: template.replyTo,\n\t\t\t} : {}),\n\t\t})\n\t}\n\n\tprivate async getCustomTemplate(\n\t\tdbContext: DatabaseContext,\n\t\tidentifier: MailTemplateIdentifier,\n\t): Promise<Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'> | null> {\n\t\tconst customTemplate =\n\t\t\t(await dbContext.queryHandler.fetch(new MailTemplateQuery(identifier)))\n\t\t\t?? (await dbContext.queryHandler.fetch(new MailTemplateQuery({ ...identifier, projectId: null })))\n\n\t\tif (!customTemplate) {\n\t\t\treturn null\n\t\t}\n\t\tconst content = customTemplate.useLayout ? Layout(customTemplate.content) : customTemplate.content\n\t\treturn { content, subject: customTemplate.subject, replyTo: customTemplate.replyTo }\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;;;AAWO,MAAM,WAAW;AAAA,EACvB,YACkB,QACA,kBAChB;AAFgB,SAAA,SAAA;AACA,SAAA,mBAAA;AAAA,EAAA;AAAA,EAGlB,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,gBAAgB,GAAG,kBAAkB;AACzE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,6BACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,qBAAqB,GAAG,kBAAkB;AAC9E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,uBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,eAAe,GAAG,kBAAkB;AACxE,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAM,sBACL,WACA,eACA,mBACgB;AAChB,UAAM,aAAa,EAAE,MAAM,SAAS,oBAAoB,GAAG,kBAAkB;AAC7E,UAAM,WAAY,MAAM,KAAK,kBAAkB,WAAW,UAAU,KAAM;AAAA,MACzE,SAAS;AAAA,MACT,SAAS;AAAA,MACT,SAAS;AAAA,IACV;AACA,UAAM,KAAK,SAAS,YAAY,UAAU,aAAa;AAAA,EAAA;AAAA,EAGxD,MAAc,SACb,YACA,UACA,WACC;AACD,UAAM,OAAO,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AACrE,UAAA,KAAK,OAAO,KAAK;AAAA,MACtB,IAAI,UAAU;AAAA,MACd,SAAS,MAAM,KAAK,iBAAiB,OAAO,SAAS,SAAS,SAAS;AAAA,MACvE;AAAA,MACA;AAAA,MACA,UAAU;AAAA,MACV,GAAI,SAAS,UAAU;AAAA,QACtB,SAAS,SAAS;AAAA,MAAA,IACf,CAAA;AAAA,IAAC,CACL;AAAA,EAAA;AAAA,EAGF,MAAc,kBACb,WACA,YAC4E;AACtE,UAAA,iBACJ,MAAM,UAAU,aAAa,MAAM,IAAI,kBAAkB,UAAU,CAAC,KACjE,MAAM,UAAU,aAAa,MAAM,IAAI,kBAAkB,EAAE,GAAG,YAAY,WAAW,KAAK,CAAC,CAAC;AAEjG,QAAI,CAAC,gBAAgB;AACb,aAAA;AAAA,IAAA;AAER,UAAM,UAAU,eAAe,YAAY,OAAO,eAAe,OAAO,IAAI,eAAe;AAC3F,WAAO,EAAE,SAAS,SAAS,eAAe,SAAS,SAAS,eAAe,QAAQ;AAAA,EAAA;AAErF;"}

package/dist/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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/development/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();

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

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const CreateAuthLogEntryCommand = require("../commands/authLog/CreateAuthLogEntryCommand.cjs");
+class AuthLogService {
+  async logAuthAction(db, ctx, data) {
+    const dataContainer = data.response.ok ? data.response.result ?? {} : data.response.metadata ?? {};
+    const authData = typeof dataContainer === "object" && dataContainer !== null && AuthLogService.Key in dataContainer ? dataContainer[AuthLogService.Key] : void 0;
+    await db.commandBus.execute(new CreateAuthLogEntryCommand.CreateAuthLogEntryCommand({
+      success: data.response.ok,
+      personInputIdentifier: data.personInput ?? authData?.data?.personInput,
+      personId: data.personId ?? authData?.data?.personId,
+      invokedById: ctx.identityId,
+      type: data.type,
+      identityProviderId: data.identityProviderId ?? authData?.data?.identityProviderId,
+      errorCode: data.response.ok ? null : data.response.error,
+      personTokenId: data.tokenId ?? authData?.data?.tokenId,
+      errorMessage: data.response.ok ? void 0 : data.response.errorMessage,
+      ipAddress: ctx.clientIp,
+      userAgent: ctx.userAgent,
+      metadata: {}
+    }));
+  }
+}
+((AuthLogService2) => {
+  AuthLogService2.Key = Symbol("AuthLogData");
+  class Bag {
+    constructor(data) {
+      this.data = data;
+    }
+  }
+  AuthLogService2.Bag = Bag;
+})(AuthLogService || (AuthLogService = {}));
+exports.AuthLogService = AuthLogService;
+//# sourceMappingURL=AuthLogService.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AuthLogService.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/AuthLogService.ts"],"sourcesContent":["import { DatabaseContext } from '../utils'\nimport { CreateAuthLogEntryCommand } from '../commands/authLog/CreateAuthLogEntryCommand'\nimport { Response } from '../utils/Response'\nimport { AuthActionType } from '../type/AuthLog'\n\nclass AuthLogService {\n\tasync logAuthAction(\n\t\tdb: DatabaseContext,\n\t\tctx: { identityId: string; clientIp?: string; userAgent?: string },\n\t\tdata: AuthLogService.LogArgs,\n\t): Promise<void> {\n\t\tconst dataContainer = data.response.ok\n\t\t\t? data.response.result ?? {}\n\t\t\t: data.response.metadata ?? {}\n\t\tconst authData = typeof dataContainer === 'object' && dataContainer !== null && AuthLogService.Key in dataContainer\n\t\t\t? dataContainer[AuthLogService.Key] as AuthLogService.Bag\n\t\t\t: undefined\n\n\t\tawait db.commandBus.execute(new CreateAuthLogEntryCommand({\n\t\t\tsuccess: data.response.ok,\n\t\t\tpersonInputIdentifier: data.personInput ?? authData?.data?.personInput,\n\t\t\tpersonId: data.personId ?? authData?.data?.personId,\n\t\t\tinvokedById: ctx.identityId,\n\t\t\ttype: data.type,\n\t\t\tidentityProviderId: data.identityProviderId ?? authData?.data?.identityProviderId,\n\t\t\terrorCode: data.response.ok ? null : data.response.error,\n\t\t\tpersonTokenId: data.tokenId ?? authData?.data?.tokenId,\n\t\t\terrorMessage: data.response.ok ? undefined : data.response.errorMessage,\n\t\t\tipAddress: ctx.clientIp,\n\t\t\tuserAgent: ctx.userAgent,\n\t\t\tmetadata: {},\n\t\t}))\n\t}\n}\n\nnamespace AuthLogService {\n\texport const Key = Symbol('AuthLogData')\n\ttype Data = {\n\t\tpersonId?: string\n\t\tpersonInput?: string // e.g. email\n\t\ttokenId?: string\n\t\tidentityProviderId?: string\n\t}\n\n\texport type LogArgs = {\n\t\tresponse: Response<\n\t\t\tnull | { [Key]?: Bag },\n\t\t\tany,\n\t\t\t{} | { [Key]?: Bag }\n\t\t>\n\t\ttype: AuthActionType\n\t} & Data\n\n\texport class Bag {\n\t\tconstructor(\n\t\t\tpublic readonly data: Data,\n\t\t) {\n\t\t}\n\t}\n}\n\nexport { AuthLogService }\n"],"names":["CreateAuthLogEntryCommand","AuthLogService"],"mappings":";;;AAKA,MAAM,eAAe;AAAA,EACpB,MAAM,cACL,IACA,KACA,MACgB;AAChB,UAAM,gBAAgB,KAAK,SAAS,KACjC,KAAK,SAAS,UAAU,CAAA,IACxB,KAAK,SAAS,YAAY,CAAC;AAC9B,UAAM,WAAW,OAAO,kBAAkB,YAAY,kBAAkB,QAAQ,eAAe,OAAO,gBACnG,cAAc,eAAe,GAAG,IAChC;AAEH,UAAM,GAAG,WAAW,QAAQ,IAAIA,0BAAAA,0BAA0B;AAAA,MACzD,SAAS,KAAK,SAAS;AAAA,MACvB,uBAAuB,KAAK,eAAe,UAAU,MAAM;AAAA,MAC3D,UAAU,KAAK,YAAY,UAAU,MAAM;AAAA,MAC3C,aAAa,IAAI;AAAA,MACjB,MAAM,KAAK;AAAA,MACX,oBAAoB,KAAK,sBAAsB,UAAU,MAAM;AAAA,MAC/D,WAAW,KAAK,SAAS,KAAK,OAAO,KAAK,SAAS;AAAA,MACnD,eAAe,KAAK,WAAW,UAAU,MAAM;AAAA,MAC/C,cAAc,KAAK,SAAS,KAAK,SAAY,KAAK,SAAS;AAAA,MAC3D,WAAW,IAAI;AAAA,MACf,WAAW,IAAI;AAAA,MACf,UAAU,CAAA;AAAA,IAAC,CACX,CAAC;AAAA,EAAA;AAEJ;AAAA,CAEA,CAAUC,oBAAV;AACcA,kBAAA,MAAM,OAAO,aAAa;AAAA,EAiBhC,MAAM,IAAI;AAAA,IAChB,YACiB,MACf;AADe,WAAA,OAAA;AAAA,IAAA;AAAA,EAEjB;AAJMA,kBAAM,MAAA;AAAA,GAlBJ,mBAAA,iBAAA,CAAA,EAAA;;"}

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

@@ -0,0 +1,34 @@
+import { CreateAuthLogEntryCommand } from "../commands/authLog/CreateAuthLogEntryCommand.js";
+class AuthLogService {
+  async logAuthAction(db, ctx, data) {
+    const dataContainer = data.response.ok ? data.response.result ?? {} : data.response.metadata ?? {};
+    const authData = typeof dataContainer === "object" && dataContainer !== null && AuthLogService.Key in dataContainer ? dataContainer[AuthLogService.Key] : void 0;
+    await db.commandBus.execute(new CreateAuthLogEntryCommand({
+      success: data.response.ok,
+      personInputIdentifier: data.personInput ?? authData?.data?.personInput,
+      personId: data.personId ?? authData?.data?.personId,
+      invokedById: ctx.identityId,
+      type: data.type,
+      identityProviderId: data.identityProviderId ?? authData?.data?.identityProviderId,
+      errorCode: data.response.ok ? null : data.response.error,
+      personTokenId: data.tokenId ?? authData?.data?.tokenId,
+      errorMessage: data.response.ok ? void 0 : data.response.errorMessage,
+      ipAddress: ctx.clientIp,
+      userAgent: ctx.userAgent,
+      metadata: {}
+    }));
+  }
+}
+((AuthLogService2) => {
+  AuthLogService2.Key = Symbol("AuthLogData");
+  class Bag {
+    constructor(data) {
+      this.data = data;
+    }
+  }
+  AuthLogService2.Bag = Bag;
+})(AuthLogService || (AuthLogService = {}));
+export {
+  AuthLogService
+};
+//# sourceMappingURL=AuthLogService.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AuthLogService.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/AuthLogService.ts"],"sourcesContent":["import { DatabaseContext } from '../utils'\nimport { CreateAuthLogEntryCommand } from '../commands/authLog/CreateAuthLogEntryCommand'\nimport { Response } from '../utils/Response'\nimport { AuthActionType } from '../type/AuthLog'\n\nclass AuthLogService {\n\tasync logAuthAction(\n\t\tdb: DatabaseContext,\n\t\tctx: { identityId: string; clientIp?: string; userAgent?: string },\n\t\tdata: AuthLogService.LogArgs,\n\t): Promise<void> {\n\t\tconst dataContainer = data.response.ok\n\t\t\t? data.response.result ?? {}\n\t\t\t: data.response.metadata ?? {}\n\t\tconst authData = typeof dataContainer === 'object' && dataContainer !== null && AuthLogService.Key in dataContainer\n\t\t\t? dataContainer[AuthLogService.Key] as AuthLogService.Bag\n\t\t\t: undefined\n\n\t\tawait db.commandBus.execute(new CreateAuthLogEntryCommand({\n\t\t\tsuccess: data.response.ok,\n\t\t\tpersonInputIdentifier: data.personInput ?? authData?.data?.personInput,\n\t\t\tpersonId: data.personId ?? authData?.data?.personId,\n\t\t\tinvokedById: ctx.identityId,\n\t\t\ttype: data.type,\n\t\t\tidentityProviderId: data.identityProviderId ?? authData?.data?.identityProviderId,\n\t\t\terrorCode: data.response.ok ? null : data.response.error,\n\t\t\tpersonTokenId: data.tokenId ?? authData?.data?.tokenId,\n\t\t\terrorMessage: data.response.ok ? undefined : data.response.errorMessage,\n\t\t\tipAddress: ctx.clientIp,\n\t\t\tuserAgent: ctx.userAgent,\n\t\t\tmetadata: {},\n\t\t}))\n\t}\n}\n\nnamespace AuthLogService {\n\texport const Key = Symbol('AuthLogData')\n\ttype Data = {\n\t\tpersonId?: string\n\t\tpersonInput?: string // e.g. email\n\t\ttokenId?: string\n\t\tidentityProviderId?: string\n\t}\n\n\texport type LogArgs = {\n\t\tresponse: Response<\n\t\t\tnull | { [Key]?: Bag },\n\t\t\tany,\n\t\t\t{} | { [Key]?: Bag }\n\t\t>\n\t\ttype: AuthActionType\n\t} & Data\n\n\texport class Bag {\n\t\tconstructor(\n\t\t\tpublic readonly data: Data,\n\t\t) {\n\t\t}\n\t}\n}\n\nexport { AuthLogService }\n"],"names":["AuthLogService"],"mappings":";AAKA,MAAM,eAAe;AAAA,EACpB,MAAM,cACL,IACA,KACA,MACgB;AAChB,UAAM,gBAAgB,KAAK,SAAS,KACjC,KAAK,SAAS,UAAU,CAAA,IACxB,KAAK,SAAS,YAAY,CAAC;AAC9B,UAAM,WAAW,OAAO,kBAAkB,YAAY,kBAAkB,QAAQ,eAAe,OAAO,gBACnG,cAAc,eAAe,GAAG,IAChC;AAEH,UAAM,GAAG,WAAW,QAAQ,IAAI,0BAA0B;AAAA,MACzD,SAAS,KAAK,SAAS;AAAA,MACvB,uBAAuB,KAAK,eAAe,UAAU,MAAM;AAAA,MAC3D,UAAU,KAAK,YAAY,UAAU,MAAM;AAAA,MAC3C,aAAa,IAAI;AAAA,MACjB,MAAM,KAAK;AAAA,MACX,oBAAoB,KAAK,sBAAsB,UAAU,MAAM;AAAA,MAC/D,WAAW,KAAK,SAAS,KAAK,OAAO,KAAK,SAAS;AAAA,MACnD,eAAe,KAAK,WAAW,UAAU,MAAM;AAAA,MAC/C,cAAc,KAAK,SAAS,KAAK,SAAY,KAAK,SAAS;AAAA,MAC3D,WAAW,IAAI;AAAA,MACf,WAAW,IAAI;AAAA,MACf,UAAU,CAAA;AAAA,IAAC,CACX,CAAC;AAAA,EAAA;AAEJ;AAAA,CAEA,CAAUA,oBAAV;AACcA,kBAAA,MAAM,OAAO,aAAa;AAAA,EAiBhC,MAAM,IAAI;AAAA,IAChB,YACiB,MACf;AADe,WAAA,OAAA;AAAA,IAAA;AAAA,EAEjB;AAJMA,kBAAM,MAAA;AAAA,GAlBJ,mBAAA,iBAAA,CAAA,EAAA;"}

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

@@ -5,13 +5,6 @@ require("../type/ApiKey.cjs");
 require("@contember/database");
 require("node:crypto");
 const UpdateConfigurationCommand = require("../commands/configuration/UpdateConfigurationCommand.cjs");
-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");
 class ConfigurationManager {
   constructor() {
   }
@@ -19,9 +12,6 @@ class ConfigurationManager {
     await db.commandBus.execute(new UpdateConfigurationCommand.UpdateConfigurationCommand(configuration));
     return new Response.ResponseOk(null);
   }
-  async fetchConfiguration(db) {
-    return await db.queryHandler.fetch(new ConfigurationQuery.ConfigurationQuery());
-  }
 }
 exports.ConfigurationManager = ConfigurationManager;
 //# sourceMappingURL=ConfigurationManager.cjs.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConfigurationManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/ConfigurationManager.ts"],"sourcesContent":["import { Config, ConfigInput, ConfigureErrorCode } from '../../schema'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { UpdateConfigurationCommand } from '../commands'\nimport { ConfigurationQuery } from '../queries'\n\nexport class ConfigurationManager {\n\tconstructor() {\n\t}\n\n\tpublic async updateConfiguration(db: DatabaseContext, configuration: ConfigInput): Promise<Response<null, ConfigureErrorCode>> {\n\t\t// todo: validate configuration\n\n\t\tawait db.commandBus.execute(new UpdateConfigurationCommand(configuration))\n\n\t\treturn new ResponseOk(null)\n\t}\n\n\tpublic async fetchConfiguration(db: DatabaseContext): Promise<Config> {\n\t\treturn await db.queryHandler.fetch(new ConfigurationQuery())\n\t}\n}\n"],"names":["UpdateConfigurationCommand","ResponseOk","ConfigurationQuery"],"mappings":";;;;;;;;;;;;;;AAMO,MAAM,qBAAqB;AAAA,EACjC,cAAc;AAAA,EAAA;AAAA,EAGd,MAAa,oBAAoB,IAAqB,eAAyE;AAG9H,UAAM,GAAG,WAAW,QAAQ,IAAIA,2BAAA,2BAA2B,aAAa,CAAC;AAElE,WAAA,IAAIC,oBAAW,IAAI;AAAA,EAAA;AAAA,EAG3B,MAAa,mBAAmB,IAAsC;AACrE,WAAO,MAAM,GAAG,aAAa,MAAM,IAAIC,uCAAoB;AAAA,EAAA;AAE7D;;"}
+{"version":3,"file":"ConfigurationManager.cjs","sources":["../../../../../../packages/engine-tenant-api/src/model/service/ConfigurationManager.ts"],"sourcesContent":["import { ConfigInput, ConfigureErrorCode } from '../../schema'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { UpdateConfigurationCommand } from '../commands'\n\nexport class ConfigurationManager {\n\tconstructor() {\n\t}\n\n\tpublic async updateConfiguration(db: DatabaseContext, configuration: ConfigInput): Promise<Response<null, ConfigureErrorCode>> {\n\t\t// todo: validate configuration\n\n\t\tawait db.commandBus.execute(new UpdateConfigurationCommand(configuration))\n\n\t\treturn new ResponseOk(null)\n\t}\n}\n"],"names":["UpdateConfigurationCommand","ResponseOk"],"mappings":";;;;;;;AAKO,MAAM,qBAAqB;AAAA,EACjC,cAAc;AAAA,EAAA;AAAA,EAGd,MAAa,oBAAoB,IAAqB,eAAyE;AAG9H,UAAM,GAAG,WAAW,QAAQ,IAAIA,2BAAA,2BAA2B,aAAa,CAAC;AAElE,WAAA,IAAIC,oBAAW,IAAI;AAAA,EAAA;AAE5B;;"}

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

@@ -3,13 +3,6 @@ import "../type/ApiKey.js";
 import "@contember/database";
 import "node:crypto";
 import { UpdateConfigurationCommand } from "../commands/configuration/UpdateConfigurationCommand.js";
-import "../queries/apiKey/ApiKeyQuery.js";
-import { ConfigurationQuery } from "../queries/configuration/ConfigurationQuery.js";
-import "../authorization/PermissionActions.js";
-import "@contember/authorization";
-import "../authorization/PermissionContext.js";
-import "../authorization/PermissionsFactory.js";
-import "@contember/schema";
 class ConfigurationManager {
   constructor() {
   }
@@ -17,9 +10,6 @@ class ConfigurationManager {
     await db.commandBus.execute(new UpdateConfigurationCommand(configuration));
     return new ResponseOk(null);
   }
-  async fetchConfiguration(db) {
-    return await db.queryHandler.fetch(new ConfigurationQuery());
-  }
 }
 export {
   ConfigurationManager

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

@@ -1 +1 @@
-{"version":3,"file":"ConfigurationManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/ConfigurationManager.ts"],"sourcesContent":["import { Config, ConfigInput, ConfigureErrorCode } from '../../schema'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { UpdateConfigurationCommand } from '../commands'\nimport { ConfigurationQuery } from '../queries'\n\nexport class ConfigurationManager {\n\tconstructor() {\n\t}\n\n\tpublic async updateConfiguration(db: DatabaseContext, configuration: ConfigInput): Promise<Response<null, ConfigureErrorCode>> {\n\t\t// todo: validate configuration\n\n\t\tawait db.commandBus.execute(new UpdateConfigurationCommand(configuration))\n\n\t\treturn new ResponseOk(null)\n\t}\n\n\tpublic async fetchConfiguration(db: DatabaseContext): Promise<Config> {\n\t\treturn await db.queryHandler.fetch(new ConfigurationQuery())\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;;;;;AAMO,MAAM,qBAAqB;AAAA,EACjC,cAAc;AAAA,EAAA;AAAA,EAGd,MAAa,oBAAoB,IAAqB,eAAyE;AAG9H,UAAM,GAAG,WAAW,QAAQ,IAAI,2BAA2B,aAAa,CAAC;AAElE,WAAA,IAAI,WAAW,IAAI;AAAA,EAAA;AAAA,EAG3B,MAAa,mBAAmB,IAAsC;AACrE,WAAO,MAAM,GAAG,aAAa,MAAM,IAAI,oBAAoB;AAAA,EAAA;AAE7D;"}
+{"version":3,"file":"ConfigurationManager.js","sources":["../../../../../../packages/engine-tenant-api/src/model/service/ConfigurationManager.ts"],"sourcesContent":["import { ConfigInput, ConfigureErrorCode } from '../../schema'\nimport { Response, ResponseOk } from '../utils/Response'\nimport { DatabaseContext } from '../utils'\nimport { UpdateConfigurationCommand } from '../commands'\n\nexport class ConfigurationManager {\n\tconstructor() {\n\t}\n\n\tpublic async updateConfiguration(db: DatabaseContext, configuration: ConfigInput): Promise<Response<null, ConfigureErrorCode>> {\n\t\t// todo: validate configuration\n\n\t\tawait db.commandBus.execute(new UpdateConfigurationCommand(configuration))\n\n\t\treturn new ResponseOk(null)\n\t}\n}\n"],"names":[],"mappings":";;;;;AAKO,MAAM,qBAAqB;AAAA,EACjC,cAAc;AAAA,EAAA;AAAA,EAGd,MAAa,oBAAoB,IAAqB,eAAyE;AAG9H,UAAM,GAAG,WAAW,QAAQ,IAAI,2BAA2B,aAAa,CAAC;AAElE,WAAA,IAAI,WAAW,IAAI;AAAA,EAAA;AAE5B;"}

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

@@ -25,6 +25,7 @@ const CreatePersonCommand = require("../commands/person/CreatePersonCommand.cjs"
 const CreatePersonIdentityProviderIdentifierCommand = require("../commands/person/CreatePersonIdentityProviderIdentifierCommand.cjs");
 const CreateIdentityCommand = require("../commands/identity/CreateIdentityCommand.cjs");
 const Password = require("../dtos/Password.cjs");
+const AuthLogService = require("./AuthLogService.cjs");
 class IDPSignInManager {
   constructor(apiKeyManager, idpRegistry) {
     this.apiKeyManager = apiKeyManager;
@@ -46,22 +47,53 @@ class IDPSignInManager {
         );
       } catch (e) {
         if (e instanceof IDPResponseError.IDPResponseError) {
-          return new Response.ResponseError("INVALID_IDP_RESPONSE", e.message);
+          return new Response.ResponseError("INVALID_IDP_RESPONSE", e.message, {
+            [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+              personId: void 0,
+              identityProviderId: provider.id
+            })
+          });
         }
         if (e instanceof IDPValidationError.IDPValidationError) {
-          return new Response.ResponseError("IDP_VALIDATION_FAILED", e.message);
+          return new Response.ResponseError("IDP_VALIDATION_FAILED", e.message, {
+            [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+              personId: void 0,
+              identityProviderId: provider.id
+            })
+          });
         }
         throw e;
       }
       const personRow = await this.resolvePerson(db, claim, provider);
       if (!personRow) {
-        return new Response.ResponseError("PERSON_NOT_FOUND", `Person ${claim.email} not found`);
+        return new Response.ResponseError("PERSON_NOT_FOUND", `Person ${claim.email} not found`, {
+          [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+            identityProviderId: provider.id,
+            personInput: claim.email,
+            personId: void 0
+          })
+        });
       }
       if (personRow.disabled_at !== null) {
-        return new Response.ResponseError("PERSON_DISABLED", `Person with e-mail ${claim.email} is disabled`);
+        return new Response.ResponseError("PERSON_DISABLED", `Person with e-mail ${claim.email} is disabled`, {
+          [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+            identityProviderId: provider.id,
+            personInput: claim.email,
+            personId: personRow.id
+          })
+        });
       }
       const sessionToken = await this.apiKeyManager.createSessionApiKey(db, personRow.identity_id, expiration);
-      return new Response.ResponseOk({ person: personRow, token: sessionToken, idpResponse: claim });
+      return new Response.ResponseOk({
+        person: personRow,
+        token: sessionToken,
+        idpResponse: claim,
+        [AuthLogService.AuthLogService.Key]: new AuthLogService.AuthLogService.Bag({
+          personId: personRow.id,
+          identityProviderId: provider.id,
+          personInput: claim.email
+        })
+      });
     });
   }
   async initSignInIDP(dbContext, idpSlug, data) {