From 4796336142784f06bbdd5e26221468f9437d7ce4 Mon Sep 17 00:00:00 2001 From: Szymon Szafoni Date: Tue, 17 Oct 2023 10:45:51 +0200 Subject: [PATCH] add new variable for piplines to pass --- apps/server/src/shared/infra/mail/mail.service.ts | 2 +- config/default.schema.json | 6 +++++- config/development.json | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/server/src/shared/infra/mail/mail.service.ts b/apps/server/src/shared/infra/mail/mail.service.ts index fee26ccc14a..396be0106b0 100644 --- a/apps/server/src/shared/infra/mail/mail.service.ts +++ b/apps/server/src/shared/infra/mail/mail.service.ts @@ -33,7 +33,7 @@ export class MailService { if (mails === undefined) { return mails; } - const domainBlockList = Configuration.get('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS') as string; + const domainBlockList = Configuration.get('BLACKLIST_OF_EMAIL_DOMAINS') as string; const domainBlockListArray = domainBlockList.split(',').map((domain) => domain.trim()); const notBlacklistedEmailsArray: string[] = []; diff --git a/config/default.schema.json b/config/default.schema.json index 7cfb0e26969..dab1ed31b5e 100644 --- a/config/default.schema.json +++ b/config/default.schema.json @@ -177,7 +177,6 @@ }, "ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS": { "type": "string", - "default":"schul-cloud.org", "description": "Add custom domain to the list of blocked domains (comma separated list)." }, "FEATURE_TSP_AUTO_CONSENT_ENABLED": { @@ -1010,6 +1009,11 @@ "default": "mail-drop", "description": "Routing key name for mail sending" }, + "BLACKLIST_OF_EMAIL_DOMAINS": { + "type": "string", + "default":"schul-cloud.org", + "description": "Add domain to the list of blocked domains (comma separated list)." + }, "MEMORY_INTERVAL_TIME": { "type": "integer", "default": 0, diff --git a/config/development.json b/config/development.json index 89bc1d88f60..d60d81d73c8 100644 --- a/config/development.json +++ b/config/development.json @@ -70,5 +70,6 @@ "FEATURE_COLUMN_BOARD_SUBMISSIONS_ENABLED": true, "FEATURE_COLUMN_BOARD_LINK_ELEMENT_ENABLED": true, "FEATURE_COLUMN_BOARD_EXTERNAL_TOOLS_ENABLED": true, - "ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS": "schul-cloud.org" + "BLACKLIST_OF_EMAIL_DOMAINS": "schul-cloud.org" + }