Explorar el Código

adjust initialize

itizawa hace 5 años
padre
commit
c4463a9654
Se han modificado 1 ficheros con 7 adiciones y 5 borrados
  1. 7 5
      src/server/routes/apiv3/app-settings.js

+ 7 - 5
src/server/routes/apiv3/app-settings.js

@@ -494,23 +494,25 @@ module.exports = (crowi) => {
   router.put('/ses-setting', loginRequiredStrictly, adminRequired, csrf, validator.sesSetting, apiV3FormValidator, async(req, res) => {
   router.put('/ses-setting', loginRequiredStrictly, adminRequired, csrf, validator.sesSetting, apiV3FormValidator, async(req, res) => {
     const { mailService } = crowi;
     const { mailService } = crowi;
 
 
-    await mailService.initialize();
-    mailService.publishUpdatedMessage();
-
     const requestSesSettingParams = {
     const requestSesSettingParams = {
       'mail:sesAccessKeyId': req.body.sesAccessKeyId,
       'mail:sesAccessKeyId': req.body.sesAccessKeyId,
       'mail:sesSecretAccessKey': req.body.sesSecretAccessKey,
       'mail:sesSecretAccessKey': req.body.sesSecretAccessKey,
     };
     };
 
 
+    let mailSettingParams;
     try {
     try {
-      const mailSettingParams = await updateMailSettinConfig(requestSesSettingParams);
-      return res.apiv3({ mailSettingParams });
+      mailSettingParams = await updateMailSettinConfig(requestSesSettingParams);
     }
     }
     catch (err) {
     catch (err) {
       const msg = 'Error occurred in updating ses setting';
       const msg = 'Error occurred in updating ses setting';
       logger.error('Error', err);
       logger.error('Error', err);
       return res.apiv3Err(new ErrorV3(msg, 'update-ses-setting-failed'));
       return res.apiv3Err(new ErrorV3(msg, 'update-ses-setting-failed'));
     }
     }
+
+    await mailService.initialize();
+    mailService.publishUpdatedMessage();
+
+    return res.apiv3({ mailSettingParams });
   });
   });
 
 
   /**
   /**