Merge branch 'imprv/refactor-validation-for-smtp' into imprv/add-transmission-method-radio

resource/locales/en_US/admin/admin.json

@@ -33,9 +33,6 @@
     "host": "Host",
     "port": "Port",
     "user": "User",
-    "initialize_mail_settings": "initialize e-mail settings",
-    "initialize_mail_modal_header": "Initialize e-mail settings",
-    "confirm_to_initialize_mail_settings": "You can't restore to the current settings. Are you sure you want to initialize e-mail settings?",
     "ses_settings":"SES settings",
     "test_connection": "Test connection to mail",
     "aws_settings": "AWS settings",

resource/locales/ja_JP/admin/admin.json

@@ -33,9 +33,6 @@
     "host": "ホスト",
     "port": "ポート",
     "user": "ユーザー",
-    "initialize_mail_settings": "設定を初期化",
-    "initialize_mail_modal_header": "メール設定の初期化",
-    "confirm_to_initialize_mail_settings": "一度初期化した設定は戻せません。本当に初期化しますか？",
     "ses_settings":"SES設定",
     "test_connection": "接続テスト",
     "aws_settings": "AWS設定",

resource/locales/zh_CN/admin/admin.json

@@ -33,9 +33,6 @@
 		"host": "服务器",
 		"port": "端口号",
 		"user": "用户名",
-    "initialize_mail_settings": "重置邮件设置",
-    "initialize_mail_modal_header": "重置邮件设置",
-    "confirm_to_initialize_mail_settings": "当前设置将被清空且不可恢复。确认重置？",
     "ses_settings":"SES设置",
     "test_connection": "Test connection to mail",
 		"aws_settings": "AWS设置",

src/client/js/services/AdminAppContainer.js

@@ -290,20 +290,6 @@ export default class AdminAppContainer extends Container {
     return mailSettingParams;
   }
 
-  /**
-   * Initialize smtp setting
-   * @memberOf AdminAppContainer
-   * @return {Array} Appearance
-   */
-  async initializeSmtpSettingHandler() {
-    const response = await this.appContainer.apiv3.delete('/app-settings/smtp-setting', {});
-    const {
-      mailSettingParams,
-    } = response.data;
-    this.setState(mailSettingParams);
-    return mailSettingParams;
-  }
-
   /**
    * Update AWS setting
    * @memberOf AdminAppContainer

src/server/routes/apiv3/app-settings.js

@@ -319,6 +319,12 @@ module.exports = (crowi) => {
    * validate mail setting send test mail
    */
   async function validateMailSetting(req) {
+
+    // check passes if there is at least one blank
+    if (Object.values(req.body).some(value => value === '')) {
+      return;
+    }
+
     const { configManager, mailService } = crowi;
     const fromAddress = configManager.getConfig('crowi', 'mail:from');
     if (fromAddress == null) {
@@ -515,41 +521,6 @@ module.exports = (crowi) => {
     return res.apiv3({ mailSettingParams });
   });
 
-  /**
-   * @swagger
-   *
-   *    /app-settings/smtp-setting:
-   *      delete:
-   *        tags: [AppSettings]
-   *        operationId: deleteAppSettingSmtpSetting
-   *        summary: /app-settings/smtp-setting
-   *        description: delete smtp setting
-   *        responses:
-   *          200:
-   *            description: Succeeded to delete smtp setting
-   *            content:
-   *              application/json:
-   *                schema:
-   *                  $ref: '#/components/schemas/SmtpSettingParams'
-   */
-  router.delete('/smtp-setting', loginRequiredStrictly, adminRequired, csrf, async(req, res) => {
-    const requestMailSettingParams = {
-      'mail:smtpHost': null,
-      'mail:smtpPort': null,
-      'mail:smtpUser': null,
-      'mail:smtpPassword': null,
-    };
-    try {
-      const mailSettingParams = await updateMailSettinConfig(requestMailSettingParams);
-      return res.apiv3({ mailSettingParams });
-    }
-    catch (err) {
-      const msg = 'Error occurred in initializing stmp setting';
-      logger.error('Error', err);
-      return res.apiv3Err(new ErrorV3(msg, 'initialize-smtpSetting-failed'));
-    }
-  });
-
   /**
    * @swagger
    *