set login to routerForAdminAndAuth

packages/app/src/components/Navbar/PersonalDropdown.jsx

@@ -47,7 +47,7 @@ const PersonalDropdown = (props) => {
 
     try {
       appContainer.apiv3Post('/logout');
-      window.location.href = '/';
+      window.location.reload();
     }
     catch (err) {
       toastError(err);

packages/app/src/server/routes/apiv3/index.js

@@ -10,30 +10,31 @@ const logger = loggerFactory('growi:routes:apiv3'); // eslint-disable-line no-un
 const express = require('express');
 
 const router = express.Router();
-const routerForAdmin = express.Router();
+const routerForAdminAndAuth = express.Router();
 
 module.exports = (crowi) => {
 
   // add custom functions to express response
   require('./response')(express, crowi);
 
-  routerForAdmin.use('/healthcheck', require('./healthcheck')(crowi));
+  routerForAdminAndAuth.use('/healthcheck', require('./healthcheck')(crowi));
 
   // admin
-  routerForAdmin.use('/admin-home', require('./admin-home')(crowi));
-  routerForAdmin.use('/markdown-setting', require('./markdown-setting')(crowi));
-  routerForAdmin.use('/app-settings', require('./app-settings')(crowi));
-  routerForAdmin.use('/customize-setting', require('./customize-setting')(crowi));
-  routerForAdmin.use('/notification-setting', require('./notification-setting')(crowi));
-  routerForAdmin.use('/users', require('./users')(crowi));
-  routerForAdmin.use('/user-groups', require('./user-group')(crowi));
-  routerForAdmin.use('/export', require('./export')(crowi));
-  routerForAdmin.use('/import', require('./import')(crowi));
-  routerForAdmin.use('/search', require('./search')(crowi));
-  routerForAdmin.use('/security-setting', require('./security-setting')(crowi));
-  routerForAdmin.use('/mongo', require('./mongo')(crowi));
-  routerForAdmin.use('/slack-integration-settings', require('./slack-integration-settings')(crowi));
-  routerForAdmin.use('/slack-integration-legacy-settings', require('./slack-integration-legacy-settings')(crowi));
+  routerForAdminAndAuth.use('/admin-home', require('./admin-home')(crowi));
+  routerForAdminAndAuth.use('/markdown-setting', require('./markdown-setting')(crowi));
+  routerForAdminAndAuth.use('/app-settings', require('./app-settings')(crowi));
+  routerForAdminAndAuth.use('/customize-setting', require('./customize-setting')(crowi));
+  routerForAdminAndAuth.use('/notification-setting', require('./notification-setting')(crowi));
+  routerForAdminAndAuth.use('/users', require('./users')(crowi));
+  routerForAdminAndAuth.use('/user-groups', require('./user-group')(crowi));
+  routerForAdminAndAuth.use('/export', require('./export')(crowi));
+  routerForAdminAndAuth.use('/import', require('./import')(crowi));
+  routerForAdminAndAuth.use('/search', require('./search')(crowi));
+  routerForAdminAndAuth.use('/security-setting', require('./security-setting')(crowi));
+  routerForAdminAndAuth.use('/mongo', require('./mongo')(crowi));
+  routerForAdminAndAuth.use('/slack-integration-settings', require('./slack-integration-settings')(crowi));
+  routerForAdminAndAuth.use('/slack-integration-legacy-settings', require('./slack-integration-legacy-settings')(crowi));
+  routerForAdminAndAuth.use('/logout', require('./logout')(crowi));
 
 
   router.use('/in-app-notification', require('./in-app-notification')(crowi));
@@ -44,8 +45,6 @@ module.exports = (crowi) => {
 
   router.use('/statistics', require('./statistics')(crowi));
 
-  router.use('/logout', require('./logout')(crowi));
-
 
   router.use('/search', require('./search')(crowi));
 
@@ -78,5 +77,5 @@ module.exports = (crowi) => {
   router.use('/user-ui-settings', require('./user-ui-settings')(crowi));
 
 
-  return [router, routerForAdmin];
+  return [router, routerForAdminAndAuth];
 };

packages/app/src/server/routes/index.js

@@ -61,12 +61,12 @@ module.exports = function(crowi, app) {
 
   /* eslint-disable max-len, comma-spacing, no-multi-spaces */
 
-  const [apiV3Router, apiV3AdminRouter] = require('./apiv3')(crowi);
+  const [apiV3Router, apiV3AdminAndAuth] = require('./apiv3')(crowi);
 
   app.use('/api-docs', require('./apiv3/docs')(crowi));
 
   // API v3 for admin
-  app.use('/_api/v3', apiV3AdminRouter);
+  app.use('/_api/v3', apiV3AdminAndAuth);
 
   app.get('/'                         , applicationInstalled, unavailableWhenMaintenanceMode, loginRequired, autoReconnectToSearch, injectUserUISettings, page.showTopPage);
 
@@ -75,6 +75,7 @@ module.exports = function(crowi, app) {
   app.get('/login/invited'            , applicationInstalled, login.invited);
   app.post('/login/activateInvited'   , apiLimiter , applicationInstalled, loginFormValidator.inviteRules(), loginFormValidator.inviteValidation, csrf, login.invited);
   app.post('/login'                   , apiLimiter , applicationInstalled, loginFormValidator.loginRules(), loginFormValidator.loginValidation, csrf, loginPassport.loginWithLocal, loginPassport.loginWithLdap, loginPassport.loginFailure);
+  app.post('/login'                   , apiLimiter , applicationInstalled, loginFormValidator.loginRules(), loginFormValidator.loginValidation, csrf, loginPassport.loginWithLocal, loginPassport.loginWithLdap, loginPassport.loginFailure);
 
   app.post('/register'                , apiLimiter , applicationInstalled, registerFormValidator.registerRules(), registerFormValidator.registerValidation, csrf, login.register);
   app.get('/register'                 , applicationInstalled, login.preLogin, login.register);

packages/app/src/server/views/maintenance-mode.html

@@ -20,11 +20,10 @@
  {% endblock %}
 
  <script>
-  // function buttonClick(){alert('Click');}
-//   document.getElementById('maintanounse-mode-logout').addEventListener('click', ()=>{
-//     consoel.log('aaaaai')
-//     location.reload();
-// }, false);
+  document.getElementById('maintanounse-mode-logout').addEventListener('click', ()=>{
+    console.log('aaaaai')
+    location.reload();
+}, false);
   </script>
 
 {% block layout_main %}