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

package/graphql.codegen.yml

@@ -1,11 +1,15 @@
 schema:
   - "./src/schema/tenant.graphql.ts"
 documents: []
-config:
-  immutableTypes: "1"
 generates:
   ./src/schema/index.ts:
     config:
+      scalars:
+        DateTime: Date
+        Json: unknown
+        Interval:
+          input: './types#Interval'
+          output: './types#OutputInterval'
       immutableTypes: true
       enumsAsTypes: true
     plugins:
@@ -14,4 +18,4 @@ generates:
       - "typescript-resolvers"
 hooks:
   afterAllFileWrite:
-    - yarn run -T eslint --fix
+    - bunx biome lint --write

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "2.1.0-alpha.3",
+  "version": "2.1.0-alpha.35",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,35 +26,41 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/authorization": "2.1.0-alpha.3",
-    "@contember/config-loader": "2.1.0-alpha.3",
-    "@contember/database": "2.1.0-alpha.3",
-    "@contember/database-migrations": "2.1.0-alpha.3",
-    "@contember/dic": "2.1.0-alpha.3",
-    "@contember/graphql-utils": "2.1.0-alpha.3",
-    "@contember/logger": "2.1.0-alpha.3",
-    "@contember/schema": "2.1.0-alpha.3",
-    "@contember/schema-utils": "2.1.0-alpha.3",
-    "@contember/typesafe": "2.1.0-alpha.3",
-    "@graphql-tools/utils": "^10.5.5",
-    "graphql-tag": "^2.12.6",
-    "jose": "^5.8.0",
-    "mustache": "^4.2.0",
-    "nodemailer": "^6.9.15",
-    "openid-client": "^5.7.0",
-    "otpauth": "^9.3.4"
+    "@contember/authorization": "workspace:*",
+    "@contember/config-loader": "workspace:*",
+    "@contember/database": "workspace:*",
+    "@contember/database-migrations": "workspace:*",
+    "@contember/dic": "workspace:*",
+    "@contember/graphql-utils": "workspace:*",
+    "@contember/logger": "workspace:*",
+    "@contember/schema": "workspace:*",
+    "@contember/schema-utils": "workspace:*",
+    "@contember/typesafe": "workspace:*",
+    "@graphql-tools/utils": "catalog:",
+    "graphql-tag": "catalog:",
+    "jose": "catalog:",
+    "mustache": "catalog:",
+    "nodemailer": "catalog:",
+    "postgres-interval": "catalog:",
+    "openid-client": "catalog:",
+    "otpauth": "catalog:"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.1.0-alpha.3",
-    "@graphql-tools/schema": "^10.0.7",
-    "@types/mustache": "^4.2.5",
-    "@types/node": "^20.17.22",
-    "@types/nodemailer": "^6.4.16",
-    "graphql": "^16.9.0"
+    "@contember/database-tester": "workspace:*",
+    "@graphql-tools/schema": "catalog:",
+    "@types/mustache": "catalog:",
+    "@types/node": "catalog:",
+    "@types/nodemailer": "catalog:",
+    "graphql": "catalog:"
   },
   "peerDependencies": {
-    "graphql": ">= 14.6.0",
-    "pg": "^8.9.0"
+    "graphql": "catalog:",
+    "pg": "catalog:"
   },
-  "type": "module"
+  "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/contember/contember.git",
+    "directory": "packages/engine-tenant-api"
+  }
 }

package/src/TenantContainer.ts

@@ -85,6 +85,8 @@ import { ConfigurationQueryResolver } from './resolvers/query/ConfigurationQuery
 import { PasswordlessMutationResolver } from './resolvers/mutation/person/PasswordlessMutationResolver'
 import { PasswordlessSignInManager } from './model/service/PasswordlessSignInManager'
 import { TogglePasswordlessMutationResolver } from './resolvers/mutation/person/TogglePasswordlessMutationResolver'
