refactor app-settings route

apps/app/src/client/services/AdminAppContainer.js

@@ -73,8 +73,6 @@ export default class AdminAppContainer extends Container {
       envAzureStorageAccountName: '',
       envAzureStorageContainerName: '',
 
-      isEnabledPlugins: true,
-
       isMaintenanceMode: false,
 
       // TODO: remove this property when bulk export can be relased for cloud (https://redmine.weseek.co.jp/issues/163220)
@@ -150,7 +148,6 @@ export default class AdminAppContainer extends Container {
       envAzureStorageAccountName: appSettingsParams.envAzureStorageAccountName,
       envAzureStorageContainerName: appSettingsParams.envAzureStorageContainerName,
 
-      isEnabledPlugins: appSettingsParams.isEnabledPlugins,
       isMaintenanceMode: appSettingsParams.isMaintenanceMode,
 
       // TODO: remove this property when bulk export can be relased for cloud (https://redmine.weseek.co.jp/issues/163220)

apps/app/src/interfaces/res/admin/app-settings.ts

@@ -53,8 +53,6 @@ export type IResAppSettings = {
   envAzureStorageAccountName: string;
   envAzureStorageContainerName: string;
 
-  isEnabledPlugins: boolean;
-
   isAppSiteUrlHashed: boolean;
 
   isMaintenanceMode: boolean;

apps/app/src/server/routes/apiv3/app-settings.js → apps/app/src/server/routes/apiv3/app-settings/index.ts

@@ -12,8 +12,8 @@ import { configManager } from '~/server/service/config-manager';
 import { getTranslation } from '~/server/service/i18next';
 import loggerFactory from '~/utils/logger';
 
-import { generateAddActivityMiddleware } from '../../middlewares/add-activity';
-import { apiV3FormValidator } from '../../middlewares/apiv3-form-validator';
+import { generateAddActivityMiddleware } from '../../../middlewares/add-activity';
+import { apiV3FormValidator } from '../../../middlewares/apiv3-form-validator';
 
 
 const logger = loggerFactory('growi:routes:apiv3:app-settings');
@@ -317,9 +317,9 @@ const router = express.Router();
  */
 /** @param {import('~/server/crowi').default} crowi Crowi instance */
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
-  const adminRequired = require('../../middlewares/admin-required')(crowi);
-  const addActivity = generateAddActivityMiddleware(crowi);
+  const loginRequiredStrictly = require('../../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../../middlewares/admin-required')(crowi);
+  const addActivity = generateAddActivityMiddleware();
 
   const activityEvent = crowi.event('activity');
 
@@ -475,8 +475,6 @@ module.exports = (crowi) => {
       envAzureStorageAccountName: configManager.getConfig('azure:storageAccountName', ConfigSource.env),
       envAzureStorageContainerName: configManager.getConfig('azure:storageContainerName', ConfigSource.env),
 
-      isEnabledPlugins: configManager.getConfig('plugin:isEnabledPlugins'),
-
       isMaintenanceMode: configManager.getConfig('app:isMaintenanceMode'),
 
       isBulkExportPagesEnabled: configManager.getConfig('app:isBulkExportPagesEnabled'),
@@ -652,7 +650,13 @@ module.exports = (crowi) => {
     const smtpUser = configManager.getConfig('mail:smtpUser');
     const smtpPassword = configManager.getConfig('mail:smtpPassword');
 
-    const option = {
+    // Define the option object with possible 'auth' and 'secure' properties
+    const option: {
+      host: string | undefined;
+      port: string | undefined;
+      auth?: { user: string; pass: string };
+      secure?: boolean;
+    } = {
       host: smtpHost,
       port: smtpPort,
     };
@@ -662,7 +666,7 @@ module.exports = (crowi) => {
         pass: smtpPassword,
       };
     }
-    if (option.port === 465) {
+    if (option.port === '465') {
       option.secure = true;
     }