diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/admin/views/instance.vue | 2 | ||||
| -rw-r--r-- | src/server/api/endpoints/i/update_email.ts | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 8609abf1e5..05de9b1c06 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -52,7 +52,7 @@ <ui-input v-model="smtpUser" :disabled="!enableEmail">{{ $t('smtp-user') }}</ui-input> <ui-input v-model="smtpPass" :disabled="!enableEmail">{{ $t('smtp-pass') }}</ui-input> </ui-horizon-group> - <ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-use-ssl') }}</ui-switch> + <ui-switch v-model="smtpSecure" :disabled="!enableEmail">{{ $t('smtp-secure') }}<span slot="desc">{{ $t('smtp-secure-info') }}</span></ui-switch> </section> <section> <header>summaly Proxy</header> diff --git a/src/server/api/endpoints/i/update_email.ts b/src/server/api/endpoints/i/update_email.ts index 0aa22b4d83..b5bff048cc 100644 --- a/src/server/api/endpoints/i/update_email.ts +++ b/src/server/api/endpoints/i/update_email.ts @@ -73,10 +73,11 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => { host: meta.smtpHost, port: meta.smtpPort, secure: meta.smtpSecure, - auth: { + ignoreTLS: true, + auth: meta.smtpUser != null ? { user: meta.smtpUser, pass: meta.smtpPass - } + } : undefined }); const link = `${config.url}/vefify-email/${code}`; |