Compare commits

..

No commits in common. "798c22c56d6b3be13229b282e6e3b8c0e518462c" and "d31c8e9832ab2c4529429001b4e1b3ebc0565c4d" have entirely different histories.

3 changed files with 5 additions and 8 deletions

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{
"name": "traxxx-web",
"version": "0.23.2",
"version": "0.23.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"version": "0.23.2",
"version": "0.23.1",
"dependencies": {
"@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5",

View File

@ -77,5 +77,5 @@
"postcss-custom-media": "^10.0.2",
"postcss-nesting": "^12.0.2"
},
"version": "0.23.2"
"version": "0.23.1"
}

View File

@ -1,6 +1,4 @@
export default function consentHandler(req, res, next) {
const redirect = req.headers.referer && new URL(req.headers.referer).searchParams.get('redirect');
if (Object.hasOwn(req.query, 'lgbt')) {
const lgbtFilters = (req.tagFilter || []).filter((tag) => !['gay', 'bisexual', 'transsexual'].includes(tag));
@ -17,14 +15,13 @@ export default function consentHandler(req, res, next) {
if (Object.hasOwn(req.query, 'consent')) {
req.session.hasConsent = true; // eslint-disable-line no-param-reassign
res.redirect(redirect || req.path);
res.redirect(req.path);
return;
}
if (!req.path.includes('/consent') && !req.session?.hasConsent) {
res.redirect(`/consent?redirect=${req.originalUrl === '/' ? '' : encodeURIComponent(req.originalUrl) }`);
res.redirect('/consent');
return;
}