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

Fix: GC-1352 - guest user can't search

Yuki Takei 7 лет назад
Родитель
Сommit
24687ff8d6
2 измененных файлов с 5 добавлено и 7 удалено
  1. 4 3
      src/server/routes/page.js
  2. 1 4
      src/server/util/middlewares.js

+ 4 - 3
src/server/routes/page.js

@@ -684,6 +684,7 @@ module.exports = function(crowi, app) {
    * @apiParam {String} page_id Page Id.
    */
   api.seen = async function(req, res) {
+    const user = req.user;
     const pageId = req.body.page_id;
     if (!pageId) {
       return res.json(ApiResponse.error('page_id required'));
@@ -694,9 +695,9 @@ module.exports = function(crowi, app) {
 
     let page;
     try {
-      page = await Page.findByIdAndViewer(pageId, req.user);
-      if (req.user != null) {
-        page = await page.seen(req.user);
+      page = await Page.findByIdAndViewer(pageId, user);
+      if (user != null) {
+        page = await page.seen(user);
       }
     }
     catch (err) {

+ 1 - 4
src/server/util/middlewares.js

@@ -32,7 +32,7 @@ exports.loginChecker = function(crowi, app) {
       });
     }
     else {
-      req.user = req.session.user = false;
+      req.user = req.session.user = null;
       res.locals.user = req.user;
       next();
     }
@@ -41,9 +41,6 @@ exports.loginChecker = function(crowi, app) {
 
 exports.loginCheckerForPassport = function(crowi, app) {
   return function(req, res, next) {
-    if (req.user == null) {
-      req.user = false;
-    }
     res.locals.user = req.user;
     next();
   };