Просмотр исходного кода

- Remove unecessary comments and log output

Luqman Grune 4 лет назад
Родитель
Сommit
b5ab7335ee

+ 0 - 11
packages/app/src/server/middlewares/admin-required.js

@@ -4,19 +4,8 @@ const logger = loggerFactory('growi:middleware:admin-required');
 
 module.exports = (crowi, fallback = null) => {
 
-  // TODO: remove comment
-  // remove async, reflected from login-required.js, it doesn't use async
   return function(req, res, next) {
 
-    // TODO: Remove debug log
-    logger.warn('grune admin-required ran');
-    if (req.user != null) {
-      logger.warn('grune req.user 1');
-    }
-    else {
-      logger.warn('grune req.user 0');
-    }
-
     if (req.user != null && (req.user instanceof Object) && '_id' in req.user) {
       if (req.user.admin) {
         return next();

+ 1 - 20
packages/app/src/server/service/socket-io.js

@@ -23,8 +23,7 @@ class SocketIoService {
     return (this.io != null);
   }
 
-  // TODO: remove the comments
-  // Since the Order is important, I made attachServer() to async
+  // Since the Order is important, attachServer() should be async
   async attachServer(server) {
     this.io = socketIo(server, {
       transports: ['websocket'],
@@ -86,14 +85,6 @@ class SocketIoService {
 
     // convert Connect/Express middleware to Socket.io middleware
     this.io.use((socket, next) => {
-      // TODO: remove debug log
-      // The session of this middleware setup has no problem at all
-      if (socket.request.user != null) {
-        logger.warn('grune setupLoginRequiredMiddleware 1');
-      }
-      else {
-        logger.warn('grune setupLoginRequiredMiddleware 0');
-      }
       loginRequired(socket.request, {}, next);
     });
   }
@@ -108,16 +99,6 @@ class SocketIoService {
 
     // convert Connect/Express middleware to Socket.io middleware
     this.getAdminSocket().use((socket, next) => {
-
-      // TODO: remove debug log
-      // Check whether the the session shared well to namespace middleware
-      // This is the one of main problems, the socket.request always undefined
-      if (socket.request.user != null) {
-        logger.warn('grune setupAdminRequiredMiddleware 1');
-      }
-      else {
-        logger.warn('grune setupAdminRequiredMiddleware 0');
-      }
       adminRequired(socket.request, {}, next);
     });
   }