Skip to content
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

Libera o nome de usuário e email caso o token de ativação da conta expire #1790

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Libera o nome de usuário e email caso o token de ativação da conta expire #1790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fab09e8
test(users): group tests about duplicate `username` and `email` into …
Rafatcb Sep 5, 2024
6d43977
test(orchestrator): create activation token when creating a user
Rafatcb Jan 12, 2025
5d2a0cf
feat(users): delete inactive users with expired tokens on create/update
Rafatcb Jan 13, 2025
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
1 change: 0 additions & 1 deletion models/activation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,5 @@ export default Object.freeze({
getActivationApiEndpoint,
getActivationPageEndpoint,
activateUserUsingTokenId,
activateUserByUserId,
update,
});
44 changes: 37 additions & 7 deletions models/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ async function findOneById(userId, options = {}) {
async function create(postedUserData) {
const validUserData = validatePostSchema(postedUserData);
await validateUniqueUser(validUserData);
await deleteExpiredUsers(validUserData);
await hashPasswordInObject(validUserData);

validUserData.features = ['read:activation_token'];
Expand Down Expand Up @@ -295,6 +296,7 @@ async function update(targetUser, postedUserData, options = {}) {
if (shouldValidateUsername || shouldValidateEmail) {
try {
await validateUniqueUser({ ...validPostedUserData, id: currentUser.id }, { transaction: options.transaction });
await deleteExpiredUsers(validPostedUserData);
if (shouldValidateEmail && !options.skipEmailConfirmation) {
await emailConfirmation.createAndSendEmail(currentUser, validPostedUserData.email, {
transaction: options.transaction,
Expand Down Expand Up @@ -375,30 +377,36 @@ async function validateUniqueUser(userData, options) {

if (userData.username) {
queryValues.push(userData.username);
orConditions.push(`LOWER(username) = LOWER($${queryValues.length})`);
orConditions.push(`LOWER(u.username) = LOWER($${queryValues.length})`);
}

if (userData.email) {
queryValues.push(userData.email);
orConditions.push(`LOWER(email) = LOWER($${queryValues.length})`);
orConditions.push(`LOWER(u.email) = LOWER($${queryValues.length})`);
}

let where = `(${orConditions.join(' OR ')})`;

if (userData.id) {
queryValues.push(userData.id);
where += ` AND id <> $${queryValues.length}`;
where += ` AND u.id <> $${queryValues.length}`;
}

const query = {
text: `
SELECT
username,
email
u.username,
u.email
FROM
users
users u
LEFT JOIN activate_account_tokens aat ON user_id = u.id
WHERE
${where}
(
COALESCE(aat.used, true)
OR aat.expires_at > NOW()
OR 'nuked' = ANY(u.features)
)
AND ${where}
`,
values: queryValues,
};
Expand Down Expand Up @@ -428,6 +436,28 @@ async function validateUniqueUser(userData, options) {
});
}

async function deleteExpiredUsers(userObject) {
const query = {
text: `
DELETE FROM
users u
USING activate_account_tokens aat
WHERE
aat.user_id = u.id
AND COALESCE(aat.used, false) = false
AND aat.expires_at < NOW()
AND NOT ('nuked' = ANY(u.features))
AND (
LOWER(username) = LOWER($2)
OR LOWER(email) = LOWER($1)
)
;`,
values: [userObject.email, userObject.username],
};

await database.query(query);
}

async function hashPasswordInObject(userObject) {
userObject.password = await authentication.hashPassword(userObject.password);
return userObject;
Expand Down
Loading
Loading