diff --git a/src/server/index.js b/src/server/index.js index 581ced0e6e..49cf6a3186 100644 --- 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 index 68045a87e8..67940a822f 100644 --- 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(`
${html}
`) - .end() + res.setHeader('Content-Type', 'text/html') + res.send(`
${html}
`) + res.end() } diff --git a/src/server/routes/providers.js b/src/server/routes/providers.js index 0538609130..4f2f0eac0c 100644 --- 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 index 10013daaf6..d8d3de3a04 100644 --- 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 index 86a03535cf..86f3b1333c 100644 --- 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') {