fix: don't chain on res.end on non-chainable res methods (#1031)

balazsorban44 · balazsorban44 · commit 9ed75c778810 · 2021-02-01T10:01:10.000+01:00
diff --git a/src/server/index.js b/src/server/index.js
@@ -43,7 +43,8 @@ async function NextAuthHandler (req, res, userSuppliedOptions) {
       const error = 'Cannot find [...nextauth].js in pages/api/auth. Make sure the filename is written correctly.'
 
       logger.error('MISSING_NEXTAUTH_API_ROUTE_ERROR', error)
-      return res.status(500).end(`Error: ${error}`).end()
+      res.status(500)
+      return res.end(`Error: ${error}`)
     }
 
     const { url, query, body } = req
@@ -232,7 +233,8 @@ async function NextAuthHandler (req, res, userSuppliedOptions) {
           session(req, res)
           break
         case 'csrf':
-          return res.json({ csrfToken }).end()
+          res.json({ csrfToken })
+          return res.end()
         case 'signin':
           if (options.pages.signIn) {
             let redirectUrl = `${options.pages.signIn}${options.pages.signIn.includes('?') ? '&' : '?'}callbackUrl=${callbackUrl}`
@@ -253,7 +255,8 @@ async function NextAuthHandler (req, res, userSuppliedOptions) {
           if (provider && options.providers[provider]) {
             callback(req, res)
           } else {
-            return res.status(400).end(`Error: HTTP GET is not supported for ${url}`).end()
+            res.status(400)
+            return res.end(`Error: HTTP GET is not supported for ${url}`)
           }
           break
         case 'verify-request':
@@ -267,7 +270,8 @@ async function NextAuthHandler (req, res, userSuppliedOptions) {
           renderPage(req, res, 'error', { error })
           break
         default:
-          return res.status(404).end()
+          res.status(404)
+          return res.end()
       }
     } else if (req.method === 'POST') {
       switch (action) {
@@ -298,14 +302,17 @@ async function NextAuthHandler (req, res, userSuppliedOptions) {
 
             callback(req, res)
           } else {
-            return res.status(400).end(`Error: HTTP POST is not supported for ${url}`).end()
+            res.status(400)
+            return res.end(`Error: HTTP POST is not supported for ${url}`)
           }
           break
         default:
-          return res.status(400).end(`Error: HTTP POST is not supported for ${url}`).end()
+          res.status(400)
+          return res.end(`Error: HTTP POST is not supported for ${url}`)
       }
     } else {
-      return res.status(400).end(`Error: HTTP ${req.method} is not supported for ${url}`).end()
+      res.status(400)
+      return res.end(`Error: HTTP ${req.method} is not supported for ${url}`)
     }
   })
 }
diff --git a/src/server/pages/index.js b/src/server/pages/index.js
@@ -27,8 +27,7 @@ export default function renderPage (req, res, page, props = {}) {
       return
   }
 
-  res
-    .setHeader('Content-Type', 'text/html')
-    .send(`<!DOCTYPE html><head><style type="text/css">${css()}</style><meta name="viewport" content="width=device-width, initial-scale=1"></head><body><div class="page">${html}</div></body></html>`)
-    .end()
+  res.setHeader('Content-Type', 'text/html')
+  res.send(`<!DOCTYPE html><head><style type="text/css">${css()}</style><meta name="viewport" content="width=device-width, initial-scale=1"></head><body><div class="page">${html}</div></body></html>`)
+  res.end()
 }
diff --git a/src/server/routes/providers.js b/src/server/routes/providers.js
@@ -18,5 +18,7 @@ export default function providers (req, res) {
       }
     }), {})
 
-  return res.setHeader('Content-Type', 'application/json').json(result).end()
+  res.setHeader('Content-Type', 'application/json')
+  res.json(result)
+  return res.end()
 }
diff --git a/src/server/routes/session.js b/src/server/routes/session.js
@@ -13,7 +13,9 @@ export default async function session (req, res) {
   const sessionToken = req.cookies[cookies.sessionToken.name]
 
   if (!sessionToken) {
-    return res.setHeader('Content-Type', 'application/json').json({}).end()
+    res.setHeader('Content-Type', 'application/json')
+    res.json({})
+    return res.end()
   }
 
   let response = {}
@@ -99,5 +101,7 @@ export default async function session (req, res) {
     }
   }
 
-  return res.setHeader('Content-Type', 'application/json').json(response).end()
+  res.setHeader('Content-Type', 'application/json')
+  res.json(response)
+  return res.end()
 }
diff --git a/src/server/routes/signin.js b/src/server/routes/signin.js
@@ -17,7 +17,8 @@ export default async function signin (req, res) {
   const { type } = provider
 
   if (!type) {
-    return res.status(500).end(`Error: Type not specified for ${provider}`)
+    res.status(500)
+    return res.end(`Error: Type not specified for ${provider}`)
   }
 
   if (type === 'oauth' && req.method === 'POST') {

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ export default function renderPage (req, res, page, props = {}) {`
`27`	`27`	`return`
`28`	`28`	`}`
`29`	`29`
`30`		`- res`
`31`		`- .setHeader('Content-Type', 'text/html')`
`32`		- .send(`<!DOCTYPE html><head><style type="text/css">${css()}</style><meta name="viewport" content="width=device-width, initial-scale=1"></head><body><div class="page">${html}</div></body></html>`)
`33`		`- .end()`
	`30`	`+ res.setHeader('Content-Type', 'text/html')`
	`31`	+ res.send(`<!DOCTYPE html><head><style type="text/css">${css()}</style><meta name="viewport" content="width=device-width, initial-scale=1"></head><body><div class="page">${html}</div></body></html>`)
	`32`	`+ res.end()`
`34`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,7 @@ export default function providers (req, res) {`
`18`	`18`	`}`
`19`	`19`	`}), {})`
`20`	`20`
`21`		`- return res.setHeader('Content-Type', 'application/json').json(result).end()`
	`21`	`+ res.setHeader('Content-Type', 'application/json')`
	`22`	`+ res.json(result)`
	`23`	`+ return res.end()`
`22`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ export default async function session (req, res) {`
`13`	`13`	`const sessionToken = req.cookies[cookies.sessionToken.name]`
`14`	`14`
`15`	`15`	`if (!sessionToken) {`
`16`		`- return res.setHeader('Content-Type', 'application/json').json({}).end()`
	`16`	`+ res.setHeader('Content-Type', 'application/json')`
	`17`	`+ res.json({})`
	`18`	`+ return res.end()`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`let response = {}`
`@@ -99,5 +101,7 @@ export default async function session (req, res) {`
`99`	`101`	`}`
`100`	`102`	`}`
`101`	`103`
`102`		`- return res.setHeader('Content-Type', 'application/json').json(response).end()`
	`104`	`+ res.setHeader('Content-Type', 'application/json')`
	`105`	`+ res.json(response)`
	`106`	`+ return res.end()`
`103`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,8 @@ export default async function signin (req, res) {`
`17`	`17`	`const { type } = provider`
`18`	`18`
`19`	`19`	`if (!type) {`
`20`		- return res.status(500).end(`Error: Type not specified for ${provider}`)
	`20`	`+ res.status(500)`
	`21`	+ return res.end(`Error: Type not specified for ${provider}`)
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`if (type === 'oauth' && req.method === 'POST') {`