mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-01-20 06:22:50 +01:00
* chore: up deps * chore: up composer * fix(deps): bump 2factor to v7 * chore: up harmony * chore: up harmony * fix: missing await * feat: allow middlewares to pass in template values via res.locals * feat: buildAccountData middleware automatically added ot all account routes * fix: properly allow values in res.locals.templateValues to be added to the template data * refactor: user/blocks * refactor(accounts): categories and consent * feat: automatically 404 if exposeUid or exposeGroupName come up empty * refactor: remove calls to getUserDataByUserSlug for most account routes, since it is populated via middleware now * fix: allow exposeUid and exposeGroupName to work with slugs with mixed capitalization * fix: move reputation removal check to accountHelpers method * test: skip i18n tests if ref branch when present is not develop * fix(deps): bump theme versions * fix(deps): bump ntfy and 2factor * chore: up harmony * fix: add missing return * fix: #11191, only focus on search input on md environments and up * feat: allow file uploads on mobile chat closes https://github.com/NodeBB/NodeBB/issues/11217 * chore: up themes * chore: add lang string * fix(deps): bump ntfy to 1.0.15 * refactor: use new if/each syntax * chore: up composer * fix: regression from user helper refactor * chore: up harmony * chore: up composer * chore: up harmony * chore: up harmony * chore: up harmony * chore: fix composer version * feat: add increment helper * chore: up harmony * fix: #11228 no timestamps in future ⌛ * chore: up harmony * check config.theme as well fire action:posts.loaded after processing dom * chore: up harmony * chore: up harmony * chore: up harmony * chore: up themes * chore: up harmony * remove extra class * refactor: move these to core from harmony * chore: up widgets * chore: up widgets * height auto * fix: closes #11238 * dont focus inputs, annoying on mobile * fix: dont focus twice, only focus on chat input on desktop dont wrap widget footer in row * chore: up harmony * chore: up harmony * update chat window * chore: up themes * fix cache buster for skins * chat fixes * chore: up harmony * chore: up composer * refactor: change hook logs to debug * fix: scroll to post right after adding to dom * fix: hash scrolling and highlighting correct post * test: re-enable read API schema tests * fix: add back schema changes for179faa2270andc3920ccb10* fix: schema changes from488f0978a4* fix: schema changes forf4cf482a87* fix: schema update forbe6bbabd0e* fix: schema changes for69c96078ea* fix: schema changes ford1364c3130* fix: schema changes for84ff1152f7* fix: schema changes forb860c2605c* fix: schema changes for23cb67a112* fix: schema changes forb916e42f40* fix: schema change fora9bbb586fc* fix: schema changes for4b738c8cd3* fix: schema changes for58b5781cea* fix: schema changes for794bf01b21* fix: schema changes for80ea12c1c1,e368feef51, and52ead114be* fix: composer-default object in config? * fix: schema changes for9acdc6808cand0930934200* fix: schema changes forc0a52924f1* fix: schema change foraba420a3f3, move loggedInUser to optional props * fix: schema changes for8c67031609* fix: schema changes for27e53b42f3* fix: schema changes for2835966518* fix: breaking test for email confirmation API call * fix: schema changes for refactored search page * fix: schema changes for user object * fix: schema changes for9f531f957e* fix: schema changes forc4042c70deand23175110a2* fix: schema changes for9b3616b103* fix: schema changes for5afd5de07d* fix: schema change for1d7baf1217* fix: schema changes for57bfb37c55andbe6bbabd0e* fix: schema changes for6e86b4afa2and3efad2e13band68f66223e7* fix: allowing optional qs prop in pagination keys (not sure why this didn't break before) * fix: re-login on email change * fix: schema changes forc926358d73* fix: schema changes for388a8270c9* fix: schema change for2658bcc821* fix: no need to call account middlewares for chats routes * fix: schema changes for71743affc3* fix: final schema changes * test: support for anyOf and oneOf * fix: check thumb * dont scroll to top on back press * remove group log * fix: add top margin to merged and deleted alerts * chore: up widgets * fix: improve fix-lists mixin * chore: up harmony/composer * feat: allow hiding quicksearch results during search * dont record searches made by composer * chore: up 54 * chore: up spam be gone * feat: add prev/next page and page count into mobile paginator * chore: up harmony * chore: up harmony * use old style for IS * fix: hide entire toolbar row if no posts or not singlePost * fix: updated messaging for post-queue template, #11206 * fix: btn-sm on post queue back button * fix: bump harmony, closes #11206 * fix: remove unused alert module import * fix: bump harmony * fix: bump harmony * chore: up harmony * refactor: IS scrolltop * fix: update users:search-user-for-chat source string * feat: support for mark-read toggle on chats dropdown and recent chats list * feat: api v3 calls to mark chat read/unread * feat: send event:chats.mark socket event on mark read or unread * refactor: allow frontend to mark chats as unread, use new API v3 routes instead of socket calls, better frontend event handling * docs: openapi schema updates for chat marking * fix: allow unread state toggling in chats dropdown too * fix: issue where repeated openings of the chats dropdown would continually add events for mark-read/unread * fix: debug log * refactor: move userSearch filter to a module * feat(routes): allow remounting /categories (#11230) * feat: send flags count to frontend on flags list page * refactor: filter form client-side js to extract out some logic * fix: applyFilters to not take any arguments, update selectedCids in updateButton instead of onHidden * fix: use userFilter module for assignee, reporterId, targetUid * fix(openapi): schema changes for updated flags page * fix: dont allow adding duplicates to userFilter * use same var * remove log * fix: closes #11282 * feat: lang key for x-topics * chore: up harmony * chore: up emoji * chore: up harmony * fix: update userFilter to allow new option `selectedBlock` * fix: wrong block name passed to userFilter * fix: https://github.com/NodeBB/NodeBB/issues/11283 * fix: chats, allow multiple dropdowns like in harmony * chore: up harmony * refactor: flag note adding/editing, closes #11285 * fix: remove old prepareEdit logic * chore: add caveat about hacky code block in userFilter module * fix: placeholders for userFilter module * refactor: navigator so it works with multiple thumbs/navigators * chore: up harmony * fix: closes #11287, destroy quick reply autocomplete on navigation * fix: filter disabled categories on user categories page count * chore: up harmony * docs: update openapi spec to include info about passing in timestamps for topic creation, removing timestamp as valid request param for topic replying * fix: send back null values on ACP search dashboard for startDate and endDate if not expicitly passed in, fix tests * fix: tweak table order in ACP dash searches * fix: only invoke navigator click drag on left mouse button * feat: add back unread indicator to navigator * clear bookmark on mark unread * fix: navigator crash on ajaxify * better thumb top calculation * fix: reset user bookmark when topic is marked unread * Revert "fix: reset user bookmark when topic is marked unread" This reverts commit9bcd85c2c6. * fix: update unread indicator on scroll, add unread count * chore: bump harmony * fix: crash on navigator unread update when backing out of a topic * fix: closes #11183 * fix: update topics:recent zset when rescheduling a topic * fix: dupe quote button, increase delay, hide immediately on empty selection * fix: navigator not showing up on first load * refactor: remove glance assorted fixes to navigator dont reduce remaning count if user scrolls down and up quickly only call topic.navigatorCallback when index changes * more sanity checks for bookmark dont allow setting bookmark higher than topic postcount * closes #11218, 🚋 * Revert "fix: update topics:recent zset when rescheduling a topic" This reverts commit737973cca9. * fix: #11306, show proper error if queued post doesn't exist was showing no-privileges if someone else accepted the post * https://github.com/NodeBB/NodeBB/issues/11307 dont use li * chore: up harmony * chore: bump version string * fix: copy paste fail * feat: closes #7382, tag filtering add client side support for filtering by tags on /category, /recent and /unread * chore: up harmony * chore: up harmony * Revert "fix: add back req.query fallback for backwards compatibility" [breaking] This reverts commitcf6cc2c454. This commit is no longer required as passing in a CSRF token via query parameter is no longer supported as of NodeBB v3.x This is a breaking change. * fix: pass csrf token in form data, re: NodeBB/NodeBB#11309 * chore: up deps * fix: tests, use x-csrf-token query param removed * test: fix csrf_token * lint: remove unused * feat: add itemprop="image" to avatar helper * fix: get chat upload button in chat modal * breaking: remove deprecated socket.io methods * test: update messaging tests to not use sockets * fix: parent post links * fix: prevent post tooltip if mouse leaves before data/tpl is loaded * chore: up harmony * chore: up harmony * chore: up harmony * chore: up harmony * fix: nested replies indices * fix(deps): bump 2factor * feat: add loggedIn user to all api routes * chore: up themes * refactor: audit admin v3 write api routes as per #11321 * refactor: audit category v3 write api routes as per #11321 [breaking] docs: fix open api spec for #11321 * refactor: audit chat v3 write api routes as per #11321 * refactor: audit files v3 write api routes as per #11321 * refactor: audit flags v3 write api routes as per #11321 * refactor: audit posts v3 write api routes as per #11321 * refactor: audit topics v3 write api routes as per #11321 * refactor: audit users v3 write api routes as per #11321 * fix: lang string * remove min height * fix: empty topic/labels taking up space * fix: tag filtering when changing filter to watched topics or changing popular time limit to month * chore: up harmony * fix: closes #11354, show no post error if queued post already accepted/rejected * test: #11354 * test: #11354 * fix(deps): bump 2factor * fix: #11357 clear cache on thumb remove * fix: thumb remove on windows, closes #11357 * test: openapi for thumbs * test: fix openapi --------- Co-authored-by: Julian Lam <julian@nodebb.org> Co-authored-by: Opliko <opliko.reg@protonmail.com>
189 lines
5.9 KiB
JavaScript
189 lines
5.9 KiB
JavaScript
|
|
'use strict';
|
|
|
|
const async = require('async');
|
|
const nconf = require('nconf');
|
|
const validator = require('validator');
|
|
|
|
const db = require('../database');
|
|
const meta = require('../meta');
|
|
const emailer = require('../emailer');
|
|
const groups = require('../groups');
|
|
const translator = require('../translator');
|
|
const utils = require('../utils');
|
|
const plugins = require('../plugins');
|
|
|
|
module.exports = function (User) {
|
|
User.getInvites = async function (uid) {
|
|
const emails = await db.getSetMembers(`invitation:uid:${uid}`);
|
|
return emails.map(email => validator.escape(String(email)));
|
|
};
|
|
|
|
User.getInvitesNumber = async function (uid) {
|
|
return await db.setCount(`invitation:uid:${uid}`);
|
|
};
|
|
|
|
User.getInvitingUsers = async function () {
|
|
return await db.getSetMembers('invitation:uids');
|
|
};
|
|
|
|
User.getAllInvites = async function () {
|
|
const uids = await User.getInvitingUsers();
|
|
const invitations = await async.map(uids, User.getInvites);
|
|
return invitations.map((invites, index) => ({
|
|
uid: uids[index],
|
|
invitations: invites,
|
|
}));
|
|
};
|
|
|
|
User.sendInvitationEmail = async function (uid, email, groupsToJoin) {
|
|
if (!uid) {
|
|
throw new Error('[[error:invalid-uid]]');
|
|
}
|
|
|
|
const email_exists = await User.getUidByEmail(email);
|
|
if (email_exists) {
|
|
// Silently drop the invitation if the invited email already exists locally
|
|
return true;
|
|
}
|
|
|
|
const invitation_exists = await db.exists(`invitation:uid:${uid}:invited:${email}`);
|
|
if (invitation_exists) {
|
|
throw new Error('[[error:email-invited]]');
|
|
}
|
|
|
|
const data = await prepareInvitation(uid, email, groupsToJoin);
|
|
await emailer.sendToEmail('invitation', email, meta.config.defaultLang, data);
|
|
plugins.hooks.fire('action:user.invite', { uid, email, groupsToJoin });
|
|
};
|
|
|
|
User.verifyInvitation = async function (query) {
|
|
if (!query.token) {
|
|
if (meta.config.registrationType.startsWith('admin-')) {
|
|
throw new Error('[[register:invite.error-admin-only]]');
|
|
} else {
|
|
throw new Error('[[register:invite.error-invite-only]]');
|
|
}
|
|
}
|
|
const token = await db.getObjectField(`invitation:token:${query.token}`, 'token');
|
|
if (!token || token !== query.token) {
|
|
throw new Error('[[register:invite.error-invalid-data]]');
|
|
}
|
|
};
|
|
|
|
User.confirmIfInviteEmailIsUsed = async function (token, enteredEmail, uid) {
|
|
if (!enteredEmail) {
|
|
return;
|
|
}
|
|
const email = await db.getObjectField(`invitation:token:${token}`, 'email');
|
|
// "Confirm" user's email if registration completed with invited address
|
|
if (email && email === enteredEmail) {
|
|
await User.setUserField(uid, 'email', email);
|
|
await User.email.confirmByUid(uid);
|
|
}
|
|
};
|
|
|
|
User.joinGroupsFromInvitation = async function (uid, token) {
|
|
let groupsToJoin = await db.getObjectField(`invitation:token:${token}`, 'groupsToJoin');
|
|
|
|
try {
|
|
groupsToJoin = JSON.parse(groupsToJoin);
|
|
} catch (e) {
|
|
return;
|
|
}
|
|
|
|
if (!groupsToJoin || groupsToJoin.length < 1) {
|
|
return;
|
|
}
|
|
|
|
await groups.join(groupsToJoin, uid);
|
|
};
|
|
|
|
User.deleteInvitation = async function (invitedBy, email) {
|
|
const invitedByUid = await User.getUidByUsername(invitedBy);
|
|
if (!invitedByUid) {
|
|
throw new Error('[[error:invalid-username]]');
|
|
}
|
|
const token = await db.get(`invitation:uid:${invitedByUid}:invited:${email}`);
|
|
await Promise.all([
|
|
deleteFromReferenceList(invitedByUid, email),
|
|
db.setRemove(`invitation:invited:${email}`, token),
|
|
db.delete(`invitation:token:${token}`),
|
|
]);
|
|
};
|
|
|
|
User.deleteInvitationKey = async function (registrationEmail, token) {
|
|
if (registrationEmail) {
|
|
const uids = await User.getInvitingUsers();
|
|
await Promise.all(uids.map(uid => deleteFromReferenceList(uid, registrationEmail)));
|
|
// Delete all invites to an email address if it has joined
|
|
const tokens = await db.getSetMembers(`invitation:invited:${registrationEmail}`);
|
|
const keysToDelete = [`invitation:invited:${registrationEmail}`].concat(tokens.map(token => `invitation:token:${token}`));
|
|
await db.deleteAll(keysToDelete);
|
|
}
|
|
if (token) {
|
|
const invite = await db.getObject(`invitation:token:${token}`);
|
|
if (!invite) {
|
|
return;
|
|
}
|
|
await deleteFromReferenceList(invite.inviter, invite.email);
|
|
await db.deleteAll([
|
|
`invitation:invited:${invite.email}`,
|
|
`invitation:token:${token}`,
|
|
]);
|
|
}
|
|
};
|
|
|
|
async function deleteFromReferenceList(uid, email) {
|
|
await Promise.all([
|
|
db.setRemove(`invitation:uid:${uid}`, email),
|
|
db.delete(`invitation:uid:${uid}:invited:${email}`),
|
|
]);
|
|
const count = await db.setCount(`invitation:uid:${uid}`);
|
|
if (count === 0) {
|
|
await db.setRemove('invitation:uids', uid);
|
|
}
|
|
}
|
|
|
|
async function prepareInvitation(uid, email, groupsToJoin) {
|
|
const inviterExists = await User.exists(uid);
|
|
if (!inviterExists) {
|
|
throw new Error('[[error:invalid-uid]]');
|
|
}
|
|
|
|
const token = utils.generateUUID();
|
|
const registerLink = `${nconf.get('url')}/register?token=${token}`;
|
|
|
|
const expireDays = meta.config.inviteExpiration;
|
|
const expireIn = expireDays * 86400000;
|
|
|
|
await db.setAdd(`invitation:uid:${uid}`, email);
|
|
await db.setAdd('invitation:uids', uid);
|
|
// Referencing from uid and email to token
|
|
await db.set(`invitation:uid:${uid}:invited:${email}`, token);
|
|
// Keeping references for all invites to this email address
|
|
await db.setAdd(`invitation:invited:${email}`, token);
|
|
await db.setObject(`invitation:token:${token}`, {
|
|
email,
|
|
token,
|
|
groupsToJoin: JSON.stringify(groupsToJoin),
|
|
inviter: uid,
|
|
});
|
|
await db.pexpireAt(`invitation:token:${token}`, Date.now() + expireIn);
|
|
|
|
const username = await User.getUserField(uid, 'username');
|
|
const title = meta.config.title || meta.config.browserTitle || 'NodeBB';
|
|
const subject = await translator.translate(`[[email:invite, ${title}]]`, meta.config.defaultLang);
|
|
|
|
return {
|
|
...emailer._defaultPayload, // Append default data to this email payload
|
|
site_title: title,
|
|
registerLink: registerLink,
|
|
subject: subject,
|
|
username: username,
|
|
template: 'invitation',
|
|
expireDays: expireDays,
|
|
};
|
|
}
|
|
};
|