Skip to content
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

Reset multi_auth to initial state on error #2007

Merged
merged 3 commits into from
Mar 25, 2025
Merged

Reset multi_auth to initial state on error #2007

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d8c13b
Reset multi auth to initial state
ekzyis Mar 21, 2025
87727fd
Also check if next-auth.session-token exists
ekzyis Mar 25, 2025
9260c77
Merge branch 'master' into multi-auth-reset-to-initial-state
huumn Mar 25, 2025
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
14 changes: 11 additions & 3 deletions lib/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function switchSessionCookie (request) {
}

async function checkMultiAuthCookies (req, res) {
if (!req.cookies[MULTI_AUTH_LIST] || !req.cookies[MULTI_AUTH_POINTER]) {
if (!req.cookies[MULTI_AUTH_LIST] || !req.cookies[MULTI_AUTH_POINTER] || !req.cookies[SESSION_COOKIE]) {
return false
}

Expand All @@ -116,15 +116,23 @@ async function checkMultiAuthCookies (req, res) {
return true
}

function resetMultiAuthCookies (req, res) {
async function resetMultiAuthCookies (req, res) {
const httpOnlyOptions = cookieOptions({ expires: 0, maxAge: 0 })
const jsOptions = { ...httpOnlyOptions, httpOnly: false }

// remove all multi_auth cookies ...
for (const key of Object.keys(req.cookies)) {
if (!MULTI_AUTH_REGEXP.test(key)) continue
const options = MULTI_AUTH_JWT_REGEXP.test(key) ? httpOnlyOptions : jsOptions
res.appendHeader('Set-Cookie', cookie.serialize(key, '', options))
}

// ... and reset to initial state if they are logged in
const token = req.cookies[SESSION_COOKIE]
if (!token) return

const decoded = await decodeJWT({ token, secret: process.env.NEXTAUTH_SECRET })
setMultiAuthCookies(req, res, { ...decoded, jwt: token })
}

async function refreshMultiAuthCookies (req, res) {
Expand Down Expand Up @@ -170,7 +178,7 @@ export async function multiAuthMiddleware (req, res) {

const ok = await checkMultiAuthCookies(req, res)
if (!ok) {
resetMultiAuthCookies(req, res)
await resetMultiAuthCookies(req, res)
return switchSessionCookie(req)
}

Expand Down