Skip to content

Fix a race condition in Express where browsers redirect before session is persisted #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
simov merged 2 commits into from
Jun 22, 2019
Merged

Fix a race condition in Express where browsers redirect before session is persisted #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
480473b
Fix a race condition where browsers redirect before session is persisted
KidkArolis Jun 6, 2019
2eb66f4
Improve redirect handling for express
simov Jun 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions lib/consumer/express.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,30 +41,35 @@ module.exports = function (_config) {
connect(req, res)
})

var transport = (provider, res, session) => (data) => {
var transport = (provider, req, res, session) => (data) => {
if (!provider.callback) {
res.end(qs.stringify(data))
}
else if (!provider.transport || provider.transport === 'querystring') {
res.redirect(`${provider.callback}?${qs.stringify(data)}`)
redirect(req, res, `${provider.callback}?${qs.stringify(data)}`)
}
else if (provider.transport === 'session') {
session.response = data
res.redirect(provider.callback)
redirect(req, res, provider.callback)
}
}

var redirect = (req, res, url) =>
typeof req.session.save === 'function'
? req.session.save(() => res.redirect(url))
: res.redirect(url)

function connect (req, res) {
var session = req.session.grant
var provider = config.provider(app.config, session)
var response = transport(provider, res, session)
var response = transport(provider, req, res, session)

if (provider.oauth === 1) {
oauth1.request(provider)
.then(({body}) => {
session.request = body
oauth1.authorize(provider, body)
.then((url) => res.redirect(url))
.then((url) => redirect(req, res, url))
.catch(response)
})
.catch(response)
Expand All @@ -74,7 +79,7 @@ module.exports = function (_config) {
session.state = provider.state
session.nonce = provider.nonce
oauth2.authorize(provider)
.then((url) => res.redirect(url))
.then((url) => redirect(req, res, url))
.catch(response)
}

Expand All @@ -86,7 +91,7 @@ module.exports = function (_config) {
function callback (req, res) {
var session = req.session.grant || {}
var provider = config.provider(app.config, session)
var response = transport(provider, res, session)
var response = transport(provider, req, res, session)

if (provider.oauth === 1) {
oauth1.access(provider, session.request, req.query)
Expand Down
⚡