Merge pull request #1416 from hackmdio/fix/user-type-error

jackycute · web-flow · commit b26009394751 · 2020-02-26T11:51:06.000+08:00
Fix some issues after code refactoring
diff --git a/app.js b/app.js
@@ -222,7 +222,7 @@ app.use(require('./lib/routes').router)
 
 // response not found if no any route matxches
 app.get('*', function (req, res) {
-  response.errorNotFound(res)
+  response.errorNotFound(req, res)
 })
 
 // socket.io secure
diff --git a/lib/auth/email/index.js b/lib/auth/email/index.js
@@ -33,8 +33,8 @@ passport.use(new LocalStrategy({
 
 if (config.allowEmailRegister) {
   emailAuth.post('/register', urlencodedParser, function (req, res, next) {
-    if (!req.body.email || !req.body.password) return response.errorBadRequest(res)
-    if (!validator.isEmail(req.body.email)) return response.errorBadRequest(res)
+    if (!req.body.email || !req.body.password) return response.errorBadRequest(req, res)
+    if (!validator.isEmail(req.body.email)) return response.errorBadRequest(req, res)
     models.User.findOrCreate({
       where: {
         email: req.body.email
@@ -57,14 +57,14 @@ if (config.allowEmailRegister) {
       return res.redirect(config.serverURL + '/')
     }).catch(function (err) {
       logger.error('auth callback failed: ' + err)
-      return response.errorInternalError(res)
+      return response.errorInternalError(req, res)
     })
   })
 }
 
 emailAuth.post('/login', urlencodedParser, function (req, res, next) {
-  if (!req.body.email || !req.body.password) return response.errorBadRequest(res)
-  if (!validator.isEmail(req.body.email)) return response.errorBadRequest(res)
+  if (!req.body.email || !req.body.password) return response.errorBadRequest(req, res)
+  if (!validator.isEmail(req.body.email)) return response.errorBadRequest(req, res)
   setReturnToFromReferer(req)
   passport.authenticate('local', {
     successReturnToOrRedirect: config.serverURL + '/',
diff --git a/lib/auth/ldap/index.js b/lib/auth/ldap/index.js
@@ -81,7 +81,7 @@ passport.use(new LDAPStrategy({
 }))
 
 ldapAuth.post('/auth/ldap', urlencodedParser, function (req, res, next) {
-  if (!req.body.username || !req.body.password) return response.errorBadRequest(res)
+  if (!req.body.username || !req.body.password) return response.errorBadRequest(req, res)
   setReturnToFromReferer(req)
   passport.authenticate('ldapauth', {
     successReturnToOrRedirect: config.serverURL + '/',
diff --git a/lib/history/index.js b/lib/history/index.js
@@ -116,55 +116,55 @@ function parseHistoryToObject (history) {
 function historyGet (req, res) {
   if (req.isAuthenticated()) {
     getHistory(req.user.id, function (err, history) {
-      if (err) return response.errorInternalError(res)
-      if (!history) return response.errorNotFound(res)
+      if (err) return response.errorInternalError(req, res)
+      if (!history) return response.errorNotFound(req, res)
       res.send({
         history: parseHistoryToArray(history)
       })
     })
   } else {
-    return response.errorForbidden(res)
+    return response.errorForbidden(req, res)
   }
 }
 
 function historyPost (req, res) {
   if (req.isAuthenticated()) {
     var noteId = req.params.noteId
     if (!noteId) {
-      if (typeof req.body['history'] === 'undefined') return response.errorBadRequest(res)
+      if (typeof req.body['history'] === 'undefined') return response.errorBadRequest(req, res)
       if (config.debug) { logger.info('SERVER received history from [' + req.user.id + ']: ' + req.body.history) }
       try {
         var history = JSON.parse(req.body.history)
       } catch (err) {
-        return response.errorBadRequest(res)
+        return response.errorBadRequest(req, res)
       }
       if (Array.isArray(history)) {
         setHistory(req.user.id, history, function (err, count) {
-          if (err) return response.errorInternalError(res)
+          if (err) return response.errorInternalError(req, res)
           res.end()
         })
       } else {
-        return response.errorBadRequest(res)
+        return response.errorBadRequest(req, res)
       }
     } else {
-      if (typeof req.body['pinned'] === 'undefined') return response.errorBadRequest(res)
+      if (typeof req.body['pinned'] === 'undefined') return response.errorBadRequest(req, res)
       getHistory(req.user.id, function (err, history) {
-        if (err) return response.errorInternalError(res)
-        if (!history) return response.errorNotFound(res)
-        if (!history[noteId]) return response.errorNotFound(res)
+        if (err) return response.errorInternalError(req, res)
+        if (!history) return response.errorNotFound(req, res)
+        if (!history[noteId]) return response.errorNotFound(req, res)
         if (req.body.pinned === 'true' || req.body.pinned === 'false') {
           history[noteId].pinned = (req.body.pinned === 'true')
           setHistory(req.user.id, history, function (err, count) {
-            if (err) return response.errorInternalError(res)
+            if (err) return response.errorInternalError(req, res)
             res.end()
           })
         } else {
-          return response.errorBadRequest(res)
+          return response.errorBadRequest(req, res)
         }
       })
     }
   } else {
-    return response.errorForbidden(res)
+    return response.errorForbidden(req, res)
   }
 }
 
@@ -173,22 +173,22 @@ function historyDelete (req, res) {
     var noteId = req.params.noteId
     if (!noteId) {
       setHistory(req.user.id, [], function (err, count) {
-        if (err) return response.errorInternalError(res)
+        if (err) return response.errorInternalError(req, res)
         res.end()
       })
     } else {
       getHistory(req.user.id, function (err, history) {
-        if (err) return response.errorInternalError(res)
-        if (!history) return response.errorNotFound(res)
+        if (err) return response.errorInternalError(req, res)
+        if (!history) return response.errorNotFound(req, res)
         delete history[noteId]
         setHistory(req.user.id, history, function (err, count) {
-          if (err) return response.errorInternalError(res)
+          if (err) return response.errorInternalError(req, res)
           res.end()
         })
       })
     }
   } else {
-    return response.errorForbidden(res)
+    return response.errorForbidden(req, res)
   }
 }
 
diff --git a/lib/imageRouter/index.js b/lib/imageRouter/index.js
@@ -21,7 +21,7 @@ imageRouter.post('/uploadimage', function (req, res) {
 
   form.parse(req, function (err, fields, files) {
     if (err || !files.image || !files.image.path) {
-      response.errorForbidden(res)
+      response.errorForbidden(req, res)
     } else {
       if (config.debug) {
         logger.info('SERVER received uploadimage: ' + JSON.stringify(files.image))
diff --git a/lib/middleware/checkURIValid.js b/lib/middleware/checkURIValid.js
@@ -8,7 +8,7 @@ module.exports = function (req, res, next) {
     decodeURIComponent(req.path)
   } catch (err) {
     logger.error(err)
-    return response.errorBadRequest(res)
+    return response.errorBadRequest(req, res)
   }
   next()
 }
diff --git a/lib/middleware/tooBusy.js b/lib/middleware/tooBusy.js
@@ -9,7 +9,7 @@ toobusy.maxLag(config.responseMaxLag)
 
 module.exports = function (req, res, next) {
   if (toobusy()) {
-    response.errorServiceUnavailable(res)
+    response.errorServiceUnavailable(req, res)
   } else {
     next()
   }
diff --git a/lib/note/index.js b/lib/note/index.js
@@ -60,13 +60,13 @@ async function showNote (req, res) {
   if (!note) {
     // if allow free url enable, auto create note
     if (!config.allowFreeURL || config.forbiddenNoteIDs.includes(noteId)) {
-      return errorNotFound(res)
+      return errorNotFound(req, res)
     }
     note = await createNote(userId, noteId)
   }
 
   if (!newCheckViewPermission(note, req.isAuthenticated(), userId)) {
-    return errorForbidden(res)
+    return errorForbidden(req, res)
   }
 
   // force to use note id
@@ -94,12 +94,12 @@ async function showPublishNote (req, res) {
     includeUser: true
   })
 
-  if (!canViewNote(note, req.isAuthenticated(), req.user ? req.user.id : null)) {
-    return errorForbidden(req)
+  if (!note) {
+    return errorNotFound(req, res)
   }
 
-  if (!note) {
-    return errorNotFound(res)
+  if (!canViewNote(note, req.isAuthenticated(), req.user ? req.user.id : null)) {
+    return errorForbidden(req, res)
   }
 
   if ((note.alias && shortid !== note.alias) || (!note.alias && shortid !== note.shortid)) {
@@ -146,11 +146,11 @@ async function noteActions (req, res) {
   const note = await getNoteById(noteId)
 
   if (!note) {
-    return errorNotFound(res)
+    return errorNotFound(req, res)
   }
 
   if (!canViewNote(note, req.isAuthenticated(), req.user ? req.user.id : null)) {
-    return errorForbidden(req)
+    return errorForbidden(req, res)
   }
 
   const action = req.params.action
@@ -171,7 +171,7 @@ async function noteActions (req, res) {
         actionPDF(req, res, note)
       } else {
         logger.error('PDF export failed: Disabled by config. Set "allowPDFExport: true" to enable. Check the documentation for details')
-        errorForbidden(res)
+        errorForbidden(req, res)
       }
       break
     case 'gist':
diff --git a/lib/note/noteActions.js b/lib/note/noteActions.js
@@ -84,7 +84,7 @@ function actionPDF (req, res, note) {
   markdownpdf(markdownpdfOptions).from.string(content).to(pdfPath, function () {
     if (!fs.existsSync(pdfPath)) {
       logger.error('PDF seems to not be generated as expected. File doesn\'t exist: ' + pdfPath)
-      return errorInternalError(res)
+      return errorInternalError(req, res)
     }
     const stream = fs.createReadStream(pdfPath)
     let filename = title
@@ -173,15 +173,15 @@ function actionRevision (req, res, note) {
   if (actionId) {
     const time = moment(parseInt(actionId))
     if (!time.isValid()) {
-      return errorNotFound(res)
+      return errorNotFound(req, res)
     }
     Revision.getPatchedNoteRevisionByTime(note, time, function (err, content) {
       if (err) {
         logger.error(err)
-        return errorInternalError(res)
+        return errorInternalError(req, res)
       }
       if (!content) {
-        return errorNotFound(res)
+        return errorNotFound(req, res)
       }
       res.set({
         'Access-Control-Allow-Origin': '*', // allow CORS as API
@@ -196,7 +196,7 @@ function actionRevision (req, res, note) {
     Revision.getNoteRevisions(note, function (err, data) {
       if (err) {
         logger.error(err)
-        return errorInternalError(res)
+        return errorInternalError(req, res)
       }
       const result = {
         revision: data
diff --git a/lib/response.js b/lib/response.js
diff --git a/lib/user/index.js b/lib/user/index.js

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ module.exports = function (req, res, next) {`
`8`	`8`	`decodeURIComponent(req.path)`
`9`	`9`	`} catch (err) {`
`10`	`10`	`logger.error(err)`
`11`		`- return response.errorBadRequest(res)`
	`11`	`+ return response.errorBadRequest(req, res)`
`12`	`12`	`}`
`13`	`13`	`next()`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ toobusy.maxLag(config.responseMaxLag)`
`9`	`9`
`10`	`10`	`module.exports = function (req, res, next) {`
`11`	`11`	`if (toobusy()) {`
`12`		`- response.errorServiceUnavailable(res)`
	`12`	`+ response.errorServiceUnavailable(req, res)`
`13`	`13`	`} else {`
`14`	`14`	`next()`
`15`	`15`	`}`