rename appSettingsParams and join values

src/client/js/services/AdminAppContainer.js

@@ -60,16 +60,21 @@ export default class AdminAppContainer extends Container {
   async retrieveAppSettingsData() {
     try {
       const response = await this.appContainer.apiv3.get('/app-settings/');
-      const { appSettingParams } = response.data;
+      const { appSettingsParams } = response.data;
 
       this.setState({
-        title: appSettingParams.title,
-        confidential: appSettingParams.confidential,
-        globalLang: appSettingParams.globalLang,
-        fileUpload: appSettingParams.fileUpload,
-        siteUrl: appSettingParams.siteUrl,
-        envSiteUrl: appSettingParams.envSiteUrl,
-        isSetSiteUrl: !!appSettingParams.siteUrl,
+        title: appSettingsParams.title,
+        confidential: appSettingsParams.confidential,
+        globalLang: appSettingsParams.globalLang,
+        fileUpload: appSettingsParams.fileUpload,
+        siteUrl: appSettingsParams.siteUrl,
+        envSiteUrl: appSettingsParams.envSiteUrl,
+        isSetSiteUrl: !!appSettingsParams.siteUrl,
+        fromAddress: appSettingsParams.fromAddress,
+        smtpHost: appSettingsParams.smtpHost,
+        smtpPort: appSettingsParams.smtpPort,
+        smtpUser: appSettingsParams.smtpUser,
+        smtpPassword: appSettingsParams.smtpPassword,
       });
 
     }

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

@@ -108,7 +108,7 @@ module.exports = (crowi) => {
    *                      $ref: '#/components/schemas/AppSettingsParams'
    */
   router.get('/', accessTokenParser, loginRequired, adminRequired, async(req, res) => {
-    const appSettingParams = {
+    const appSettingsParams = {
       title: crowi.configManager.getConfig('crowi', 'app:title'),
       confidential: crowi.configManager.getConfig('crowi', 'app:confidential'),
       globalLang: crowi.configManager.getConfig('crowi', 'app:globalLang'),
@@ -121,7 +121,7 @@ module.exports = (crowi) => {
       smtpUser: crowi.configManager.getConfig('crowi', 'mail:smtpUser'),
       smtpPassword: crowi.configManager.getConfig('crowi', 'mail:smtpPassword'),
     };
-    return res.apiv3({ appSettingParams });
+    return res.apiv3({ appSettingsParams });
 
   });