+import { PasswordStrengthValidator } from './model/service/PasswordStrengthValidator'
+import { AuthLogService } from './model/service/AuthLogService'
 
 export interface TenantContainer {
 	projectMemberManager: ProjectMemberManager
@@ -116,7 +118,7 @@ export interface TenantContainerArgs {
 export class TenantContainerFactory {
 	constructor(
 		private readonly providers: Omit<Providers, 'encrypt' | 'decrypt'>,
-	) { }
+	) {}
 
 	create(args: TenantContainerArgs): TenantContainer {
 		return this.createBuilder(args)
@@ -140,48 +142,35 @@ export class TenantContainerFactory {
 
 	createBuilder(args: TenantContainerArgs) {
 		return new Builder({})
-			.addService('providers', () =>
-				({ ...this.providers, ...args.cryptoProviders }))
-			.addService('mailer', () =>
-				createMailer(args.mailOptions))
-			.addService('projectSchemaResolver', () =>
-				args.projectSchemaResolver)
-			.addService('templateRenderer', () =>
-				new TemplateRenderer())
-			.addService('accessEvaluator', ({ }) =>
-				new AccessEvaluator.PermissionEvaluator(new PermissionsFactory().create()))
-			.addService('authorizator', ({ accessEvaluator }) =>
-				new Authorizator.Default(accessEvaluator))
-			.addService('userMailer', ({ mailer, templateRenderer }) =>
-				new UserMailer(mailer, templateRenderer))
-			.addService('apiKeyService', () =>
-				new ApiKeyService())
-			.addService('apiKeyManager', ({ apiKeyService }) =>
-				new ApiKeyManager(apiKeyService))
-			.addService('emailValidator', () =>
-				new EmailValidator())
-			.addService('signUpManager', ({ emailValidator }) =>
-				new SignUpManager(emailValidator))
-			.addService('passwordChangeManager', ({ providers }) =>
-				new PasswordChangeManager(providers))
-			.addService('projectMemberManager', () =>
-				new ProjectMemberManager())
-			.addService('identityFactory', ({ projectMemberManager }) =>
-				new IdentityFactory(projectMemberManager))
-			.addService('projectScopeFactory', () =>
-				new ProjectScopeFactory(new AclSchemaAccessNodeFactory()))
-			.addService('permissionContextFactory', ({ authorizator, identityFactory, projectScopeFactory, projectSchemaResolver }) =>
-				new PermissionContextFactory(authorizator, identityFactory, projectScopeFactory, projectSchemaResolver))
-			.addService('secretManager', ({ providers }) =>
-				new SecretsManager(providers))
-			.addService('projectManager', ({ secretManager, apiKeyService }) =>
-				new ProjectManager(secretManager, args.projectInitializer, apiKeyService))
-			.addService('personAccessManager', ({ apiKeyManager }) =>
-				new PersonAccessManager(apiKeyManager))
-			.addService('personManager', ({ emailValidator }) =>
-				new PersonManager(emailValidator))
-			.addService('passwordResetManager', ({ userMailer, projectManager }) =>
-				new PasswordResetManager(userMailer, projectManager))
+			.addService('providers', () => ({ ...this.providers, ...args.cryptoProviders }))
+			.addService('mailer', () => createMailer(args.mailOptions))
+			.addService('projectSchemaResolver', () => args.projectSchemaResolver)
+			.addService('templateRenderer', () => new TemplateRenderer())
+			.addService('accessEvaluator', ({}) => new AccessEvaluator.PermissionEvaluator(new PermissionsFactory().create()))
+			.addService('authorizator', ({ accessEvaluator }) => new Authorizator.Default(accessEvaluator))
+			.addService('userMailer', ({ mailer, templateRenderer }) => new UserMailer(mailer, templateRenderer))
+			.addService('apiKeyService', () => new ApiKeyService())
+			.addService('apiKeyManager', ({ apiKeyService }) => new ApiKeyManager(apiKeyService))
+			.addService('emailValidator', () => new EmailValidator())
+			.addService('passwordStrengthValidator', () => new PasswordStrengthValidator())
+			.addService('signUpManager', ({ emailValidator, passwordStrengthValidator }) => new SignUpManager(emailValidator, passwordStrengthValidator))
+			.addService('passwordChangeManager', ({ providers, passwordStrengthValidator }) => new PasswordChangeManager(providers, passwordStrengthValidator))
+			.addService('projectMemberManager', () => new ProjectMemberManager())
+			.addService('identityFactory', ({ projectMemberManager }) => new IdentityFactory(projectMemberManager))
+			.addService('projectScopeFactory', () => new ProjectScopeFactory(new AclSchemaAccessNodeFactory()))
+			.addService(
+				'permissionContextFactory',
+				({ authorizator, identityFactory, projectScopeFactory, projectSchemaResolver }) =>
+					new PermissionContextFactory(authorizator, identityFactory, projectScopeFactory, projectSchemaResolver),
+			)
+			.addService('secretManager', ({ providers }) => new SecretsManager(providers))
+			.addService('projectManager', ({ secretManager, apiKeyService }) => new ProjectManager(secretManager, args.projectInitializer, apiKeyService))
+			.addService('personAccessManager', ({ apiKeyManager }) => new PersonAccessManager(apiKeyManager))
+			.addService('personManager', ({ emailValidator }) => new PersonManager(emailValidator))
+			.addService(
+				'passwordResetManager',
+				({ userMailer, projectManager, passwordStrengthValidator }) => new PasswordResetManager(userMailer, projectManager, passwordStrengthValidator),
+			)
 			.addService('idpRegistry', () => {
 				const idpRegistry = new IDPHandlerRegistry()
 				idpRegistry.registerHandler('oidc', new OIDCProvider())
@@ -189,118 +178,129 @@ export class TenantContainerFactory {
 				idpRegistry.registerHandler('apple', new AppleProvider())
 				return idpRegistry
 			})
-			.addService('idpSignInManager', ({ apiKeyManager, idpRegistry }) =>
-				new IDPSignInManager(apiKeyManager, idpRegistry))
-			.addService('idpManager', ({ idpRegistry }) =>
-				new IDPManager(idpRegistry))
-			.addService('otpAuthenticator', ({ providers }) =>
-				new OtpAuthenticator(providers))
-			.addService('signInManager', ({ apiKeyManager, providers, otpAuthenticator }) =>
-				new SignInManager(apiKeyManager, providers, otpAuthenticator))
-			.addService('membershipValidator', ({ projectSchemaResolver }) =>
-				new MembershipValidator(projectSchemaResolver))
-			.addService('inviteManager', ({ providers, userMailer, projectSchemaResolver }) =>
-				new InviteManager(providers, userMailer, projectSchemaResolver))
-			.addService('otpManager', ({ otpAuthenticator }) =>
-				new OtpManager(otpAuthenticator))
-			.addService('mailTemplateManager', () =>
-				new MailTemplateManager())
-			.addService('rolesManager', () =>
-				new RolesManager())
-			.addService('configurationManager', () =>
-				new ConfigurationManager())
-			.addService('passwordlessSignInManager', ({ apiKeyManager, configurationManager, userMailer, projectManager, otpAuthenticator }) =>
-				new PasswordlessSignInManager(apiKeyManager, configurationManager, userMailer, projectManager, otpAuthenticator))
-
-			.addService('identityTypeResolver', ({ projectMemberManager, projectManager, permissionContextFactory }) =>
-				new IdentityTypeResolver(projectMemberManager, projectManager, permissionContextFactory))
-			.addService('projectTypeResolver', ({ projectMemberManager, projectSchemaResolver }) =>
-				new ProjectTypeResolver(projectMemberManager, projectSchemaResolver))
-			.addService('signInResponseFactory', ({ permissionContextFactory, identityTypeResolver }) =>
-				new SignInResponseFactory(permissionContextFactory, identityTypeResolver))
-			.addService('meQueryResolver', () =>
-				new MeQueryResolver())
-			.addService('personQueryResolver', ({ personManager }) =>
-				new PersonQueryResolver(personManager))
-			.addService('idpQueryResolver', ({ idpManager }) =>
-				new IDPQueryResolver(idpManager))
-			.addService('projectQueryResolver', ({ projectManager }) =>
-				new ProjectQueryResolver(projectManager))
-			.addService('projectMembersQueryResolver', ({ projectManager, projectMemberManager }) =>
-				new ProjectMembersQueryResolver(projectManager, projectMemberManager))
-			.addService('mailTemplateQueryResolver', () =>
-				new MailTemplateQueryResolver())
-			.addService('signUpMutationResolver', ({ signUpManager, apiKeyManager }) =>
-				new SignUpMutationResolver(signUpManager, apiKeyManager))
-			.addService('signInMutationResolver', ({ signInManager, signInResponseFactory }) =>
-				new SignInMutationResolver(signInManager, signInResponseFactory))
-			.addService('signOutMutationResolver', ({ apiKeyManager }) =>
-				new SignOutMutationResolver(apiKeyManager))
-			.addService('changeProfileMutationResolver', ({ personManager }) =>
-				new ChangeProfileMutationResolver(personManager))
-			.addService('changePasswordMutationResolver', ({ passwordChangeManager }) =>
-				new ChangePasswordMutationResolver(passwordChangeManager))
-			.addService('resetPasswordMutationResolver', ({ passwordResetManager, permissionContextFactory }) =>
-				new ResetPasswordMutationResolver(passwordResetManager, permissionContextFactory))
-			.addService('inviteMutationResolver', ({ inviteManager, projectManager, membershipValidator }) =>
-				new InviteMutationResolver(inviteManager, projectManager, membershipValidator))
-			.addService('addProjectMemberMutationResolver', ({ projectMemberManager, projectManager, membershipValidator }) =>
-				new AddProjectMemberMutationResolver(projectMemberManager, projectManager, membershipValidator))
-			.addService('updateProjectMemberMutationResolver', ({ projectMemberManager, projectManager, membershipValidator }) =>
-				new UpdateProjectMemberMutationResolver(projectMemberManager, projectManager, membershipValidator))
-			.addService('removeProjectMemberMutationResolver', ({ projectMemberManager, projectManager }) =>
-				new RemoveProjectMemberMutationResolver(projectMemberManager, projectManager))
-			.addService('createApiKeyMutationResolver', ({ apiKeyManager, projectManager, membershipValidator }) =>
-				new CreateApiKeyMutationResolver(apiKeyManager, projectManager, membershipValidator))
-			.addService('disableApiKeyMutationResolver', ({ apiKeyManager }) =>
-				new DisableApiKeyMutationResolver(apiKeyManager))
-			.addService('otpMutationResolver', ({ otpManager }) =>
-				new OtpMutationResolver(otpManager))
-			.addService('mailTemplateMutationResolver', ({ projectManager, mailTemplateManager }) =>
-				new MailTemplateMutationResolver(projectManager, mailTemplateManager))
-			.addService('idpMutationResolver', ({ idpSignInManager, signInResponseFactory }) =>
-				new IDPMutationResolver(idpSignInManager, signInResponseFactory))
-			.addService('registerIdpMutationResolver', ({ idpManager }) =>
-				new AddIDPMutationResolver(idpManager))
-			.addService('updateIdpMutationResolver', ({ idpManager }) =>
-				new UpdateIDPMutationResolver(idpManager))
-			.addService('disableIdpMutationResolver', ({ idpManager }) =>
-				new DisableIDPMutationResolver(idpManager))
-			.addService('enableIdpMutationResolver', ({ idpManager }) =>
-				new EnableIDPMutationResolver(idpManager))
-			.addService('createProjectMutationResolver', ({ projectManager }) =>
-				new CreateProjectMutationResolver(projectManager))
-			.addService('disablePersonMutationResolver', ({ personAccessManager, personManager }) =>
-				new DisablePersonMutationResolver(personAccessManager, personManager))
-			.addService('updateProjectMutationResolver', ({ projectManager }) =>
-				new UpdateProjectMutationResolver(projectManager))
-			.addService('setProjectSecretMutationResolver', ({ projectManager, secretManager }) =>
-				new SetProjectSecretMutationResolver(projectManager, secretManager))
-			.addService('identityGlobalRolesMutationResolver', ({ rolesManager }) =>
-				new IdentityGlobalRolesMutationResolver(rolesManager))
-			.addService('configurationMutationResolver', ({ configurationManager }) =>
-				new ConfigurationMutationResolver(configurationManager))
-			.addService('configurationQueryResolver', ({ configurationManager }) =>
-				new ConfigurationQueryResolver(configurationManager))
-			.addService('passwordlessMutationResolver', ({ passwordlessSignInManager, signInResponseFactory }) =>
-				new PasswordlessMutationResolver(passwordlessSignInManager, signInResponseFactory))
-			.addService('togglePasswordlessMutationResolver', ({ configurationManager, personManager }) =>
-				new TogglePasswordlessMutationResolver(configurationManager, personManager))
-			.addService('resolverContextFactory', ({ permissionContextFactory }) =>
-				new TenantResolverContextFactory(permissionContextFactory))
-			.addService('resolvers', container =>
-				new ResolverFactory(container).create())
-			.addService('connection', () =>
-				args.connection)
-			.addService('readConnection', () =>
-				args.readConnection)
-			.addService('databaseContext', ({ connection, providers }) =>
-				new DatabaseContext(connection.createClient('tenant', { module: 'tenant' }), providers))
-			.addService('readDatabaseContext', ({ readConnection, providers }) =>
-				new DatabaseContext(readConnection.createClient('tenant', { module: 'tenant' }), providers))
-			.addService('identityFetcher', ({ databaseContext }) =>
-				new IdentityFetcher(databaseContext.client))
-			.addService('migrationsRunner', ({ providers }) =>
-				new TenantMigrationsRunner(args.dbCredentials, 'tenant', args.tenantCredentials, providers))
+			.addService('idpSignInManager', ({ apiKeyManager, idpRegistry }) => new IDPSignInManager(apiKeyManager, idpRegistry))
+			.addService('idpManager', ({ idpRegistry }) => new IDPManager(idpRegistry))
+			.addService('otpAuthenticator', ({ providers }) => new OtpAuthenticator(providers))
+			.addService('signInManager', ({ apiKeyManager, providers, otpAuthenticator }) => new SignInManager(apiKeyManager, providers, otpAuthenticator))
+			.addService('membershipValidator', ({ projectSchemaResolver }) => new MembershipValidator(projectSchemaResolver))
+			.addService('inviteManager', ({ providers, userMailer, projectSchemaResolver }) => new InviteManager(providers, userMailer, projectSchemaResolver))
+			.addService('otpManager', ({ otpAuthenticator }) => new OtpManager(otpAuthenticator))
+			.addService('mailTemplateManager', () => new MailTemplateManager())
+			.addService('rolesManager', () => new RolesManager())
+			.addService('configurationManager', () => new ConfigurationManager())
+			.addService(
+				'passwordlessSignInManager',
+				({ apiKeyManager, userMailer, projectManager, otpAuthenticator }) =>
+					new PasswordlessSignInManager(apiKeyManager, userMailer, projectManager, otpAuthenticator),
+			)
+			.addService(
+				'identityTypeResolver',
+				({ projectMemberManager, projectManager, permissionContextFactory }) =>
+					new IdentityTypeResolver(projectMemberManager, projectManager, permissionContextFactory),
+			)
+			.addService(
+				'projectTypeResolver',
+				({ projectMemberManager, projectSchemaResolver }) => new ProjectTypeResolver(projectMemberManager, projectSchemaResolver),
+			)
+			.addService(
+				'signInResponseFactory',
+				({ permissionContextFactory, identityTypeResolver }) => new SignInResponseFactory(permissionContextFactory, identityTypeResolver),
+			)
+			.addService('meQueryResolver', () => new MeQueryResolver())
+			.addService('personQueryResolver', ({ personManager }) => new PersonQueryResolver(personManager))
+			.addService('idpQueryResolver', ({ idpManager }) => new IDPQueryResolver(idpManager))
+			.addService('projectQueryResolver', ({ projectManager }) => new ProjectQueryResolver(projectManager))
+			.addService(
+				'projectMembersQueryResolver',
+				({ projectManager, projectMemberManager }) => new ProjectMembersQueryResolver(projectManager, projectMemberManager),
+			)
+			.addService('mailTemplateQueryResolver', () => new MailTemplateQueryResolver())
+			.addService('signUpMutationResolver', ({ signUpManager, apiKeyManager }) => new SignUpMutationResolver(signUpManager, apiKeyManager))
+			.addService(
+				'signInMutationResolver',
+				({ signInManager, signInResponseFactory }) => new SignInMutationResolver(signInManager, signInResponseFactory),
+			)
+			.addService('signOutMutationResolver', ({ apiKeyManager }) => new SignOutMutationResolver(apiKeyManager))
+			.addService('changeProfileMutationResolver', ({ personManager }) => new ChangeProfileMutationResolver(personManager))
+			.addService('changePasswordMutationResolver', ({ passwordChangeManager }) => new ChangePasswordMutationResolver(passwordChangeManager))
+			.addService(
+				'resetPasswordMutationResolver',
+				({ passwordResetManager, permissionContextFactory }) => new ResetPasswordMutationResolver(passwordResetManager, permissionContextFactory),
+			)
+			.addService(
+				'inviteMutationResolver',
+				({ inviteManager, projectManager, membershipValidator }) => new InviteMutationResolver(inviteManager, projectManager, membershipValidator),
+			)
+			.addService(
+				'addProjectMemberMutationResolver',
+				({ projectMemberManager, projectManager, membershipValidator }) =>
+					new AddProjectMemberMutationResolver(projectMemberManager, projectManager, membershipValidator),
+			)
+			.addService(
+				'updateProjectMemberMutationResolver',
+				({ projectMemberManager, projectManager, membershipValidator }) =>
+					new UpdateProjectMemberMutationResolver(projectMemberManager, projectManager, membershipValidator),
+			)
+			.addService(
+				'removeProjectMemberMutationResolver',
+				({ projectMemberManager, projectManager }) => new RemoveProjectMemberMutationResolver(projectMemberManager, projectManager),
+			)
+			.addService(
+				'createApiKeyMutationResolver',
+				({ apiKeyManager, projectManager, membershipValidator }) => new CreateApiKeyMutationResolver(apiKeyManager, projectManager, membershipValidator),
+			)
+			.addService('disableApiKeyMutationResolver', ({ apiKeyManager }) => new DisableApiKeyMutationResolver(apiKeyManager))
+			.addService('otpMutationResolver', ({ otpManager }) => new OtpMutationResolver(otpManager))
+			.addService(
+				'mailTemplateMutationResolver',
+				({ projectManager, mailTemplateManager }) => new MailTemplateMutationResolver(projectManager, mailTemplateManager),
+			)
+			.addService(
+				'idpMutationResolver',
+				({ idpSignInManager, signInResponseFactory }) => new IDPMutationResolver(idpSignInManager, signInResponseFactory),
+			)
+			.addService('registerIdpMutationResolver', ({ idpManager }) => new AddIDPMutationResolver(idpManager))
+			.addService('updateIdpMutationResolver', ({ idpManager }) => new UpdateIDPMutationResolver(idpManager))
+			.addService('disableIdpMutationResolver', ({ idpManager }) => new DisableIDPMutationResolver(idpManager))
+			.addService('enableIdpMutationResolver', ({ idpManager }) => new EnableIDPMutationResolver(idpManager))
+			.addService('createProjectMutationResolver', ({ projectManager }) => new CreateProjectMutationResolver(projectManager))
+			.addService(
+				'disablePersonMutationResolver',
+				({ personAccessManager, personManager }) => new DisablePersonMutationResolver(personAccessManager, personManager),
+			)
+			.addService('updateProjectMutationResolver', ({ projectManager }) => new UpdateProjectMutationResolver(projectManager))
+			.addService(
+				'setProjectSecretMutationResolver',
+				({ projectManager, secretManager }) => new SetProjectSecretMutationResolver(projectManager, secretManager),
+			)
+			.addService('identityGlobalRolesMutationResolver', ({ rolesManager }) => new IdentityGlobalRolesMutationResolver(rolesManager))
+			.addService('configurationMutationResolver', ({ configurationManager }) => new ConfigurationMutationResolver(configurationManager))
+			.addService('configurationQueryResolver', ({ configurationManager }) => new ConfigurationQueryResolver(configurationManager))
+			.addService(
+				'passwordlessMutationResolver',
+				({ passwordlessSignInManager, signInResponseFactory }) => new PasswordlessMutationResolver(passwordlessSignInManager, signInResponseFactory),
+			)
+			.addService(
+				'togglePasswordlessMutationResolver',
+				({ configurationManager, personManager }) => new TogglePasswordlessMutationResolver(configurationManager, personManager),
+			)
+			.addService('authLogService', () => new AuthLogService())
+			.addService(
+				'resolverContextFactory',
+				({ permissionContextFactory, authLogService }) => new TenantResolverContextFactory(permissionContextFactory, authLogService),
+			)
+			.addService('resolvers', container => new ResolverFactory(container).create())
+			.addService('connection', () => args.connection)
+			.addService('readConnection', () => args.readConnection)
+			.addService(
+				'databaseContext',
+				({ connection, providers }) => new DatabaseContext(connection.createClient('tenant', { module: 'tenant' }), providers),
+			)
+			.addService(
+				'readDatabaseContext',
+				({ readConnection, providers }) => new DatabaseContext(readConnection.createClient('tenant', { module: 'tenant' }), providers),
+			)
+			.addService('identityFetcher', ({ databaseContext }) => new IdentityFetcher(databaseContext.client))
+			.addService('migrationsRunner', ({ providers }) => new TenantMigrationsRunner(args.dbCredentials, 'tenant', args.tenantCredentials, providers))
 	}
 }

package/src/bin/runMigrations.ts

@@ -3,7 +3,6 @@ import { createLogger, PrettyPrintLoggerHandler } from '@contember/logger'
 
 let uuidNum = 0
 const dummyUuid = () => '123e4567-e89b-12d3-a456-' + (uuidNum++).toString().padStart(12, '0')
-
 ;(async () => {
 	const migrationsRunner = new TenantMigrationsRunner(
 		{
@@ -26,7 +25,6 @@ const dummyUuid = () => '123e4567-e89b-12d3-a456-' + (uuidNum++).toString().padS
 	)
 	await migrationsRunner.run(createLogger(new PrettyPrintLoggerHandler(process.stderr)))
 })().catch(e => {
-	// eslint-disable-next-line no-console
 	console.error(e)
 	process.exit(1)
 })

package/src/migrations/2018-08-02-174310-init.ts

@@ -58,6 +58,6 @@ CREATE TABLE "project_member" (
 CREATE UNIQUE INDEX project_member_project_id_person_id ON "project_member" ("project_id", "person_id");
 CREATE INDEX "project_member_person_id" ON "project_member" ("person_id");`
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2018-09-03-140621-identity-project.ts

@@ -27,6 +27,6 @@ ALTER TABLE "project_member"
   ALTER "identity_id" SET NOT NULL;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2018-10-26-165450-setup-api-key.ts

@@ -21,6 +21,6 @@ $BLOCK$
 $BLOCK$;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2018-10-26-175155-variables.ts

@@ -16,6 +16,6 @@ CREATE TABLE "project_member_variable" (
   CONSTRAINT project_member_variable_unique UNIQUE ("project_id", "identity_id", "variable")
 );
 `
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2019-02-18-110949-project-slug.ts

@@ -12,6 +12,6 @@ ALTER TABLE "project"
 	ALTER slug SET NOT NULL;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2019-02-18-160155-session-expiration.ts

@@ -5,6 +5,6 @@ ALTER TABLE "api_key"
 	ADD COLUMN expiration INT DEFAULT NULL;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2019-05-03-163729-api-key-disabled-at.ts

@@ -12,6 +12,6 @@ ALTER TABLE "api_key"
     DROP COLUMN "enabled";
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2019-08-14-153300-project-slug-unique.ts

@@ -5,6 +5,6 @@ CREATE UNIQUE INDEX "project_slug"
 	ON "project"("slug");
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2019-09-06-111000-membership.ts

@@ -45,6 +45,6 @@ INTO project_membership_variable(id, membership_id, variable, value)
     FROM data;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2019-09-06-111001-drop-old-member.ts

@@ -5,6 +5,6 @@ DROP TABLE project_member;
 DROP TABLE project_member_variable;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }

package/src/migrations/2020-01-29-idenity-note.ts

@@ -12,7 +12,6 @@ ALTER TABLE identity
 	ALTER created_at SET NOT NULL;
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }
-

package/src/migrations/2020-04-17-fix-person-index.ts

@@ -6,7 +6,6 @@ DROP INDEX "person_identity_id";
 CREATE INDEX "person_identity_id" ON "person" USING btree ("identity_id");
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }
-

package/src/migrations/2020-05-01-170000-api-key-index.ts

@@ -4,7 +4,6 @@ const sql = `
 CREATE UNIQUE INDEX api_key_token_hash ON api_key(token_hash)
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }
-

package/src/migrations/2020-06-08-134000-tenant-credentials.ts

@@ -2,6 +2,6 @@ import { MigrationBuilder } from '@contember/database-migrations'
 import { TenantMigrationArgs } from './types'
 import { createCredentials } from './tenantCredentials'
 
-export default async function (builder: MigrationBuilder, args: TenantMigrationArgs) {
+export default async function(builder: MigrationBuilder, args: TenantMigrationArgs) {
 	await createCredentials(builder, args)
 }

package/src/migrations/2020-08-07-110000-person-otp.ts

@@ -6,7 +6,6 @@ ALTER TABLE "person"
 	ADD COLUMN otp_activated_at TIMESTAMP DEFAULT NULL
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }
-

package/src/migrations/2020-08-17-162200-mail-templates.ts

@@ -17,6 +17,6 @@ CREATE INDEX mail_template_project_index
 	ON mail_template(project_id);
 `
 
-export default async function (builder: MigrationBuilder) {
+export default async function(builder: MigrationBuilder) {
 	builder.sql(sql)
 }