Shun Miyazawa 3 лет назад
Родитель
Сommit
f1d3f4f81f

+ 8 - 8
packages/app/src/server/middlewares/unavailable-when-maintenance-mode.ts

@@ -4,16 +4,16 @@ import loggerFactory from '~/utils/logger';
 
 const logger = loggerFactory('growi:middlewares:unavailable-when-maintenance-mode');
 
-export const generateUnavailableWhenMaintenanceModeMiddleware = crowi => async(req: Request, res: Response, next: NextFunction): Promise<void> => {
-  const isMaintenanceMode = crowi.appService.isMaintenanceMode();
+// export const generateUnavailableWhenMaintenanceModeMiddleware = crowi => async(req: Request, res: Response, next: NextFunction): Promise<void> => {
+//   const isMaintenanceMode = crowi.appService.isMaintenanceMode();
 
-  if (!isMaintenanceMode) {
-    next();
-    return;
-  }
+//   if (!isMaintenanceMode) {
+//     next();
+//     return;
+//   }
 
-  res.render('maintenance-mode');
-};
+//   res.render('maintenance-mode');
+// };
 
 export const generateUnavailableWhenMaintenanceModeMiddlewareForApi = crowi => async(req: Request, res: Response, next: NextFunction): Promise<void> => {
   const isMaintenanceMode = crowi.appService.isMaintenanceMode();

+ 4 - 6
packages/app/src/server/routes/index.js

@@ -7,9 +7,7 @@ import injectResetOrderByTokenMiddleware from '../middlewares/inject-reset-order
 import injectUserRegistrationOrderByTokenMiddleware from '../middlewares/inject-user-registration-order-by-token-middleware';
 import * as loginFormValidator from '../middlewares/login-form-validator';
 import * as registerFormValidator from '../middlewares/register-form-validator';
-import {
-  generateUnavailableWhenMaintenanceModeMiddleware, generateUnavailableWhenMaintenanceModeMiddlewareForApi,
-} from '../middlewares/unavailable-when-maintenance-mode';
+import { generateUnavailableWhenMaintenanceModeMiddlewareForApi } from '../middlewares/unavailable-when-maintenance-mode';
 
 import * as allInAppNotifications from './all-in-app-notifications';
 import * as forgotPassword from './forgot-password';
@@ -54,7 +52,7 @@ module.exports = function(crowi, app) {
 
   const next = nextFactory(crowi);
 
-  const unavailableWhenMaintenanceMode = generateUnavailableWhenMaintenanceModeMiddleware(crowi);
+  // const unavailableWhenMaintenanceMode = generateUnavailableWhenMaintenanceModeMiddleware(crowi);
   const unavailableWhenMaintenanceModeForApi = generateUnavailableWhenMaintenanceModeMiddlewareForApi(crowi);
 
   const isInstalled = crowi.configManager.getConfig('crowi', 'app:installed');
@@ -76,7 +74,7 @@ module.exports = function(crowi, app) {
 
   app.get('/_next/*'                  , next.delegateToNext);
 
-  app.get('/'                         , applicationInstalled, unavailableWhenMaintenanceMode, loginRequired, autoReconnectToSearch, next.delegateToNext);
+  app.get('/'                         , applicationInstalled, loginRequired, autoReconnectToSearch, next.delegateToNext);
 
   app.get('/login/error/:reason'      , applicationInstalled, login.error);
   app.get('/login'                    , applicationInstalled, login.preLogin, next.delegateToNext);
@@ -202,7 +200,7 @@ module.exports = function(crowi, app) {
   // API v1
   app.use('/_api', unavailableWhenMaintenanceModeForApi, apiV1Router);
 
-  app.use(unavailableWhenMaintenanceMode);
+  // app.use(unavailableWhenMaintenanceMode);
 
   // app.get('/tags'                     , loginRequired, tag.showPage);
   app.get('/tags', loginRequired, next.delegateToNext);