Jelajahi Sumber

devide loginCheckerForPassport as injectCurrentuserToLocalvars

Yuki Takei 5 tahun lalu
induk
melakukan
162b80614c

+ 2 - 4
src/server/crowi/express-init.js

@@ -19,6 +19,7 @@ module.exports = function(crowi, app) {
   const i18nMiddleware = require('i18next-express-middleware');
 
   const registerSafeRedirect = require('../middlewares/safe-redirect')();
+  const injectCurrentuserToLocalvars = require('../middlewares/inject-currentuser-to-localvars')();
 
   const avoidSessionRoutes = require('../routes/avoid-session-routes');
   const i18nUserSettingDetector = require('../util/i18nUserSettingDetector');
@@ -115,15 +116,12 @@ module.exports = function(crowi, app) {
   app.use(flash());
 
   app.use(registerSafeRedirect);
+  app.use(injectCurrentuserToLocalvars);
 
   const middlewares = require('../util/middlewares')(crowi, app);
-
   app.use(middlewares.swigFilters(swig));
   app.use(middlewares.swigFunctions());
-
   app.use(middlewares.csrfKeyGenerator());
 
-  app.use(middlewares.loginCheckerForPassport);
-
   app.use(i18nMiddleware.handle(i18next));
 };

+ 6 - 0
src/server/middlewares/inject-currentuser-to-localvars.js

@@ -0,0 +1,6 @@
+module.exports = () => {
+  return (req, res, next) => {
+    res.locals.user = req.user;
+    next();
+  };
+};

+ 0 - 5
src/server/util/middlewares.js

@@ -25,11 +25,6 @@ module.exports = (crowi) => {
     };
   };
 
-  middlewares.loginCheckerForPassport = function(req, res, next) {
-    res.locals.user = req.user;
-    next();
-  };
-
   middlewares.swigFunctions = function() {
     return function(req, res, next) {
       require('../util/swigFunctions')(crowi, req, res.locals);