kaori 4 лет назад
Родитель
Сommit
8700b0c66a
2 измененных файлов с 26 добавлено и 20 удалено
  1. 21 18
      packages/app/src/server/routes/apiv3/index.js
  2. 5 2
      packages/app/src/server/routes/index.js

+ 21 - 18
packages/app/src/server/routes/apiv3/index.js

@@ -10,31 +10,34 @@ const logger = loggerFactory('growi:routes:apiv3'); // eslint-disable-line no-un
 const express = require('express');
 const express = require('express');
 
 
 const router = express.Router();
 const router = express.Router();
-const routerForAdminAndAuth = express.Router();
+const routerForAdmin = express.Router();
+const routerForAuth = express.Router();
 
 
 module.exports = (crowi) => {
 module.exports = (crowi) => {
 
 
   // add custom functions to express response
   // add custom functions to express response
   require('./response')(express, crowi);
   require('./response')(express, crowi);
 
 
-  routerForAdminAndAuth.use('/healthcheck', require('./healthcheck')(crowi));
+  routerForAdmin.use('/healthcheck', require('./healthcheck')(crowi));
 
 
   // admin
   // admin
-  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));
+  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));
+
+  // auth
+  routerForAuth.use('/logout', require('./logout')(crowi));
 
 
 
 
   router.use('/in-app-notification', require('./in-app-notification')(crowi));
   router.use('/in-app-notification', require('./in-app-notification')(crowi));
@@ -77,5 +80,5 @@ module.exports = (crowi) => {
   router.use('/user-ui-settings', require('./user-ui-settings')(crowi));
   router.use('/user-ui-settings', require('./user-ui-settings')(crowi));
 
 
 
 
-  return [router, routerForAdminAndAuth];
+  return [router, routerForAdmin, routerForAuth];
 };
 };

+ 5 - 2
packages/app/src/server/routes/index.js

@@ -61,12 +61,15 @@ module.exports = function(crowi, app) {
 
 
   /* eslint-disable max-len, comma-spacing, no-multi-spaces */
   /* eslint-disable max-len, comma-spacing, no-multi-spaces */
 
 
-  const [apiV3Router, apiV3AdminAndAuth] = require('./apiv3')(crowi);
+  const [apiV3Router, apiV3AdminRouter, apiV3AuthRouter] = require('./apiv3')(crowi);
 
 
   app.use('/api-docs', require('./apiv3/docs')(crowi));
   app.use('/api-docs', require('./apiv3/docs')(crowi));
 
 
   // API v3 for admin
   // API v3 for admin
-  app.use('/_api/v3', apiV3AdminAndAuth);
+  app.use('/_api/v3', apiV3AdminRouter);
+
+  // API v3 for auth
+  app.use('/_api/v3', apiV3AuthRouter);
 
 
   app.get('/'                         , applicationInstalled, unavailableWhenMaintenanceMode, loginRequired, autoReconnectToSearch, injectUserUISettings, page.showTopPage);
   app.get('/'                         , applicationInstalled, unavailableWhenMaintenanceMode, loginRequired, autoReconnectToSearch, injectUserUISettings, page.showTopPage);