move middleware -> middlewares

src/server/crowi/express-init.js

@@ -18,7 +18,7 @@ module.exports = function(crowi, app) {
   const i18nSprintf = require('i18next-sprintf-postprocessor');
   const i18nMiddleware = require('i18next-express-middleware');
 
-  const registerSafeRedirect = require('../middleware/safe-redirect')();
+  const registerSafeRedirect = require('../middlewares/safe-redirect')();
 
   const avoidSessionRoutes = require('../routes/avoid-session-routes');
   const i18nUserSettingDetector = require('../util/i18nUserSettingDetector');

src/server/middleware/safe-redirect.js → src/server/middlewares/safe-redirect.js

@@ -1,7 +1,7 @@
 /**
  * Redirect with prevention from Open Redirect
  *
- * Usage: app.use(require('middleware/safe-redirect')(['example.com', 'some.example.com:8080']))
+ * Usage: app.use(require('middlewares/safe-redirect')(['example.com', 'some.example.com:8080']))
  */
 
 const loggerFactory = require('@alias/logger');

src/server/routes/apiv3/admin-home.js

@@ -41,8 +41,8 @@ const router = express.Router();
  */
 
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
 
   /**
    * @swagger

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

@@ -96,12 +96,12 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  */
 
 module.exports = (crowi) => {
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequired = require('../../middleware/login-required')(crowi);
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const validator = {
     appSetting: [

src/server/routes/apiv3/bookmarks.js

@@ -53,10 +53,10 @@ const router = express.Router();
  */
 
 module.exports = (crowi) => {
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequired = require('../../middleware/login-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const { Page, Bookmark } = crowi.models;
 

src/server/routes/apiv3/customize-setting.js

@@ -79,10 +79,10 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *            type: string
  */
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const { customizeService } = crowi;
 

src/server/routes/apiv3/export.js

@@ -38,10 +38,10 @@ const router = express.Router();
  */
 
 module.exports = (crowi) => {
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequired = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
 
   const { exportService } = crowi;
 

src/server/routes/apiv3/import.js

@@ -61,10 +61,10 @@ const generateOverwriteParams = (collectionName, req, options) => {
 
 module.exports = (crowi) => {
   const { growiBridgeService, importService } = crowi;
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequired = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
 
   this.adminEvent = crowi.event('admin');
 

src/server/routes/apiv3/markdown-setting.js

@@ -82,10 +82,10 @@ const validator = {
  */
 
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   /**
    * @swagger

src/server/routes/apiv3/notification-setting.js

@@ -102,10 +102,10 @@ const validator = {
  *              description: trigger events for notify
  */
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const UpdatePost = crowi.model('UpdatePost');
   const GlobalNotificationSetting = crowi.model('GlobalNotificationSetting');

src/server/routes/apiv3/page.js

@@ -111,10 +111,10 @@ const router = express.Router();
  *            description: boolean for like status
  */
 module.exports = (crowi) => {
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequired = require('../../middleware/login-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const globalNotificationService = crowi.getGlobalNotificationService();
   const { Page, GlobalNotificationSetting } = crowi.models;

src/server/routes/apiv3/pages.js

@@ -13,9 +13,9 @@ const router = express.Router();
  *    name: Pages
  */
 module.exports = (crowi) => {
-  const loginRequired = require('../../middleware/login-required')(crowi, true);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi, true);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
 
   const Page = crowi.model('Page');
 

src/server/routes/apiv3/personal-setting.js

@@ -63,10 +63,10 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *            type: string
  */
 module.exports = (crowi) => {
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const { User, ExternalAccount } = crowi.models;
 

src/server/routes/apiv3/search.js

@@ -17,11 +17,11 @@ const ErrorV3 = require('../../models/vo/error-apiv3');
  *    name: Search
  */
 module.exports = (crowi) => {
-  const accessTokenParser = require('../../middleware/access-token-parser')(crowi);
-  const loginRequired = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const accessTokenParser = require('../../middlewares/access-token-parser')(crowi);
+  const loginRequired = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   /**
    * @swagger

src/server/routes/apiv3/security-setting.js

@@ -287,10 +287,10 @@ const validator = {
  *            description: local account automatically linked the email matched
  */
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   /**
    * @swagger

src/server/routes/apiv3/user-group-relation.js

@@ -15,8 +15,8 @@ const router = express.Router();
  */
 
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
 
   const { UserGroup, UserGroupRelation } = crowi.models;
 

src/server/routes/apiv3/user-group.js

@@ -27,10 +27,10 @@ const { ObjectId } = mongoose.Types;
  */
 
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const {
     UserGroup,

src/server/routes/apiv3/users.js

@@ -65,10 +65,10 @@ const validator = {};
  */
 
 module.exports = (crowi) => {
-  const loginRequiredStrictly = require('../../middleware/login-required')(crowi);
-  const adminRequired = require('../../middleware/admin-required')(crowi);
-  const csrf = require('../../middleware/csrf')(crowi);
-  const apiV3FormValidator = require('../../middleware/apiv3-form-validator')(crowi);
+  const loginRequiredStrictly = require('../../middlewares/login-required')(crowi);
+  const adminRequired = require('../../middlewares/admin-required')(crowi);
+  const csrf = require('../../middlewares/csrf')(crowi);
+  const apiV3FormValidator = require('../../middlewares/apiv3-form-validator')(crowi);
 
   const {
     User,

src/server/routes/index.js

@@ -5,11 +5,11 @@ autoReap.options.reapOnError = true; // continue reaping the file even if an err
 
 module.exports = function(crowi, app) {
   const middlewares = require('../util/middlewares')(crowi, app);
-  const accessTokenParser = require('../middleware/access-token-parser')(crowi);
-  const loginRequiredStrictly = require('../middleware/login-required')(crowi);
-  const loginRequired = require('../middleware/login-required')(crowi, true);
-  const adminRequired = require('../middleware/admin-required')(crowi);
-  const csrf = require('../middleware/csrf')(crowi);
+  const accessTokenParser = require('../middlewares/access-token-parser')(crowi);
+  const loginRequiredStrictly = require('../middlewares/login-required')(crowi);
+  const loginRequired = require('../middlewares/login-required')(crowi, true);
+  const adminRequired = require('../middlewares/admin-required')(crowi);
+  const csrf = require('../middlewares/csrf')(crowi);
 
   const uploads = multer({ dest: `${crowi.tmpDir}uploads` });
   const form = require('../form');

src/server/util/middlewares.js

@@ -1,5 +1,5 @@
 // don't add any more middlewares to this file.
-// all new middlewares should be an independent file under /server/routes/middlewares
+// all new middlewares should be an independent file under /server/middlewares
 // eslint-disable-next-line no-unused-vars
 const logger = require('@alias/logger')('growi:lib:middlewares');
 

src/test/middleware/login-required.test.js → src/test/middlewares/login-required.test.js

@@ -9,8 +9,8 @@ describe('loginRequired', () => {
 
   beforeEach(async(done) => {
     crowi = await getInstance();
-    loginRequiredStrictly = require('@server/middleware/login-required')(crowi);
-    loginRequired = require('@server/middleware/login-required')(crowi, true);
+    loginRequiredStrictly = require('@server/middlewares/login-required')(crowi);
+    loginRequired = require('@server/middlewares/login-required')(crowi, true);
     done();
   });
 

src/test/middleware/safe-redirect.test.js → src/test/middlewares/safe-redirect.test.js

@@ -9,7 +9,7 @@ describe('safeRedirect', () => {
   ];
 
   beforeEach(async(done) => {
-    registerSafeRedirect = require('@server/middleware/safe-redirect')(whitelistOfHosts);
+    registerSafeRedirect = require('@server/middlewares/safe-redirect')(whitelistOfHosts);
     done();
   });