From 355ef1b7dd7d05f0aa5f8a58d8a427d335f8f7bf Mon Sep 17 00:00:00 2001 From: Thomas Hintz Date: Mon, 24 Apr 2023 06:18:24 +0200 Subject: [PATCH] changes. --- src/pages/api/create-account.js | 14 +++++++------- src/pages/api/sign-in.js | 8 ++++---- src/pages/api/sign-out.js | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/api/create-account.js b/src/pages/api/create-account.js index e8a16ff..a9c84c4 100644 --- a/src/pages/api/create-account.js +++ b/src/pages/api/create-account.js @@ -55,7 +55,7 @@ async function handler(req, res) { if (email && password && password === passwordagain && (csi || patreon_magic_key)) { // Check for minimum password length if (password.length < 12) { - return NextResponse.redirect(makeMsg(csi, email, 'Please enter a password that is at least 12 characters long.'), 303); + return res.redirect(makeMsg(csi, email, 'Please enter a password that is at least 12 characters long.'), 303); } // Retrieve Stripe session and email or get verify patreon magic key @@ -70,14 +70,14 @@ async function handler(req, res) { if (!session) { console.error('unable to get session'); } if (!emailFromSession) { console.error('unable to get email from session'); } if (!email === emailFromSession) { console.error('session email does not match form email'); } - return NextResponse.redirect('/reactors/create-account?unexpected_error=true', 303); + return res.redirect('/reactors/create-account?unexpected_error=true', 303); } // Check if user already exists const existingUser = await db.get('select id from users where email=?', email); if (existingUser) { console.error('User already exists'); - return NextResponse.redirect('/reactors/create-account?unexpected_error=true', 303); + return res.redirect('/reactors/create-account?unexpected_error=true', 303); } // Create new user and subscription @@ -86,18 +86,18 @@ async function handler(req, res) { const userId = await createUser(email, salt, hashRes); await createSubscription(userId, sessionType); console.log('User created successfully'); - return NextResponse.redirect('/reactors/account', 303); + return res.redirect('/reactors/account', 303); } else { // Handle missing or invalid form data if (!email || !csi) { console.error('Missing email or csi'); - return NextResponse.redirect('/reactors/create-account?unexpected_error=true', 303); + return res.redirect('/reactors/create-account?unexpected_error=true', 303); } if (!password) { - return NextResponse.redirect(makeMsg(csi, email, 'Please enter a password'), 303); + return res.redirect(makeMsg(csi, email, 'Please enter a password'), 303); } if (password !== passwordagain) { - return NextResponse.redirect(makeMsg(csi, email, 'Passwords did not match. Please try again.'), 303) + return res.redirect(makeMsg(csi, email, 'Passwords did not match. Please try again.'), 303) } } } else { diff --git a/src/pages/api/sign-in.js b/src/pages/api/sign-in.js index 95c7490..0a5d2f5 100644 --- a/src/pages/api/sign-in.js +++ b/src/pages/api/sign-in.js @@ -46,16 +46,16 @@ async function handler(req, res) { const expiresDate = new Date(today.getTime() + (1000 * maxAge)); await db.run('insert into sessions (user_id, session_id, expires) values (?, ?, ?);', userId, sessionId, expiresDate.toISOString()); setCookie('session', sessionId, { req, res, maxAge: rememberMe ? maxAge : undefined, httpOnly: true, sameSite: true, secure: process.env.NODE_ENV === 'production' }); - res.status(303).redirect('/reactors/account') + res.redirect('/reactors/account', 303) } else { - res.status(303).redirect(makeMsg(email, 'Invalid password or account does not exist.')); + res.redirect(makeMsg(email, 'Invalid password or account does not exist.'), 303); } } else { if (!email) { - res.status(303).redirect(makeMsg(email, 'Please enter an email address.')); + res.redirect(makeMsg(email, 'Please enter an email address.'), 303); } if (!password) { - res.status(303).redirect(makeMsg(email, 'Please enter a password.')); + res.redirect(makeMsg(email, 'Please enter a password.'), 303); } } } else { diff --git a/src/pages/api/sign-out.js b/src/pages/api/sign-out.js index 2ac6e1f..cb62e04 100644 --- a/src/pages/api/sign-out.js +++ b/src/pages/api/sign-out.js @@ -3,7 +3,7 @@ import { deleteCookie } from 'cookies-next'; export default async function handler(req, res) { if (req.method === 'POST') { deleteCookie('session', { req, res, httpOnly: true, sameSite: true, secure: process.env.NODE_ENV === 'production' }); - res.status(303).redirect('/'); + return res.redirect('/', 303); } else { // Handle any other HTTP method }