BC-11237 - set 'from' field as required in Mail interface and configure fromEmailAddress in HelpdeskConfig (#6077)

Author: SevenWaysDP

apps/server/src/infra/mail/mail.interface.ts

@@ -40,7 +40,7 @@ export interface Mail {
 
 	recipients: string[];
 
-	from?: string;
+	from: string;
 
 	cc?: string[];
 

apps/server/src/infra/mail/mail.service.spec.ts

@@ -47,6 +47,7 @@ describe('MailService', () => {
 				const data: Mail = {
 					mail: { plainTextContent: 'content', subject: 'Test' },
 					recipients: ['test@schul-cloud.org'],
+					from: 'noreply@dbildungscloud.de',
 				};
 
 				const amqpConnectionSpy = jest.spyOn(amqpConnection, 'publish');
@@ -64,6 +65,7 @@ describe('MailService', () => {
 					cc: ['test@example.com', 'test5@schul-cloud.org', 'test6@schul-cloud.org'],
 					bcc: ['test7@schul-cloud.org', 'test@example2.com', 'test8@schul-cloud.org'],
 					replyTo: ['test@example3.com', 'test9@schul-cloud.org', 'test10@schul-cloud.org'],
+					from: 'noreply@dbildungscloud.de',
 				};
 
 				const amqpConnectionSpy = jest.spyOn(amqpConnection, 'publish');

apps/server/src/modules/helpdesk/domain/service/helpdesk.service.ts

@@ -23,7 +23,7 @@ export class HelpdeskService {
 		files?: Express.Multer.File[]
 	): Promise<void> {
 		const plainTextContent = TextFormatter.createProblemText(problem, userContext, userDevice);
-		await this.sendEmail(
+		await this.userSendEmailToSupport(
 			[this.config.problemEmailAddress],
 			problem.replyEmail,
 			problem.subject,
@@ -39,10 +39,16 @@ export class HelpdeskService {
 		files?: Express.Multer.File[]
 	): Promise<void> {
 		const plainTextContent = TextFormatter.createWishText(wish, userContext, userDevice);
-		await this.sendEmail([this.config.wishEmailAddress], wish.replyEmail, wish.subject, plainTextContent, files);
+		await this.userSendEmailToSupport(
+			[this.config.wishEmailAddress],
+			wish.replyEmail,
+			wish.subject,
+			plainTextContent,
+			files
+		);
 	}
 
-	private async sendEmail(
+	private async userSendEmailToSupport(
 		recipients: string[],
 		replyTo: string,
 		subject: string,
@@ -58,6 +64,7 @@ export class HelpdeskService {
 				attachments,
 			},
 			replyTo: [replyTo],
+			from: this.config.fromEmailAddress,
 		};
 
 		if (this.config.shouldSendEmail) {

apps/server/src/modules/helpdesk/helpdesk-config.ts

@@ -17,4 +17,8 @@ export class HelpdeskConfig {
 	@StringToBoolean()
 	@IsBoolean()
 	public shouldSendEmail = false;
+
+	@ConfigProperty('SMTP_SENDER')
+	@IsEmail()
+	public fromEmailAddress = 'noreply@dbildungscloud.de';
 }