mirror of
https://github.com/wassname/talk.git
synced 2026-07-04 22:13:31 +08:00
fix to optional required param
This commit is contained in:
@@ -343,9 +343,7 @@ CONFIG.REDIS_CLIENT_CONFIG = JSON.parse(CONFIG.REDIS_CLIENT_CONFIG);
|
||||
*/
|
||||
CONFIG.RECAPTCHA_ENABLED =
|
||||
CONFIG.RECAPTCHA_SECRET &&
|
||||
CONFIG.RECAPTCHA_SECRET.length > 0 &&
|
||||
CONFIG.RECAPTCHA_PUBLIC &&
|
||||
CONFIG.RECAPTCHA_PUBLIC.length > 0;
|
||||
CONFIG.RECAPTCHA_PUBLIC;
|
||||
|
||||
debug(
|
||||
`reCAPTCHA is ${
|
||||
@@ -355,26 +353,4 @@ debug(
|
||||
}`
|
||||
);
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// SMTP Server configuration
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
CONFIG.EMAIL_ENABLED =
|
||||
CONFIG.SMTP_FROM_ADDRESS &&
|
||||
CONFIG.SMTP_FROM_ADDRESS.length > 0 &&
|
||||
CONFIG.SMTP_USERNAME &&
|
||||
CONFIG.SMTP_USERNAME.length > 0 &&
|
||||
CONFIG.SMTP_PASSWORD &&
|
||||
CONFIG.SMTP_PASSWORD.length > 0 &&
|
||||
CONFIG.SMTP_HOST &&
|
||||
CONFIG.SMTP_HOST.length > 0;
|
||||
|
||||
debug(
|
||||
`Email is ${
|
||||
CONFIG.EMAIL_ENABLED
|
||||
? 'enabled'
|
||||
: 'disabled, required config is not present'
|
||||
}`
|
||||
);
|
||||
|
||||
module.exports = CONFIG;
|
||||
|
||||
@@ -54,7 +54,6 @@ const mailer = {};
|
||||
mailer.enabled = Boolean(
|
||||
SMTP_HOST &&
|
||||
SMTP_USERNAME &&
|
||||
SMTP_PORT &&
|
||||
SMTP_PASSWORD &&
|
||||
SMTP_FROM_ADDRESS
|
||||
) || process.env.NODE_ENV === 'test';
|
||||
|
||||
Reference in New Issue
Block a user