itizawa 5 лет назад
Родитель
Сommit
1cda9fcafa
2 измененных файлов с 6 добавлено и 49 удалено
  1. 0 14
      src/client/js/services/AdminAppContainer.js
  2. 6 35
      src/server/routes/apiv3/app-settings.js

+ 0 - 14
src/client/js/services/AdminAppContainer.js

@@ -278,20 +278,6 @@ export default class AdminAppContainer extends Container {
     return mailSettingParams;
     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
    * Update AWS setting
    * @memberOf AdminAppContainer
    * @memberOf AdminAppContainer

+ 6 - 35
src/server/routes/apiv3/app-settings.js

@@ -314,6 +314,12 @@ module.exports = (crowi) => {
    * validate mail setting send test mail
    * validate mail setting send test mail
    */
    */
   async function validateMailSetting(req) {
   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 { configManager, mailService } = crowi;
     const fromAddress = configManager.getConfig('crowi', 'mail:from');
     const fromAddress = configManager.getConfig('crowi', 'mail:from');
     if (fromAddress == null) {
     if (fromAddress == null) {
@@ -499,41 +505,6 @@ module.exports = (crowi) => {
     }
     }
   });
   });
 
 
-  /**
-   * @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
    * @swagger
    *
    *