set default value

hpi-schul-cloud · Oct 25, 2023 · da27ee2 · da27ee2
1 parent 7b24e77
commit da27ee2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/apps/server/src/modules/server/server.config.ts b/apps/server/src/modules/server/server.config.ts
@@ -41,9 +41,9 @@ const config: IServerConfig = {
 	FEATURE_IDENTITY_MANAGEMENT_ENABLED: Configuration.get('FEATURE_IDENTITY_MANAGEMENT_ENABLED') as boolean,
 	FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED: Configuration.get('FEATURE_IDENTITY_MANAGEMENT_STORE_ENABLED') as boolean,
 	FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED: Configuration.get('FEATURE_IDENTITY_MANAGEMENT_LOGIN_ENABLED') as boolean,
-	BLACKLISTED_DOMAINS: Configuration.has('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS')
-		? (Configuration.get('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS') as string).split(',').map((domain) => domain.trim())
-		: ([] as string[]),
+	ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: (Configuration.get('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS') as string)
+		.split(',')
+		.map((domain) => domain.trim()),
 };
 
 export const serverConfig = () => config;
diff --git a/apps/server/src/shared/infra/mail/interfaces/mail-config.ts b/apps/server/src/shared/infra/mail/interfaces/mail-config.ts
@@ -1,3 +1,3 @@
 export interface IMailConfig {
-	BLACKLISTED_DOMAINS: string[];
+	ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS: string[];
 }
diff --git a/apps/server/src/shared/infra/mail/mail.service.ts b/apps/server/src/shared/infra/mail/mail.service.ts
@@ -18,7 +18,7 @@ export class MailService {
 		@Inject('MAIL_SERVICE_OPTIONS') private readonly options: MailServiceOptions,
 		private readonly configService: ConfigService<IMailConfig, true>
 	) {
-		this.domainBlacklist = this.configService.get<string[]>('BLACKLISTED_DOMAINS');
+		this.domainBlacklist = this.configService.get<string[]>('ADDITIONAL_BLACKLISTED_EMAIL_DOMAINS');
 	}
 
 	public async send(data: Mail): Promise<void> {

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