1
0
Fork 0
mirror of https://github.com/plankanban/planka.git synced 2025-07-24 15:49:46 +02:00

feat: Version 2

Closes #627, closes #1047
This commit is contained in:
Maksim Eltyshev 2025-05-10 02:09:06 +02:00
parent ad7fb51cfa
commit 2ee1166747
1557 changed files with 76832 additions and 47042 deletions

View file

@ -1,3 +1,8 @@
/*!
* Copyright (c) 2024 PLANKA Software GmbH
* Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
*/
/**
* current-user hook
*
@ -17,10 +22,7 @@ module.exports = function defineCurrentUserHook(sails) {
return null;
}
const session = await Session.findOne({
accessToken,
deletedAt: null,
});
const session = await Session.qm.getOneUndeletedByAccessToken(accessToken);
if (!session) {
return null;
@ -30,9 +32,15 @@ module.exports = function defineCurrentUserHook(sails) {
return null;
}
const user = await sails.helpers.users.getOne(payload.subject);
const user = await User.qm.getOneById(payload.subject, {
withDeactivated: false,
});
if (user && user.passwordChangedAt > payload.issuedAt) {
if (!user) {
return null;
}
if (user.passwordChangedAt > payload.issuedAt) {
return null;
}
@ -66,6 +74,10 @@ module.exports = function defineCurrentUserHook(sails) {
if (sessionAndUser) {
const { session, user } = sessionAndUser;
if (user.language) {
req.setLocale(user.language);
}
Object.assign(req, {
currentSession: session,
currentUser: user,