@contember/engine-tenant-api 1.4.0-rc.2 → 1.4.0-rc.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-tenant-api",
-  "version": "1.4.0-rc.2",
+  "version": "1.4.0-rc.3",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -13,16 +13,16 @@
     "test": "vitest --dir ./tests/cases --no-threads"
   },
   "dependencies": {
-    "@contember/authorization": "1.4.0-rc.2",
-    "@contember/config-loader": "1.4.0-rc.2",
-    "@contember/database": "1.4.0-rc.2",
-    "@contember/database-migrations": "1.4.0-rc.2",
-    "@contember/dic": "1.4.0-rc.2",
-    "@contember/graphql-utils": "1.4.0-rc.2",
-    "@contember/logger": "1.4.0-rc.2",
-    "@contember/schema": "1.4.0-rc.2",
-    "@contember/schema-utils": "1.4.0-rc.2",
-    "@contember/typesafe": "1.4.0-rc.2",
+    "@contember/authorization": "1.4.0-rc.3",
+    "@contember/config-loader": "1.4.0-rc.3",
+    "@contember/database": "1.4.0-rc.3",
+    "@contember/database-migrations": "1.4.0-rc.3",
+    "@contember/dic": "1.4.0-rc.3",
+    "@contember/graphql-utils": "1.4.0-rc.3",
+    "@contember/logger": "1.4.0-rc.3",
+    "@contember/schema": "1.4.0-rc.3",
+    "@contember/schema-utils": "1.4.0-rc.3",
+    "@contember/typesafe": "1.4.0-rc.3",
     "@graphql-tools/utils": "^10.0.8",
     "graphql-tag": "^2.12.6",
     "jose": "^5.1.1",
@@ -32,7 +32,7 @@
     "otpauth": "^9.1.5"
   },
   "devDependencies": {
-    "@contember/database-tester": "1.4.0-rc.2",
+    "@contember/database-tester": "1.4.0-rc.3",
     "@graphql-codegen/cli": "^5.0.0",
     "@graphql-codegen/typescript": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.0.1",

package/src/TenantContainer.ts

@@ -78,6 +78,7 @@ import { IDPQueryResolver } from './resolvers/query/IDPQueryResolver'
 import { UpdateIDPMutationResolver } from './resolvers/mutation/idp/UpdateIDPMutationResolver'
 import { TenantCredentials, TenantMigrationsRunner } from './migrations'
 import { DisablePersonMutationResolver } from './resolvers/mutation/person/DisablePersonMutationResolver'
+import { MailTemplateQueryResolver } from './resolvers/query/MailTemplateQueryResolver'
 
 export interface TenantContainer {
 	projectMemberManager: ProjectMemberManager
@@ -217,6 +218,8 @@ export class TenantContainerFactory {
 				new ProjectQueryResolver(projectManager))
 			.addService('projectMembersQueryResolver', ({ projectManager, projectMemberManager }) =>
 				new ProjectMembersQueryResolver(projectManager, projectMemberManager))
+			.addService('mailTemplateQueryResolver', ({ mailTemplateManager }) =>
+				new MailTemplateQueryResolver(mailTemplateManager))
 			.addService('signUpMutationResolver', ({ signUpManager, apiKeyManager }) =>
 				new SignUpMutationResolver(signUpManager, apiKeyManager))
 			.addService('signInMutationResolver', ({ signInManager, signInResponseFactory }) =>

package/src/migrations/2024-06-20-140000-mail-reply.ts

@@ -0,0 +1,10 @@
+import { MigrationBuilder } from '@contember/database-migrations'
+
+const sql = `
+ALTER TABLE mail_template
+	ADD COLUMN reply_to TEXT;
+`
+
+export default async function (builder: MigrationBuilder) {
+	builder.sql(sql)
+}

package/src/migrations/runner.ts

@@ -36,6 +36,7 @@ import _20221108projectupdatenotification from './2022-11-08-project-update-noti
 import _20230120135500personemailnormalize from './2023-01-20-135500-person-email-normalize'
 import _20230603104000persondisabled from './2023-06-03-104000-person-disabled'
 import _20230901165000idpreturnconfig from './2023-09-01-165000-idp-return-config'
+import _20240620140000mailreply from './2024-06-20-140000-mail-reply'
 
 import snapshot from './snapshot'
 import { computeTokenHash, Providers } from '../model'
@@ -85,6 +86,7 @@ const migrations = {
 	'2023-01-20-135500-person-email-normalize': _20230120135500personemailnormalize,
 	'2023-06-03-104000-person-disabled': _20230603104000persondisabled,
 	'2023-09-01-165000-idp-return-config': _20230901165000idpreturnconfig,
+	'2024-06-20-140000-mail-reply': _20240620140000mailreply,
 }
 
 export class TenantMigrationsRunner {

package/src/migrations/snapshot.ts

@@ -64,7 +64,8 @@ CREATE TABLE "mail_template" (
     "variant" "text" NOT NULL,
     "subject" "text" NOT NULL,
     "content" "text" NOT NULL,
-    "use_layout" boolean NOT NULL
+    "use_layout" boolean NOT NULL,
+    "reply_to" "text"
 );
 CREATE TABLE "person" (
     "id" "uuid" NOT NULL,

package/src/model/authorization/PermissionActions.ts

@@ -54,6 +54,7 @@ namespace PermissionActions {
 
 	export const MAIL_TEMPLATE_ADD = Authorizator.createAction(Resources.mailTemplate, 'add')
 	export const MAIL_TEMPLATE_REMOVE = Authorizator.createAction(Resources.mailTemplate, 'remove')
+	export const MAIL_TEMPLATE_LIST = Authorizator.createAction(Resources.mailTemplate, 'list')
 
 	export const IDP_ADD = Authorizator.createAction(Resources.idp, 'add')
 	export const IDP_UPDATE = Authorizator.createAction(Resources.idp, 'update')

package/src/model/authorization/PermissionsFactory.ts

@@ -54,6 +54,7 @@ class PermissionsFactory {
 
 		permissions.allow(TenantRole.PROJECT_ADMIN, PermissionActions.MAIL_TEMPLATE_ADD)
 		permissions.allow(TenantRole.PROJECT_ADMIN, PermissionActions.MAIL_TEMPLATE_REMOVE)
+		permissions.allow(TenantRole.PROJECT_ADMIN, PermissionActions.MAIL_TEMPLATE_LIST)
 
 		permissions.allow(TenantRole.PROJECT_ADMIN, PermissionActions.IDP_ADD)
 		permissions.allow(TenantRole.PROJECT_ADMIN, PermissionActions.IDP_UPDATE)

package/src/model/commands/mailTemplate/AddMailTemplateCommand.ts

@@ -10,12 +10,13 @@ export class AddMailTemplateCommand implements Command<void> {
 			.into('mail_template')
 			.values({
 				id: providers.uuid(),
-				project_id: this.mailTemplate.projectId ?? null,
+				project_id: this.mailTemplate.projectId,
 				mail_type: this.mailTemplate.type,
 				variant: this.mailTemplate.variant,
 				subject: this.mailTemplate.subject,
 				content: this.mailTemplate.content,
 				use_layout: this.mailTemplate.useLayout,
+				reply_to: this.mailTemplate.replyTo,
 			})
 			.onConflict(ConflictActionType.update, this.mailTemplate.projectId ? {
 				columns: ['project_id', 'mail_type', 'variant'],
@@ -24,6 +25,7 @@ export class AddMailTemplateCommand implements Command<void> {
 				columns: ['mail_type', 'variant'],
 				where: it => it.isNull('project_id'),
 			}, {
+				reply_to: expr => expr.select(['excluded', 'reply_to']),
 				subject: expr => expr.select(['excluded', 'subject']),
 				content: expr => expr.select(['excluded', 'content']),
 				use_layout: expr => expr.select(['excluded', 'use_layout']),

package/src/model/commands/mailTemplate/RemoveMailTemplateCommand.ts

@@ -10,7 +10,7 @@ export class RemoveMailTemplateCommand implements Command<boolean> {
 			(await DeleteBuilder.create()
 				.from('mail_template')
 				.where({
-					project_id: this.mailTemplateIdentifier.projectId ?? null,
+					project_id: this.mailTemplateIdentifier.projectId,
 					mail_type: this.mailTemplateIdentifier.type,
 					variant: this.mailTemplateIdentifier.variant,
 				})

package/src/model/mailing/UserMailer.ts

@@ -21,6 +21,7 @@ export class UserMailer {
 		const template = (await this.getCustomTemplate(dbContext, { type: MailType.newUserInvited, ...customMailOptions })) || {
 			subject: 'You have been invited to {{project}}',
 			content: NewUserInvited,
+			replyTo: null,
 		}
 		await this.sendTemplate(template, mailArguments)
 	}
@@ -33,6 +34,7 @@ export class UserMailer {
 		const template = (await this.getCustomTemplate(dbContext, { type: MailType.existingUserInvited, ...customMailOptions })) || {
 			subject: 'You have been invited to {{project}}',
 			content: ExistingUserInvited,
+			replyTo: null,
 		}
 		await this.sendTemplate(template, mailArguments)
 	}
@@ -40,17 +42,18 @@ export class UserMailer {
 	async sendPasswordResetEmail(
 		dbContext: DatabaseContext,
 		mailArguments: { email: string; token: string; project?: string; projectSlug?: string },
-		customMailOptions: { projectId?: string; variant: string },
+		customMailOptions: { projectId: string | null; variant: string },
 	): Promise<void> {
 		const template = (await this.getCustomTemplate(dbContext, { type: MailType.passwordReset, ...customMailOptions })) || {
 			subject: 'Password reset',
 			content: PasswordReset,
+			replyTo: null,
 		}
 		await this.sendTemplate(template, mailArguments)
 	}
 
 	private async sendTemplate(
-		template: Pick<MailTemplateData, 'subject' | 'content'>,
+		template: Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'>,
 		mailArguments: Record<string, any>,
 	) {
 		const html = await this.templateRenderer.render(template.content, mailArguments)
@@ -58,21 +61,24 @@ export class UserMailer {
 			to: mailArguments.email,
 			subject: await this.templateRenderer.render(template.subject, mailArguments),
 			html,
+			...(template.replyTo ? {
+				replyTo: template.replyTo,
+			} : {}),
 		})
 	}
 
 	private async getCustomTemplate(
 		dbContext: DatabaseContext,
 		identifier: MailTemplateIdentifier,
-	): Promise<Pick<MailTemplateData, 'subject' | 'content'> | null> {
+	): Promise<Pick<MailTemplateData, 'subject' | 'content' | 'replyTo'> | null> {
 		const customTemplate =
 			(await dbContext.queryHandler.fetch(new MailTemplateQuery(identifier)))
-			?? (await dbContext.queryHandler.fetch(new MailTemplateQuery({ ...identifier, projectId: undefined })))
+			?? (await dbContext.queryHandler.fetch(new MailTemplateQuery({ ...identifier, projectId: null })))
 
 		if (!customTemplate) {
 			return null
 		}
 		const content = customTemplate.useLayout ? Layout(customTemplate.content) : customTemplate.content
-		return { content, subject: customTemplate.subject }
+		return { content, subject: customTemplate.subject, replyTo: customTemplate.replyTo }
 	}
 }

package/src/model/mailing/type.ts

@@ -1,11 +1,29 @@
+import { MailType as SchemaMailType } from '../../schema'
+
 export enum MailType {
 	existingUserInvited = 'existingUserInvited',
 	newUserInvited = 'newUserInvited',
 	passwordReset = 'passwordReset',
 }
 
+export const mailTypeFromSchemaToDb = (type: SchemaMailType): MailType => {
+	return {
+		EXISTING_USER_INVITED: MailType.existingUserInvited,
+		NEW_USER_INVITED: MailType.newUserInvited,
+		RESET_PASSWORD_REQUEST: MailType.passwordReset,
+	}[type]
+}
+
+export const mailTypeFromDbToSchema = (type: MailType): SchemaMailType => {
+	return {
+		[MailType.existingUserInvited]: 'EXISTING_USER_INVITED' as const,
+		[MailType.newUserInvited]: 'NEW_USER_INVITED' as const,
+		[MailType.passwordReset]: 'RESET_PASSWORD_REQUEST' as const,
+	}[type]
+}
+
 export interface MailTemplateIdentifier {
-	projectId?: string
+	projectId: string | null
 	type: MailType
 	variant: string
 }
@@ -14,6 +32,7 @@ export interface MailTemplateData {
 	subject: string
 	content: string
 	useLayout: boolean
+	replyTo: string | null
 }
 
 export interface MailTemplate extends MailTemplateIdentifier, MailTemplateData {}

package/src/model/queries/mailTemplate/MailTemplateListQuery.ts

@@ -0,0 +1,16 @@
+import { DatabaseQuery, DatabaseQueryable } from '@contember/database'
+import { createMailTemplateQuery, MailTemplateRow } from './helpers'
+
+export type MailTemplateListRow =
+	& MailTemplateRow
+	& {
+		projectSlug: string | null
+	}
+export class MailTemplateListQuery extends DatabaseQuery<MailTemplateListRow[]> {
+	async fetch({ db }: DatabaseQueryable): Promise<MailTemplateListRow[]> {
+		return await createMailTemplateQuery<MailTemplateListRow>()
+			.leftJoin('project', undefined, expr => expr.columnsEq(['project', 'id'], ['mail_template', 'project_id']))
+			.select(['project', 'slug'], 'projectSlug')
+			.getResult(db)
+	}
+}

package/src/model/queries/mailTemplate/MailTemplateQuery.ts

@@ -1,22 +1,18 @@
-import { DatabaseQuery, DatabaseQueryable, SelectBuilder } from '@contember/database'
-import { MailTemplateData, MailTemplateIdentifier } from '../../mailing'
+import { DatabaseQuery, DatabaseQueryable } from '@contember/database'
+import { MailTemplateIdentifier } from '../../mailing'
+import { createMailTemplateQuery, MailTemplateRow } from './helpers'
 
-class MailTemplateQuery extends DatabaseQuery<MailTemplateQuery.Result> {
+export class MailTemplateQuery extends DatabaseQuery<MailTemplateRow | null> {
 	constructor(
 		private mailTemplateIdentifier: MailTemplateIdentifier,
 	) {
 		super()
 	}
 
-	async fetch({ db }: DatabaseQueryable): Promise<MailTemplateQuery.Result> {
-		const rows = await SelectBuilder.create<MailTemplateQuery.Row>()
-			.select('id')
-			.select('subject')
-			.select('content')
-			.select('use_layout', 'useLayout')
-			.from('mail_template')
+	async fetch({ db }: DatabaseQueryable): Promise<MailTemplateRow | null> {
+		const rows = await createMailTemplateQuery()
 			.where({
-				project_id: this.mailTemplateIdentifier.projectId ?? null,
+				project_id: this.mailTemplateIdentifier.projectId,
 				mail_type: this.mailTemplateIdentifier.type,
 				variant: this.mailTemplateIdentifier.variant,
 			})
@@ -25,12 +21,3 @@ class MailTemplateQuery extends DatabaseQuery<MailTemplateQuery.Result> {
 		return this.fetchOneOrNull(rows)
 	}
 }
-
-namespace MailTemplateQuery {
-	export type Row = {
-		readonly id: string
-	} & MailTemplateData
-	export type Result = null | Row
-}
-
-export { MailTemplateQuery }

package/src/model/queries/mailTemplate/helpers.ts

@@ -0,0 +1,20 @@
+import { SelectBuilder } from '@contember/database'
+import { MailTemplateData, MailTemplateIdentifier } from '../../mailing'
+
+export type MailTemplateRow =
+	& {
+		readonly id: string
+	}
+	& MailTemplateData
+	& MailTemplateIdentifier
+
+export const createMailTemplateQuery = <T extends MailTemplateRow>() => SelectBuilder.create<T>()
+	.select(['mail_template', 'id'])
+	.select('subject')
+	.select('content')
+	.select('use_layout', 'useLayout')
+	.select('reply_to', 'replyTo')
+	.select('project_id', 'projectId')
+	.select('mail_type', 'type')
+	.select('variant')
+	.from('mail_template')

package/src/model/queries/mailTemplate/index.ts

@@ -1 +1,2 @@
 export * from './MailTemplateQuery'
+export * from './MailTemplateListQuery'

package/src/model/service/PasswordResetManager.ts

@@ -49,7 +49,7 @@ export class PasswordResetManager {
 			},
 			{
 				variant: mailOptions.mailVariant || '',
-				projectId: project?.id,
+				projectId: project?.id ?? null,
 			},
 		)
 	}

package/src/resolvers/ResolverFactory.ts

@@ -1,14 +1,18 @@
 import {
+	AddIDPMutationResolver,
 	AddProjectMemberMutationResolver,
-	ChangeProfileMutationResolver,
 	ChangePasswordMutationResolver,
+	ChangeProfileMutationResolver,
 	CreateApiKeyMutationResolver,
 	CreateProjectMutationResolver,
-	DisableApiKeyMutationResolver, DisableIDPMutationResolver, EnableIDPMutationResolver,
+	DisableApiKeyMutationResolver,
+	DisableIDPMutationResolver,
+	EnableIDPMutationResolver,
+	IdentityGlobalRolesMutationResolver,
 	IDPMutationResolver,
 	InviteMutationResolver,
 	MailTemplateMutationResolver,
-	OtpMutationResolver, AddIDPMutationResolver,
+	OtpMutationResolver,
 	RemoveProjectMemberMutationResolver,
 	ResetPasswordMutationResolver,
 	SetProjectSecretMutationResolver,
@@ -16,7 +20,7 @@ import {
 	SignOutMutationResolver,
 	SignUpMutationResolver,
 	UpdateProjectMemberMutationResolver,
-	UpdateProjectMutationResolver, IdentityGlobalRolesMutationResolver,
+	UpdateProjectMutationResolver,
 } from './mutation'
 
 import { Resolvers } from '../schema'
@@ -26,7 +30,7 @@ import { DateTimeType, JSONType } from '@contember/graphql-utils'
 import { IDPQueryResolver } from './query/IDPQueryResolver'
 import { UpdateIDPMutationResolver } from './mutation/idp/UpdateIDPMutationResolver'
 import { DisablePersonMutationResolver } from './mutation/person/DisablePersonMutationResolver'
-import { } from './mutation/person/ChangeProfileMutationResolver'
+import { MailTemplateQueryResolver } from './query/MailTemplateQueryResolver'
 
 class ResolverFactory {
 	public constructor(
@@ -36,6 +40,7 @@ class ResolverFactory {
 			projectQueryResolver: ProjectQueryResolver
 			projectMembersQueryResolver: ProjectMembersQueryResolver
 			idpQueryResolver: IDPQueryResolver
+			mailTemplateQueryResolver: MailTemplateQueryResolver
 
 			signUpMutationResolver: SignUpMutationResolver
 			signInMutationResolver: SignInMutationResolver
@@ -96,6 +101,7 @@ class ResolverFactory {
 				projects: this.resolvers.projectQueryResolver.projects.bind(this.resolvers.projectQueryResolver),
 				projectMemberships: this.resolvers.projectMembersQueryResolver.projectMemberships.bind(this.resolvers.projectMembersQueryResolver),
 				identityProviders: this.resolvers.idpQueryResolver.identityProviders.bind(this.resolvers.idpQueryResolver),
+				mailTemplates: this.resolvers.mailTemplateQueryResolver.mailTemplates.bind(this.resolvers.mailTemplateQueryResolver),
 				checkResetPasswordToken: () => {
 					throw new Error('not implemented')
 				},

package/src/resolvers/mutation/mailTemplates/MailTemplateMutationResolver.ts

@@ -1,16 +1,14 @@
 import {
-	AddMailTemplateErrorCode,
 	AddMailTemplateResponse,
-	MailType as SchemaMailType,
 	MutationAddProjectMailTemplateArgs,
 	MutationRemoveProjectMailTemplateArgs,
 	MutationResolvers,
-	RemoveMailTemplateErrorCode,
 	RemoveMailTemplateResponse,
 } from '../../../schema'
 import { TenantResolverContext } from '../../TenantResolverContext'
-import { MailTemplateManager, MailType, PermissionActions, ProjectManager } from '../../../model'
+import { MailTemplateManager, mailTypeFromSchemaToDb, PermissionActions, ProjectManager } from '../../../model'
 import { createErrorResponse, createProjectNotFoundResponse } from '../../errorUtils'
+import { validateEmail } from '../../../model/utils/email'
 
 export class MailTemplateMutationResolver implements MutationResolvers {
 	constructor(
@@ -20,7 +18,7 @@ export class MailTemplateMutationResolver implements MutationResolvers {
 
 	async addMailTemplate(
 		parent: any,
-		{ template: { content, projectSlug, subject, type, useLayout, variant } }: MutationAddProjectMailTemplateArgs,
+		{ template: { content, projectSlug, subject, type, useLayout, variant, replyTo } }: MutationAddProjectMailTemplateArgs,
 		context: TenantResolverContext,
 	): Promise<AddMailTemplateResponse> {
 		const project = projectSlug ? await this.projectManager.getProjectBySlug(context.db, projectSlug) : null
@@ -32,14 +30,18 @@ export class MailTemplateMutationResolver implements MutationResolvers {
 		if (projectSlug && !project) {
 			return createProjectNotFoundResponse('PROJECT_NOT_FOUND', projectSlug)
 		}
+		if (replyTo && !validateEmail(replyTo)) {
+			return createErrorResponse('INVALID_REPLY_EMAIL_FORMAT', 'Reply-to email address is not in a valid format')
+		}
 
 		await this.mailTemplateManager.addMailTemplate(context.db, {
 			content,
-			projectId: project?.id,
+			projectId: project?.id ?? null,
 			subject,
 			useLayout: typeof useLayout === 'boolean' ? useLayout : true,
 			variant: variant || '',
-			type: this.mapMailType(type),
+			type: mailTypeFromSchemaToDb(type),
+			replyTo: replyTo?.trim() || null,
 		})
 
 		return {
@@ -64,9 +66,9 @@ export class MailTemplateMutationResolver implements MutationResolvers {
 		}
 
 		const removed = await this.mailTemplateManager.removeMailTemplate(context.db, {
-			projectId: project?.id,
+			projectId: project?.id ?? null,
 			variant: variant || '',
-			type: this.mapMailType(type),
+			type: mailTypeFromSchemaToDb(type),
 		})
 		if (!removed) {
 			return createErrorResponse('PROJECT_NOT_FOUND', 'Mail template not found')
@@ -77,12 +79,4 @@ export class MailTemplateMutationResolver implements MutationResolvers {
 			errors: [],
 		}
 	}
-
-	private mapMailType(type: SchemaMailType): MailType {
-		return {
-			EXISTING_USER_INVITED: MailType.existingUserInvited,
-			NEW_USER_INVITED: MailType.newUserInvited,
-			RESET_PASSWORD_REQUEST: MailType.passwordReset,
-		}[type]
-	}
 }

package/src/resolvers/query/MailTemplateQueryResolver.ts

@@ -0,0 +1,23 @@
+import { MailTemplateData, QueryResolvers } from '../../schema'
+import { MailTemplateListQuery, MailTemplateManager, mailTypeFromDbToSchema, PermissionActions } from '../../model'
+import { TenantResolverContext } from '../TenantResolverContext'
+
+export class MailTemplateQueryResolver implements QueryResolvers {
+
+	constructor(
+		private readonly mailTemplateManager: MailTemplateManager,
+	) {
+	}
+
+	async mailTemplates(parent: unknown, args: unknown, context: TenantResolverContext): Promise<MailTemplateData[]> {
+		await context.requireAccess({
+			action: PermissionActions.IDP_LIST,
+			message: 'You are not allowed to list IDP',
+		})
+		return (await context.db.queryHandler.fetch(new MailTemplateListQuery())).map(it => ({
+			...it,
+			variant: it.variant || null,
+			type: mailTypeFromDbToSchema(it.type),
+		}))
+	}
+}

package/src/schema/index.ts

@@ -66,6 +66,7 @@ export type AddMailTemplateError = {
 }
 
 export type AddMailTemplateErrorCode =
+  | 'INVALID_REPLY_EMAIL_FORMAT'
   | 'MISSING_VARIABLE'
   | 'PROJECT_NOT_FOUND'
 
@@ -517,6 +518,7 @@ export type InviteResult = {
 export type MailTemplate = {
 	readonly content: Scalars['String']['input']
 	readonly projectSlug?: InputMaybe<Scalars['String']['input']>
+	readonly replyTo?: InputMaybe<Scalars['String']['input']>
 	readonly subject: Scalars['String']['input']
 	readonly type: MailType
 	readonly useLayout?: InputMaybe<Scalars['Boolean']['input']>
@@ -524,6 +526,17 @@ export type MailTemplate = {
 	readonly variant?: InputMaybe<Scalars['String']['input']>
 }
 
+export type MailTemplateData = {
+	readonly __typename?: 'MailTemplateData'
+	readonly content: Scalars['String']['output']
+	readonly projectSlug?: Maybe<Scalars['String']['output']>
+	readonly replyTo?: Maybe<Scalars['String']['output']>
+	readonly subject: Scalars['String']['output']
+	readonly type: MailType
+	readonly useLayout: Scalars['Boolean']['output']
+	readonly variant?: Maybe<Scalars['String']['output']>
+}
+
 export type MailTemplateIdentifier = {
 	readonly projectSlug?: InputMaybe<Scalars['String']['input']>
 	readonly type: MailType
@@ -904,6 +917,7 @@ export type Query = {
 	readonly __typename?: 'Query'
 	readonly checkResetPasswordToken: CheckResetPasswordTokenCode
 	readonly identityProviders: ReadonlyArray<IdentityProvider>
+	readonly mailTemplates: ReadonlyArray<MailTemplateData>
 	readonly me: Identity
 	readonly personById?: Maybe<Person>
 	readonly projectBySlug?: Maybe<Project>
@@ -1397,6 +1411,7 @@ export type ResolversTypes = {
 	InviteResult: ResolverTypeWrapper<InviteResult>
 	Json: ResolverTypeWrapper<Scalars['Json']['output']>
 	MailTemplate: MailTemplate
+	MailTemplateData: ResolverTypeWrapper<MailTemplateData>
 	MailTemplateIdentifier: MailTemplateIdentifier
 	MailType: MailType
 	MemberType: MemberType
@@ -1530,6 +1545,7 @@ export type ResolversParentTypes = {
 	InviteResult: InviteResult
 	Json: Scalars['Json']['output']
 	MailTemplate: MailTemplate
+	MailTemplateData: MailTemplateData
 	MailTemplateIdentifier: MailTemplateIdentifier
 	Membership: Membership
 	MembershipInput: MembershipInput
@@ -1945,6 +1961,17 @@ export interface JsonScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes
 	name: 'Json'
 }
 
+export type MailTemplateDataResolvers<ContextType = any, ParentType extends ResolversParentTypes['MailTemplateData'] = ResolversParentTypes['MailTemplateData']> = {
+	content?: Resolver<ResolversTypes['String'], ParentType, ContextType>
+	projectSlug?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
+	replyTo?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
+	subject?: Resolver<ResolversTypes['String'], ParentType, ContextType>
+	type?: Resolver<ResolversTypes['MailType'], ParentType, ContextType>
+	useLayout?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>
+	variant?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>
+	__isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>
+}
+
 export type MembershipResolvers<ContextType = any, ParentType extends ResolversParentTypes['Membership'] = ResolversParentTypes['Membership']> = {
 	role?: Resolver<ResolversTypes['String'], ParentType, ContextType>
 	variables?: Resolver<ReadonlyArray<ResolversTypes['VariableEntry']>, ParentType, ContextType>
@@ -2037,6 +2064,7 @@ export type ProjectIdentityRelationResolvers<ContextType = any, ParentType exten
 export type QueryResolvers<ContextType = any, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
 	checkResetPasswordToken?: Resolver<ResolversTypes['CheckResetPasswordTokenCode'], ParentType, ContextType, RequireFields<QueryCheckResetPasswordTokenArgs, 'requestId' | 'token'>>
 	identityProviders?: Resolver<ReadonlyArray<ResolversTypes['IdentityProvider']>, ParentType, ContextType>
+	mailTemplates?: Resolver<ReadonlyArray<ResolversTypes['MailTemplateData']>, ParentType, ContextType>
 	me?: Resolver<ResolversTypes['Identity'], ParentType, ContextType>
 	personById?: Resolver<Maybe<ResolversTypes['Person']>, ParentType, ContextType, RequireFields<QueryPersonByIdArgs, 'id'>>
 	projectBySlug?: Resolver<Maybe<ResolversTypes['Project']>, ParentType, ContextType, RequireFields<QueryProjectBySlugArgs, 'slug'>>
@@ -2321,6 +2349,7 @@ export type Resolvers<ContextType = any> = {
 	InviteResponse?: InviteResponseResolvers<ContextType>
 	InviteResult?: InviteResultResolvers<ContextType>
 	Json?: GraphQLScalarType
+	MailTemplateData?: MailTemplateDataResolvers<ContextType>
 	Membership?: MembershipResolvers<ContextType>
 	MembershipValidationError?: MembershipValidationErrorResolvers<ContextType>
 	Mutation?: MutationResolvers<ContextType>

package/src/schema/tenant.graphql.ts

@@ -19,6 +19,7 @@ const schema: DocumentNode = gql`
 		checkResetPasswordToken(requestId: String!, token: String!): CheckResetPasswordTokenCode!
 
 		identityProviders: [IdentityProvider!]!
+		mailTemplates: [MailTemplateData!]!
 	}
 
 	type Mutation {
@@ -808,7 +809,17 @@ const schema: DocumentNode = gql`
 	}
 
 	# === mails ===
-
+	
+    type MailTemplateData {
+        projectSlug: String
+        type: MailType!
+        variant: String
+        subject: String!
+        content: String!
+        useLayout: Boolean!
+        replyTo: String
+    }
+	
 	input MailTemplate {
 		projectSlug: String
 		type: MailType!
@@ -817,6 +828,7 @@ const schema: DocumentNode = gql`
 		subject: String!
 		content: String!
 		useLayout: Boolean
+		replyTo: String
 	}
 
 	enum MailType {
@@ -846,6 +858,7 @@ const schema: DocumentNode = gql`
 	enum AddMailTemplateErrorCode {
 		MISSING_VARIABLE
 		PROJECT_NOT_FOUND
+        INVALID_REPLY_EMAIL_FORMAT
 	}
 
 	type RemoveMailTemplateResponse {

package/tests/cases/integration/mocked/sql/getMailTemplateSql.ts

@@ -3,7 +3,7 @@ import { ExpectedQuery } from '@contember/database-tester'
 export const getMailTemplateSql = (
 	args: { type: string; projectId: string | null },
 ): ExpectedQuery => args.projectId ? {
-	sql: `SELECT "id", "subject", "content", "use_layout" AS "uselayout"
+	sql: `select "mail_template"."id", "subject", "content", "use_layout" as "useLayout", "reply_to" as "replyTo", "project_id" as "projectId", "mail_type" as "type", "variant"
 			  FROM "tenant"."mail_template"
 			  WHERE "project_id" = ?
 				AND "mail_type" = ?
@@ -14,7 +14,7 @@ export const getMailTemplateSql = (
 	},
 } :
 	{
-		sql: `SELECT "id", "subject", "content", "use_layout" AS "uselayout"
+		sql: `select "mail_template"."id", "subject", "content", "use_layout" as "useLayout", "reply_to" as "replyTo", "project_id" as "projectId", "mail_type" as "type", "variant"
 			  FROM "tenant"."mail_template"
 			  WHERE "project_id" IS NULL
 				AND "mail_type" = ?