Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-05 18:36:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2025-01-20 13:19:07 -05:00
parent ae9ef064ae 23b37f6227
commit 8f460bc312
3 changed files with 84 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
CHANGELOG.md
View File

@@ -1,3 +1,78 @@
#### v3.12.4 (2025-01-20)
##### Chores
* up harmony (cfb22da1)
* up harmony (d0715ca4)
* incrementing version number - v3.12.3 (abb2417e)
* update changelog for v3.12.3 (0cc94bbe)
* incrementing version number - v3.12.2 (a1269b39)
* incrementing version number - v3.12.1 (944c4e66)
* incrementing version number - v3.12.0 (052c195e)
* incrementing version number - v3.11.1 (0c0dd480)
* incrementing version number - v3.11.0 (acf27e85)
* incrementing version number - v3.10.3 (57d54224)
* incrementing version number - v3.10.2 (2f15f464)
* incrementing version number - v3.10.1 (cca3a644)
* incrementing version number - v3.10.0 (b60a9b4e)
* incrementing version number - v3.9.1 (f120c91c)
* incrementing version number - v3.9.0 (4880f32d)
* incrementing version number - v3.8.4 (4833f9a6)
* incrementing version number - v3.8.3 (97ce2c44)
* incrementing version number - v3.8.2 (72d91251)
* incrementing version number - v3.8.1 (527326f7)
* incrementing version number - v3.8.0 (e228a6eb)
* incrementing version number - v3.7.5 (6882894d)
* incrementing version number - v3.7.4 (6678744c)
* incrementing version number - v3.7.3 (2d62b6f6)
* incrementing version number - v3.7.2 (cc257e7e)
* incrementing version number - v3.7.1 (712365a5)
* incrementing version number - v3.7.0 (9a6153d7)
* incrementing version number - v3.6.7 (86a17e38)
* incrementing version number - v3.6.6 (6604bf37)
* incrementing version number - v3.6.5 (6c653625)
* incrementing version number - v3.6.4 (83d131b4)
* incrementing version number - v3.6.3 (fc7d2bfd)
* incrementing version number - v3.6.2 (0f577a57)
* incrementing version number - v3.6.1 (f1a69468)
* incrementing version number - v3.6.0 (4cdf85f8)
* incrementing version number - v3.5.3 (ed0e8783)
* incrementing version number - v3.5.2 (52fbb2da)
* incrementing version number - v3.5.1 (4c543488)
* incrementing version number - v3.5.0 (d06fb4f0)
* incrementing version number - v3.4.3 (5c984250)
* incrementing version number - v3.4.2 (3f0dac38)
* incrementing version number - v3.4.1 (01e69574)
* incrementing version number - v3.4.0 (fd9247c5)
* incrementing version number - v3.3.9 (5805e770)
* incrementing version number - v3.3.8 (a5603565)
* incrementing version number - v3.3.7 (b26f1744)
* incrementing version number - v3.3.6 (7fb38792)
* incrementing version number - v3.3.4 (a67f84ea)
* incrementing version number - v3.3.3 (f94d239b)
* incrementing version number - v3.3.2 (ec9dac97)
* incrementing version number - v3.3.1 (151cc68f)
* incrementing version number - v3.3.0 (fc1ad70f)
* incrementing version number - v3.2.3 (b06d3e63)
* incrementing version number - v3.2.2 (758ecfcd)
* incrementing version number - v3.2.1 (20145074)
* incrementing version number - v3.2.0 (9ecac38e)
* incrementing version number - v3.1.7 (0b4e81ab)
* incrementing version number - v3.1.6 (b3a3b130)
* incrementing version number - v3.1.5 (ec19343a)
* incrementing version number - v3.1.4 (2452783c)
* incrementing version number - v3.1.3 (3b4e9d3f)
* incrementing version number - v3.1.2 (40fa3489)
* incrementing version number - v3.1.1 (40250733)
* incrementing version number - v3.1.0 (0cb386bd)
* incrementing version number - v3.0.1 (26f6ea49)
* incrementing version number - v3.0.0 (224e08cd)
##### Bug Fixes
* 404 request if payload invalid (de021bda)
* add HEAD check to unsub route (205bf477)
#### v3.12.3 (2025-01-15)
##### Chores

7
src/controllers/accounts/settings.js
View File

@@ -125,11 +125,14 @@ const doUnsubscribe = async (payload) => {
return true;
};
settingsController.unsubscribe = async (req, res) => {
settingsController.unsubscribe = async (req, res, next) => {
if (req.method === 'HEAD') {
return res.sendStatus(204);
}
try {
const payload = await jwtVerifyAsync(req.params.token);
if (!payload || !unsubscribable.includes(payload.template)) {
return;
return next();
}
await doUnsubscribe(payload);
res.render('unsubscribe', {

5
src/controllers/authentication.js
View File

@@ -64,7 +64,10 @@ async function registerAndLoginUser(req, res, userData) {
]);
}
await user.deleteInvitationKey(userData.email, userData.token);
const next = req.session.returnTo || `${nconf.get('relative_path')}/`;
let next = req.session.returnTo || `${nconf.get('relative_path')}/`;
if (req.loggedIn && next === `${nconf.get('relative_path')}/login`) {
next = `${nconf.get('relative_path')}/`;
}
const complete = await plugins.hooks.fire('filter:register.complete', { uid: uid, next: next });
req.session.returnTo = complete.next;
return complete;