feat: support standalone mail smtp from field (#531)

* feat: support standalone mail smtp from field Signed-off-by: Bob Du <[email protected]> * chore: bump nodemailer Signed-off-by: Bob Du <[email protected]> --------- Signed-off-by: Bob Du <[email protected]>
chatgpt-web-dev · May 10, 2024 · 4824179 · 4824179
1 parent aaae763
commit 4824179
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 14 deletions.
diff --git a/service/package.json b/service/package.json
@@ -43,7 +43,7 @@
     "mongodb": "^5.9.2",
     "multer": "1.4.5-lts.1",
     "node-fetch": "^3.3.0",
-    "nodemailer": "^6.9.9",
+    "nodemailer": "^6.9.13",
     "request-ip": "^3.3.0",
     "socks-proxy-agent": "^7.0.0",
     "speakeasy": "^2.0.0",

diff --git a/service/pnpm-lock.yaml b/service/pnpm-lock.yaml
diff --git a/service/src/storage/config.ts b/service/src/storage/config.ts
@@ -54,7 +54,10 @@ export async function getOriginConfig() {
         !Number.isNaN(+process.env.SMTP_PORT) ? +process.env.SMTP_PORT : 465,
         process.env.SMTP_TSL === 'true',
         process.env.SMTP_USERNAME,
-        process.env.SMTP_PASSWORD))
+        process.env.SMTP_PASSWORD,
+        process.env.SMTP_FROM || process.env.SMTP_USERNAME,
+      ),
+    )
   }
   else {
     if (config.siteConfig.loginEnabled === undefined)

diff --git a/service/src/storage/model.ts b/service/src/storage/model.ts
@@ -223,6 +223,7 @@ export class MailConfig {
     public smtpTsl: boolean,
     public smtpUserName: string,
     public smtpPassword: string,
+    public smtpFrom?: string,
   ) { }
 }
 

diff --git a/service/src/utils/mail.ts b/service/src/utils/mail.ts
@@ -59,7 +59,7 @@ export async function sendTestMail(toMail: string, config: MailConfig) {
 
 async function sendMail(toMail: string, subject: string, html: string, config: MailConfig) {
   const mailOptions = {
-    from: config.smtpUserName,
+    from: config.smtpFrom || config.smtpUserName,
     to: toMail,
     subject,
     html,

diff --git a/src/components/common/Setting/Mail.vue b/src/components/common/Setting/Mail.vue
@@ -105,6 +105,15 @@ onMounted(() => {
             />
           </div>
         </div>
+        <div class="flex items-center space-x-4">
+          <span class="flex-shrink-0 w-[100px]">{{ $t('setting.smtpFrom') }}</span>
+          <div class="flex-1">
+            <NInput
+              :value="config && config.smtpFrom" placeholder=""
+              @input="(val) => { if (config) config.smtpFrom = val }"
+            />
+          </div>
+        </div>
         <div class="flex items-center space-x-4">
           <span class="flex-shrink-0 w-[100px]" />
           <div class="flex flex-wrap items-center gap-4">

diff --git a/src/components/common/Setting/model.ts b/src/components/common/Setting/model.ts
@@ -41,6 +41,7 @@ export class MailConfig {
   smtpTsl?: boolean
   smtpUserName?: string
   smtpPassword?: string
+  smtpFrom?: string
 }
 export type TextAuditServiceProvider = 'baidu' //  | 'ali'
 

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
@@ -128,6 +128,7 @@ export default {
     smtpTsl: 'Tsl',
     smtpUserName: 'UserName',
     smtpPassword: 'Password',
+    smtpFrom: 'From',
     siteTitle: 'Title',
     siteDomain: 'Domain',
     registerEnabled: 'Register Enabled',

diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
@@ -128,6 +128,7 @@ export default {
     smtpTsl: 'Tsl',
     smtpUserName: '账号',
     smtpPassword: '密码/专用密码',
+    smtpFrom: '发件人邮箱',
     siteTitle: '网站标题',
     siteDomain: '域名 不含/',
     registerEnabled: '新用户',