Skip to content

[BUGFIX] Prevent logout session deletes from wiping analytics #16

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

Closed
joelev wants to merge 1 commit into from
Closed

[BUGFIX] Prevent logout session deletes from wiping analytics #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion api/_lib/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ async function getSession(req) {
const { rows } = await sql`
SELECT id, email, created_at, last_seen
FROM sessions
WHERE id = ${sessionId} AND created_at > NOW() - INTERVAL '7 days'
WHERE id = ${sessionId}
AND created_at > NOW() - INTERVAL '7 days'
AND last_seen >= created_at
`;
if (rows.length === 0) return null;

Expand Down
8 changes: 6 additions & 2 deletions api/logout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@ module.exports = async (req, res) => {

const cookies = parseCookies(req.headers.cookie || '');

// Delete viewer session from DB before clearing cookie
// Revoke viewer session without deleting the row so FK-linked analytics remain intact.
const sessionId = cookies['site-auth'];
if (sessionId) {
await sql`DELETE FROM sessions WHERE id = ${sessionId}`;
await sql`
UPDATE sessions
SET last_seen = created_at - INTERVAL '1 second'
WHERE id = ${sessionId}
`;
}

// Delete admin session from DB before clearing cookie
Expand Down
Loading