Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Rename smtp configuration keys

Hakan Shehub13be3c02453
diff --git a/apps/server/src/lib/configuration.ts b/apps/server/src/lib/configuration.ts
index ee697bb8..a59404ce 100644
--- a/apps/server/src/lib/configuration.ts
+++ b/apps/server/src/lib/configuration.ts
@@ -4,7 +4,7 @@ export interface Configuration {
redis: RedisConfiguration;
avatarS3: S3Configuration;
fileS3: S3Configuration;
- email: EmailConfiguration;
+ smtp: SmtpConfiguration;
ai: AiConfiguration;
}
@@ -35,12 +35,12 @@ export interface S3Configuration {
region: string;
}
-export interface EmailConfiguration {
+export interface SmtpConfiguration {
host: string;
port: number;
user: string;
password: string;
- from: string;
+ emailFrom: string;
}
export interface AiConfiguration {
@@ -109,12 +109,12 @@ export const configuration: Configuration = {
bucketName: getRequiredEnv('S3_FILES_BUCKET_NAME'),
region: getRequiredEnv('S3_FILES_REGION'),
},
- email: {
- host: getOptionalEnv('EMAIL_HOST') || '',
- port: parseInt(getOptionalEnv('EMAIL_PORT') || '587'),
- user: getOptionalEnv('EMAIL_USER') || '',
- password: getOptionalEnv('EMAIL_PASSWORD') || '',
- from: getOptionalEnv('EMAIL_FROM') || '',
+ smtp: {
+ host: getOptionalEnv('SMTP_HOST') || '',
+ port: parseInt(getOptionalEnv('SMTP_PORT') || '587'),
+ user: getOptionalEnv('SMTP_USER') || '',
+ password: getOptionalEnv('SMTP_PASSWORD') || '',
+ emailFrom: getOptionalEnv('SMTP_EMAIL_FROM') || '',
},
ai: {
enabled: getOptionalEnv('AI_ENABLED') === 'true',
diff --git a/apps/server/src/services/email-service.ts b/apps/server/src/services/email-service.ts
index a010b059..960c039d 100644
--- a/apps/server/src/services/email-service.ts
+++ b/apps/server/src/services/email-service.ts
@@ -16,22 +16,22 @@ class EmailService {
public async init() {
if (
- !configuration.email.host ||
- !configuration.email.port ||
- !configuration.email.user ||
- !configuration.email.password ||
- !configuration.email.from
+ !configuration.smtp.host ||
+ !configuration.smtp.port ||
+ !configuration.smtp.user ||
+ !configuration.smtp.password ||
+ !configuration.smtp.emailFrom
) {
throw new Error('SMTP configuration is missing');
}
this.transporter = nodemailer.createTransport({
- host: configuration.email.host,
- port: configuration.email.port,
+ host: configuration.smtp.host,
+ port: configuration.smtp.port,
secure: true,
auth: {
- user: configuration.email.user,
- pass: configuration.email.password,
+ user: configuration.smtp.user,
+ pass: configuration.smtp.password,
},
});
@@ -44,7 +44,7 @@ class EmailService {
}
await this.transporter.sendMail({
- from: configuration.email.from,
+ from: configuration.smtp.emailFrom,
...message,
});
}