BC-5907-fix problem with blocking the sending of specific e-mail doma…

…in parts
hpi-schul-cloud · Dec 15, 2023 · e72dd50 · e72dd50
1 parent 1f6ddc8
commit e72dd50
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/apps/server/src/infra/mail/interfaces/mail-config.ts b/apps/server/src/infra/mail/interfaces/mail-config.ts
@@ -1,3 +1,3 @@
 export interface MailConfig {
-	ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: string[];
+	BLOCKLIST_OF_EMAIL_DOMAINS: string[];
 }
diff --git a/apps/server/src/infra/mail/mail.service.ts b/apps/server/src/infra/mail/mail.service.ts
@@ -18,7 +18,7 @@ export class MailService {
 		@Inject('MAIL_SERVICE_OPTIONS') private readonly options: MailServiceOptions,
 		private readonly configService: ConfigService<MailConfig, true>
 	) {
-		this.domainBlacklist = this.configService.get<string[]>('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS');
+		this.domainBlacklist = this.configService.get<string[]>('BLOCKLIST_OF_EMAIL_DOMAINS');
 	}
 
 	public async send(data: Mail): Promise<void> {

diff --git a/apps/server/src/modules/server/server.config.ts b/apps/server/src/modules/server/server.config.ts
@@ -46,7 +46,7 @@ const config: ServerConfig = {
 	ADMIN_API__ALLOWED_API_KEYS: (Configuration.get('ADMIN_API__ALLOWED_API_KEYS') as string)
 		.split(',')
 		.map((apiKey) => apiKey.trim()),
-	ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: (Configuration.get('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS') as string)
+	BLOCKLIST_OF_EMAIL_DOMAINS: (Configuration.get('BLOCKLIST_OF_EMAIL_DOMAINS') as string)
 		.split(',')
 		.map((domain) => domain.trim()),
 };

diff --git a/config/default.schema.json b/config/default.schema.json
@@ -180,6 +180,11 @@
 			"default": "",
 			"description": "Add custom domain to the list of blocked domains (comma separated list)."
 		},
+		"BLOCKLIST_OF_EMAIL_DOMAINS":{
+			"type": "string",
+			"default": "",
+			"description": "Add custom domain to the list of blocked domains (comma separated list)."
+		},
 		"FEATURE_TSP_AUTO_CONSENT_ENABLED": {
 			"type": "boolean",
 			"default": false,