Skip to content

Node.js based forum software built for the modern web

refactor: get rid of password in routes, use a reauth route to redirect to login if needed

Barış Soner Uşaklıf0c9d70d037e
diff --git a/public/language/en-GB/groups.json b/public/language/en-GB/groups.json
index b57a7f75b2..32bb34f8ab 100644
--- a/public/language/en-GB/groups.json
+++ b/public/language/en-GB/groups.json
@@ -72,6 +72,7 @@
"new-group.group-name": "Group Name:",
"upload-group-cover": "Upload group cover",
+ "invite-members": "Invite Members",
"bulk-invite-instructions": "Enter a list of comma separated usernames to invite to this group",
"bulk-invite": "Bulk Invite",
"remove-group-cover-confirm": "Are you sure you want to remove the cover picture?"
diff --git a/public/src/admin/manage/admins-mods.js b/public/src/admin/manage/admins-mods.js
index 6937cced33..015b7ddba4 100644
--- a/public/src/admin/manage/admins-mods.js
+++ b/public/src/admin/manage/admins-mods.js
@@ -7,12 +7,7 @@ define('admin/manage/admins-mods', [
AdminsMods.init = function () {
autocomplete.user($('#admin-search'), async function (ev, ui) {
- const password = await modals.promptPassword();
- if (!password) {
- return;
- }
-
- api.put(`/groups/administrators/membership/${ui.item.user.uid}`, { password }).then(() => {
+ api.put(`/groups/administrators/membership/${ui.item.user.uid}`).then(() => {
$('#admin-search').val('');
if ($('.administrator-area [data-uid="' + ui.item.user.uid + '"]').length) {
@@ -31,11 +26,7 @@ define('admin/manage/admins-mods', [
if (parseInt(uid, 10) === parseInt(app.user.uid, 10)) {
return alerts.error('[[admin/manage/users:alerts.no-remove-yourself-admin]]');
}
- const password = await modals.promptPassword();
- if (!password) {
- return;
- }
- api.del(`/groups/administrators/membership/${uid}`, {}, { 'x-password-confirmation': password }).then(() => {
+ api.del(`/groups/administrators/membership/${uid}`).then(() => {
userCard.remove();
}).catch(alerts.error);
});
diff --git a/public/src/admin/modules/change-email.js b/public/src/admin/modules/change-email.js
index 17d8befe25..22268a6c49 100644
--- a/public/src/admin/modules/change-email.js
+++ b/public/src/admin/modules/change-email.js
@@ -22,12 +22,10 @@ define('admin/modules/change-email', [
label: '[[admin/manage/users:alerts.button-change]]',
className: 'btn-primary',
callback: async function () {
- const password = await modals.promptPassword();
const newEmail = modal.find('#newEmail').val();
api.post(`/users/${params.uid}/emails`, {
skipConfirmation: true,
email: newEmail,
- password,
}).then(() => {
modal.modal('hide');
params.onSuccess(newEmail);
diff --git a/public/src/client/account/edit.js b/public/src/client/account/edit.js
index a35c30dbe4..15df0ec5ba 100644
--- a/public/src/client/account/edit.js
+++ b/public/src/client/account/edit.js
@@ -29,13 +29,16 @@ define('forum/account/edit', [
if (!ajaxify.data.isSelf && ajaxify.data.canEdit) {
$(`a[href="${config.relative_path}/user/${ajaxify.data.userslug}/edit/email"]`).on('click', () => {
- changeEmail.init({
- uid: ajaxify.data.uid,
- email: ajaxify.data.email,
- onSuccess: function () {
- alerts.success('[[user:email-updated]]');
- },
- });
+ api.post(`/users/reauth/verify`).then(() => {
+ changeEmail.init({
+ uid: ajaxify.data.uid,
+ email: ajaxify.data.email,
+ onSuccess: function (newEmail) {
+ ajaxify.data.email = newEmail;
+ alerts.success('[[user:email-updated]]');
+ },
+ });
+ }).catch(alerts.error);
return false;
});
}
diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index 9f2bbaeb8f..14b3dc973b 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -1,6 +1,7 @@
'use strict';
define('forum/groups/details', [
+ 'bootstrap',
'forum/groups/memberlist',
'iconSelect',
'components',
@@ -13,7 +14,10 @@ define('forum/groups/details', [
'alerts',
'helpers',
'translator',
+ 'autocomplete',
+ 'benchpressjs',
], function (
+ bootstrap,
memberList,
iconSelect,
components,
@@ -26,6 +30,8 @@ define('forum/groups/details', [
alerts,
helpers,
tx,
+ autocomplete,
+ Benchpress,
) {
const Details = {};
let groupName;
@@ -35,6 +41,8 @@ define('forum/groups/details', [
groupName = ajaxify.data.group.name;
+ handleTabNavigation(detailsPage);
+
if (ajaxify.data.group.isOwner) {
Details.prepareSettings();
@@ -67,7 +75,17 @@ define('forum/groups/details', [
memberList.init();
- handleMemberInvitations();
+ $('[component="groups/invite-members"]').on('click', function () {
+ const isAdminGroup = ajaxify.data.group.slug === 'administrators';
+ if (isAdminGroup) {
+ api.post('/users/reauth/verify').then(() => {
+ handleMemberInvitations();
+ }).catch(alerts.error);
+ } else {
+ handleMemberInvitations();
+ }
+ });
+
components.get('groups/activity').find('.content img:not(.not-responsive)').addClass('img-fluid');
@@ -180,6 +198,31 @@ define('forum/groups/details', [
});
};
+ function handleTabNavigation(detailsPage) {
+ if (window.location.hash) {
+ const tabId = window.location.hash.slice(1);
+ const tabToggle = document.querySelector(
+ `[data-bs-toggle="tab"][data-bs-target="#groups-${tabId}"]`
+ );
+ if (tabToggle) {
+ bootstrap.Tab.getOrCreateInstance(tabToggle).show();
+ }
+ }
+
+ detailsPage.find('[data-bs-toggle="tab"]').on('shown.bs.tab', function (event) {
+ const tabTarget = event.target.getAttribute('data-bs-target');
+ if (!tabTarget || !tabTarget.startsWith('#')) {
+ return;
+ }
+
+ const paneId = tabTarget.slice(1);
+ const hash = paneId.startsWith('groups-') ? `#${paneId.slice('groups-'.length)}` : tabTarget;
+ if (window.location.hash !== hash) {
+ history.replaceState(null, '', hash);
+ }
+ });
+ }
+
Details.prepareSettings = function () {
const settingsFormEl = components.get('groups/settings');
const labelColorValueEl = settingsFormEl.find('[name="labelColor"]');
@@ -304,40 +347,72 @@ define('forum/groups/details', [
);
}
- function handleMemberInvitations() {
+ async function handleMemberInvitations() {
if (!ajaxify.data.group.isOwner) {
return;
}
+ const selectedUids = new Map();
+ const html = await Benchpress.render('partials/groups/invite-members', {});
+ const modal = await modals.dialog({
+ title: '[[groups:invite-members]]',
+ message: html,
+ buttons: {
+ OK: {
+ label: '[[groups:invite-members]]',
+ callback: async function () {
+ const isBulk = modal.find('.tab-pane.active').attr('id') === 'bulk-invite-pane';
+ const uidsToInvite = isBulk ? await getBulkInviteUids() : Array.from(selectedUids.keys());
+ for (const uid of uidsToInvite) {
+ // eslint-disable-next-line no-await-in-loop
+ await doInvite(uid);
+ }
+ updateList();
+ modal.modal('hide');
+ },
+ },
+ },
+ });
+
+ async function doInvite(uid) {
+ return api.post(`/groups/${ajaxify.data.group.slug}/invites/${uid}`)
+ .catch(alerts.error);
+ }
+
+ modal.on('shown.bs.modal', function () {
+ const searchInput = modal.find('[component="groups/members/invite"]');
+ autocomplete.user(searchInput, async function (event, selected) {
+ selectedUids.set(selected.item.user.uid, selected.item.user);
+ await renderSelectedUsers();
+ searchInput.val('');
+ });
+ });
+
async function updateList() {
const data = await api.get(`/api/groups/${ajaxify.data.group.slug}`);
const html = await app.parseAndTranslate('groups/details', 'group.invited', { group: data.group });
$('[component="groups/invited"] tbody').html(html);
updateInviteAlertVisibility();
- memberList.refresh();
+ memberList.refresh(data);
}
- const searchInput = $('[component="groups/members/invite"]');
- require(['autocomplete'], function (autocomplete) {
- autocomplete.user(searchInput, async function (event, selected) {
- const isAdminGroup = ajaxify.data.group.slug === 'administrators';
- const password = isAdminGroup && await modals.promptPassword();
- if (isAdminGroup && !password) {
- return;
- }
- api.post(`/groups/${ajaxify.data.group.slug}/invites/${selected.item.user.uid}`, { password })
- .then(() => updateList()).catch(alerts.error);
- });
+
+ async function renderSelectedUsers() {
+ const html = await app.parseAndTranslate('partials/groups/invite-members', 'selectedUsers', { selectedUsers: Array.from(selectedUids.values()) });
+ modal.find('[component="groups/members/invite-results"]').html(html);
+ }
+
+ modal.find('[component="groups/members/invite-results"]').on('click', '[data-action="remove"]', function () {
+ const userEl = $(this).closest('[data-uid]');
+ const uid = userEl.data('uid');
+ selectedUids.delete(uid);
+ userEl.remove();
});
- $('[component="groups/members/bulk-invite-button"]').on('click', async () => {
+ async function getBulkInviteUids() {
const usernames = $('[component="groups/members/bulk-invite"]').val();
if (!usernames) {
- return false;
- }
- const isAdminGroup = ajaxify.data.group.slug === 'administrators';
- const password = isAdminGroup && await modals.promptPassword();
- if (isAdminGroup && !password) {
- return;
+ return [];
}
+
// Filter out bad usernames
const userslugs = usernames.split(',').map(slugify);
const validSlugs = (await Promise.all(
@@ -345,15 +420,8 @@ define('forum/groups/details', [
)).filter(Boolean);
const uids = await Promise.all(validSlugs.map(slug => api.get(`/users/bySlug/${slug}`).then(({ uid }) => uid)));
-
- await Promise.all(
- uids.map(async uid => api.post(`/groups/${ajaxify.data.group.slug}/invites/${uid}`, {
- ...(password ? { password } : {}),
- }))
- ).then(() => {
- updateList();
- }).catch(alerts.error);
- });
+ return uids;
+ }
}
function removeCover() {
diff --git a/public/src/client/groups/memberlist.js b/public/src/client/groups/memberlist.js
index 45ba1164cf..26135747b0 100644
--- a/public/src/client/groups/memberlist.js
+++ b/public/src/client/groups/memberlist.js
@@ -14,8 +14,8 @@ define('forum/groups/memberlist', [
handleMemberInfiniteScroll();
};
- MemberList.refresh = async function () {
- const { group } = await api.get(`/api/groups/${ajaxify.data.group.slug}`);
+ MemberList.refresh = async function (data) {
+ const { group } = data || await api.get(`/api/groups/${ajaxify.data.group.slug}`);
const html = await parseAndTranslate(group.members);
$('[component="groups/members"] tbody').html(html);
$('[component="group/member/count"]').text(
@@ -34,7 +34,11 @@ define('forum/groups/memberlist', [
};
function handleMemberAdd() {
- $('[component="groups/members/add"]').on('click', function () {
+ $('[component="groups/members/add"]').on('click', async function () {
+ const isAdminGroup = ajaxify.data.group.slug === 'administrators';
+ if (isAdminGroup) {
+ await api.post('/users/reauth/verify');
+ }
Benchpress.render('admin/partials/groups/add-members', {}).then(async function (html) {
const foundUsers = [];
const modal = await modals.dialog({
@@ -85,19 +89,11 @@ define('forum/groups/memberlist', [
}
async function addUsersToGroup(users) {
- const isAdminGroup = ajaxify.data.group.slug === 'administrators';
- const password = isAdminGroup && await modals.promptPassword();
- if (isAdminGroup && !password) {
- return;
- }
-
let addedUsers = [];
for (const user of users) {
try {
// eslint-disable-next-line no-await-in-loop
- await api.put(`/groups/${ajaxify.data.group.slug}/membership/${user.uid}`, {
- ...(isAdminGroup ? { password } : {}),
- });
+ await api.put(`/groups/${ajaxify.data.group.slug}/membership/${user.uid}`);
addedUsers.push(user);
} catch (err) {
alerts.error(err);
@@ -170,25 +166,11 @@ define('forum/groups/memberlist', [
}
MemberList.toggleOwnership = async function (groupslug, uid, isOwner) {
- const isAdminGroup = groupslug === 'administrators';
- const password = isAdminGroup && await modals.promptPassword();
- if (isAdminGroup && !password) {
- return;
- }
- return await api[isOwner ? 'del' : 'put'](`/groups/${groupslug}/ownership/${encodeURIComponent(uid)}`, {
- ...(password ? { password } : {}),
- });
+ return await api[isOwner ? 'del' : 'put'](`/groups/${groupslug}/ownership/${encodeURIComponent(uid)}`);
};
MemberList.kickMember = async function (groupslug, uid) {
- const isAdminGroup = groupslug === 'administrators';
- const password = isAdminGroup && await modals.promptPassword();
- if (isAdminGroup && !password) {
- return;
- }
- return await api.del(`/groups/${groupslug}/membership/${encodeURIComponent(uid)}`, {}, {
- 'x-password-confirmation': password,
- });
+ return await api.del(`/groups/${groupslug}/membership/${encodeURIComponent(uid)}`);
};
return MemberList;
diff --git a/src/controllers/index.js b/src/controllers/index.js
index 5ae210cb84..abea35d516 100644
--- a/src/controllers/index.js
+++ b/src/controllers/index.js
@@ -142,7 +142,7 @@ Controllers.login = async function (req, res) {
if (req.loggedIn) {
const userData = await user.getUserFields(req.uid, ['username']);
data.username = userData.username;
- data.alternate_logins = false;
+ data.reauthNotice = !!req.session.forceLogin;
}
res.render('login', data);
};
diff --git a/src/middleware/index.js b/src/middleware/index.js
index 98ba3e3b1a..9b1cbad720 100644
--- a/src/middleware/index.js
+++ b/src/middleware/index.js
@@ -370,7 +370,7 @@ middleware.requirePasswordAuth = helpers.try(async function (req, res, next) {
// handles both cold load(/foo/baz) and ajaxify(/api/foo/baz) for regular routes
// cold load /foo/baz => returnTo /foo/baz
// ajaxify /api/foo/baz => returnTo /foo/baz
-middleware.requirePageReAuth = function ({ maxAgeInMinutes = 2 } = {}) {
+middleware.requirePageReAuth = function ({ reauthWindowMinutes = 2 } = {}) {
async function redirect(req, res) {
if (res.locals.isAPI) {
req.session.returnTo = req.url.replace(/^\/api/, '');
@@ -386,7 +386,7 @@ middleware.requirePageReAuth = function ({ maxAgeInMinutes = 2 } = {}) {
return await redirect(req, res);
}
- if (isReAuthValid(req, maxAgeInMinutes)) {
+ if (isReAuthValid(req, reauthWindowMinutes)) {
return next();
}
@@ -401,14 +401,14 @@ middleware.requirePageReAuth = function ({ maxAgeInMinutes = 2 } = {}) {
// handles /api/v3 routes only
// POST /api/v3/admin/tokens => returnTo whatever page the user was on via x-return-to
// DIRECT GET /api/v3/admin/groups => returnTo undefined
-middleware.requireAPIReAuth = function ({ maxAgeInMinutes = 5 } = {}) {
+middleware.requireAPIReAuth = function ({ reauthWindowMinutes = 2 } = {}) {
return helpers.try(async (req, res, next) => {
if (!res.locals.isAPI) return next();
if (!req.loggedIn) {
return await controllers.helpers.formatApiResponse(401, res);
}
- if (isReAuthValid(req, maxAgeInMinutes)) {
+ if (isReAuthValid(req, reauthWindowMinutes)) {
return next();
}
@@ -422,10 +422,10 @@ middleware.requireAPIReAuth = function ({ maxAgeInMinutes = 5 } = {}) {
});
};
-function isReAuthValid(req, maxAgeInMinutes) {
+function isReAuthValid(req, reauthWindowMinutes) {
const reAuthAt = req.session.meta?.reAuthAt || 0;
- const maxAgeMs = maxAgeInMinutes * 60 * 1000;
- return reAuthAt && (Date.now() - reAuthAt) <= maxAgeMs;
+ const reauthWindowMs = reauthWindowMinutes * 60 * 1000;
+ return reAuthAt && (Date.now() - reAuthAt) <= reauthWindowMs;
}
async function triggerReLoginHook(req, res) {
diff --git a/src/routes/user.js b/src/routes/user.js
index 99f788bd21..f6e32f3cc0 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -42,8 +42,8 @@ module.exports = function (app, name, middleware, controllers) {
setupPageRoute(app, `/${name}/:userslug/downvoted`, accountMiddlewares, controllers.accounts.posts.getDownVotedPosts);
setupPageRoute(app, `/${name}/:userslug/edit`, accountMiddlewares, controllers.accounts.edit.get);
setupPageRoute(app, `/${name}/:userslug/edit/username`, accountMiddlewares, controllers.accounts.edit.username);
- setupPageRoute(app, `/${name}/:userslug/edit/email`, accountMiddlewares, controllers.accounts.edit.email);
- setupPageRoute(app, `/${name}/:userslug/edit/password`, accountMiddlewares, controllers.accounts.edit.password);
+ setupPageRoute(app, `/${name}/:userslug/edit/email`, [...accountMiddlewares, middleware.requirePageReAuth()], controllers.accounts.edit.email);
+ setupPageRoute(app, `/${name}/:userslug/edit/password`, [...accountMiddlewares, middleware.requirePageReAuth()], controllers.accounts.edit.password);
setupPageRoute(app, `/${name}/:userslug/info`, accountMiddlewares, controllers.accounts.info.get);
setupPageRoute(app, `/${name}/:userslug/settings`, accountMiddlewares, controllers.accounts.settings.get);
setupPageRoute(app, `/${name}/:userslug/uploads`, accountMiddlewares, controllers.accounts.uploads.get);
diff --git a/src/routes/write/groups.js b/src/routes/write/groups.js
index 507a60ca3c..ca19b7ba49 100644
--- a/src/routes/write/groups.js
+++ b/src/routes/write/groups.js
@@ -10,14 +10,14 @@ const { setupApiRoute } = routeHelpers;
module.exports = function () {
const middlewares = [middleware.ensureLoggedIn];
const groupsReAuth = middleware.requireAPIReAuth({
- maxAgeInMinutes: 5,
+ maxAgeInMinutes: 2,
});
- async function groupReAuthMiddleware(req, res, next) {
+ async function groupReAuthAdminOnly(req, res, next) {
if (req.params.slug === 'administrators') {
- await middleware.requirePasswordAuth(req, res, next);
- } else {
await groupsReAuth(req, res, next);
+ } else {
+ next();
}
}
@@ -29,18 +29,18 @@ module.exports = function () {
setupApiRoute(router, 'get', '/:slug/members', [...middlewares, middleware.assert.group], controllers.write.groups.listMembers);
- setupApiRoute(router, 'put', '/:slug/membership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.join);
- setupApiRoute(router, 'delete', '/:slug/membership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.leave);
+ setupApiRoute(router, 'put', '/:slug/membership/:uid', [...middlewares, middleware.assert.group, groupReAuthAdminOnly], controllers.write.groups.join);
+ setupApiRoute(router, 'delete', '/:slug/membership/:uid', [...middlewares, middleware.assert.group, groupReAuthAdminOnly], controllers.write.groups.leave);
- setupApiRoute(router, 'put', '/:slug/ownership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.grant);
- setupApiRoute(router, 'delete', '/:slug/ownership/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.rescind);
+ setupApiRoute(router, 'put', '/:slug/ownership/:uid', [...middlewares, middleware.assert.group, groupsReAuth], controllers.write.groups.grant);
+ setupApiRoute(router, 'delete', '/:slug/ownership/:uid', [...middlewares, middleware.assert.group, groupsReAuth], controllers.write.groups.rescind);
setupApiRoute(router, 'get', '/:slug/pending', [...middlewares, middleware.assert.group], controllers.write.groups.getPending);
setupApiRoute(router, 'put', '/:slug/pending/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.accept);
setupApiRoute(router, 'delete', '/:slug/pending/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.reject);
setupApiRoute(router, 'get', '/:slug/invites', [...middlewares, middleware.assert.group], controllers.write.groups.getInvites);
- setupApiRoute(router, 'post', '/:slug/invites/:uid', [...middlewares, middleware.assert.group, groupReAuthMiddleware], controllers.write.groups.issueInvite);
+ setupApiRoute(router, 'post', '/:slug/invites/:uid', [...middlewares, middleware.assert.group, groupReAuthAdminOnly], controllers.write.groups.issueInvite);
setupApiRoute(router, 'put', '/:slug/invites/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.acceptInvite);
setupApiRoute(router, 'delete', '/:slug/invites/:uid', [...middlewares, middleware.assert.group], controllers.write.groups.rejectInvite);
diff --git a/src/routes/write/users.js b/src/routes/write/users.js
index c2759089b1..46c80bde2d 100644
--- a/src/routes/write/users.js
+++ b/src/routes/write/users.js
@@ -15,21 +15,28 @@ function guestRoutes() {
function authenticatedRoutes() {
const middlewares = [middleware.ensureLoggedIn];
- const requirePasswordForEmailChange = async function (req, res, next) {
+ const reauthMiddleware = middleware.requireAPIReAuth({ reauthWindowMinutes: 2 });
+
+ const requireApiReAuthForEmailChange = async function (req, res, next) {
+ // only reauth api.user.update if email is sent and the user is trying to change someone else's email
const isChangingSomeonesEmail = req?.body?.email && String(req.uid) !== String(req.params.uid);
if (isChangingSomeonesEmail) {
- await middleware.requirePasswordAuth(req, res, next);
+ await reauthMiddleware(req, res, next);
} else {
next();
}
};
+ setupApiRoute(router, 'post', '/reauth/verify', [reauthMiddleware], function (req, res) {
+ res.json({ reauth: true });
+ });
+
setupApiRoute(router, 'post', '/', [...middlewares, middleware.checkRequired.bind(null, ['username'])], controllers.write.users.create);
setupApiRoute(router, 'delete', '/', [...middlewares, middleware.checkRequired.bind(null, ['uids'])], controllers.write.users.deleteMany);
setupApiRoute(router, 'head', '/:uid', [middleware.assert.user], controllers.write.users.exists);
setupApiRoute(router, 'get', '/:uid', [...middlewares, middleware.assert.user], controllers.write.users.get);
- setupApiRoute(router, 'put', '/:uid', [...middlewares, middleware.assert.user, requirePasswordForEmailChange], controllers.write.users.update);
+ setupApiRoute(router, 'put', '/:uid', [...middlewares, middleware.assert.user, requireApiReAuthForEmailChange], controllers.write.users.update);
setupApiRoute(router, 'delete', '/:uid', [...middlewares, middleware.assert.user], controllers.write.users.delete);
setupApiRoute(router, 'put', '/:uid/picture', [...middlewares, middleware.assert.user], controllers.write.users.changePicture);
setupApiRoute(router, 'delete', '/:uid/content', [...middlewares, middleware.assert.user], controllers.write.users.deleteContent);
@@ -42,7 +49,7 @@ function authenticatedRoutes() {
setupApiRoute(router, 'put', '/:uid/settings', [...middlewares, middleware.checkRequired.bind(null, ['settings'])], controllers.write.users.updateSettings);
- setupApiRoute(router, 'put', '/:uid/password', [...middlewares, middleware.checkRequired.bind(null, ['newPassword']), middleware.assert.user, middleware.requireAPIReAuth()], controllers.write.users.changePassword);
+ setupApiRoute(router, 'put', '/:uid/password', [...middlewares, middleware.checkRequired.bind(null, ['newPassword']), middleware.assert.user, reauthMiddleware], controllers.write.users.changePassword);
setupApiRoute(router, 'put', '/:uid/follow', [...middlewares, middleware.assert.user], controllers.write.users.follow);
setupApiRoute(router, 'delete', '/:uid/follow', [...middlewares, middleware.assert.user], controllers.write.users.unfollow);
@@ -62,7 +69,7 @@ function authenticatedRoutes() {
setupApiRoute(router, 'get', '/:uid/invites/groups', [...middlewares, middleware.assert.user], controllers.write.users.getInviteGroups);
setupApiRoute(router, 'get', '/:uid/emails', [...middlewares, middleware.assert.user], controllers.write.users.listEmails);
- setupApiRoute(router, 'post', '/:uid/emails', [...middlewares, middleware.assert.user, requirePasswordForEmailChange], controllers.write.users.addEmail);
+ setupApiRoute(router, 'post', '/:uid/emails', [...middlewares, middleware.assert.user, reauthMiddleware], controllers.write.users.addEmail);
setupApiRoute(router, 'get', '/:uid/emails/:email', [...middlewares, middleware.assert.user], controllers.write.users.getEmail);
setupApiRoute(router, 'post', '/:uid/emails/:email/confirm', [...middlewares, middleware.assert.user], controllers.write.users.confirmEmail);
diff --git a/src/views/groups/details.tpl b/src/views/groups/details.tpl
index cb9f2bb6fa..ef63641153 100644
--- a/src/views/groups/details.tpl
+++ b/src/views/groups/details.tpl
@@ -65,7 +65,11 @@
</div>
<div class="tab-pane fade" id="groups-invited" role="tabpanel">
- <h3 class="fw-semibold fs-5 mb-3">[[groups:details.invited]]</h3>
+ <div class="d-flex align-items-center justify-content-between mb-3">
+ <h3 class="fw-semibold fs-5">[[groups:details.invited]]</h3>
+ <button component="groups/invite-members" class="btn btn-primary btn-sm" type="button">[[groups:invite-members]]</button>
+ </div>
+
<!-- IMPORT partials/groups/invited.tpl -->
</div>
diff --git a/src/views/login.tpl b/src/views/login.tpl
index b5968ddf78..ac3da6be61 100644
--- a/src/views/login.tpl
+++ b/src/views/login.tpl
@@ -5,6 +5,13 @@
</div>
<div class="row login flex-fill">
<div class="d-flex flex-column gap-2 {{{ if widgets.sidebar.length }}}col-lg-9 col-sm-12{{{ else }}}col-lg-12{{{ end }}}">
+ {{{ if reauthNotice }}}
+ <div class="d-flex justify-content-center">
+ <div class="alert alert-warning" role="alert">
+ [[error:api.reauth-required]]
+ </div>
+ </div>
+ {{{ end }}}
<h2 class="tracking-tight fw-semibold text-center">[[global:login]]</h2>
<div class="row justify-content-center gap-5">
{{{ if allowLocalLogin }}}
diff --git a/src/views/partials/groups/invite-members.tpl b/src/views/partials/groups/invite-members.tpl
new file mode 100644
index 0000000000..99caae6157
--- /dev/null
+++ b/src/views/partials/groups/invite-members.tpl
@@ -0,0 +1,75 @@
+<div class="">
+ <div class="col-12">
+ <ul class="nav nav-tabs mb-3" role="tablist">
+ <li class="nav-item" role="presentation">
+ <button
+ class="nav-link active fw-semibold"
+ id="invite-member-tab"
+ data-bs-toggle="tab"
+ data-bs-target="#invite-member-pane"
+ type="button"
+ role="tab"
+ aria-controls="invite-member-pane"
+ aria-selected="true"
+ >
+ {{tx("groups:invite-members")}}
+ </button>
+ </li>
+
+ <li class="nav-item" role="presentation">
+ <button
+ class="nav-link fw-semibold"
+ id="bulk-invite-tab"
+ data-bs-toggle="tab"
+ data-bs-target="#bulk-invite-pane"
+ type="button"
+ role="tab"
+ aria-controls="bulk-invite-pane"
+ aria-selected="false"
+ >
+ {{tx("groups:bulk-invite")}}
+ </button>
+ </li>
+ </ul>
+
+ <div class="tab-content">
+ <div
+ class="tab-pane fade show active"
+ id="invite-member-pane"
+ role="tabpanel"
+ aria-labelledby="invite-member-tab"
+ tabindex="0"
+ >
+ <label class="form-label text-sm">[[groups:invited.search]]</label>
+ <div class="input-group mb-3">
+ <input class="form-control" type="text" component="groups/members/invite"/>
+ <span class="input-group-text search-button"><i class="fa fa-search"></i></span>
+ </div>
+ <div component="groups/members/invite-results" class="d-flex">
+ {{{ each selectedUsers }}}
+ <div data-uid="{./uid}" class="badge text-bg-light m-1 p-1 border d-inline-flex gap-1 align-items-center">
+ {{buildAvatar(@value, "24px", true)}}
+ <a href="{config.relative_path}/user/{./userslug}">{./username}</a>
+ <button class="btn btn-ghost btn-sm p-0" data-action="remove">
+ <i class="fa fa-fw fa-times"></i>
+ </button>
+ </div>
+ {{{ end }}}
+ </div>
+ </div>
+
+ <div
+ class="tab-pane fade"
+ id="bulk-invite-pane"
+ role="tabpanel"
+ aria-labelledby="bulk-invite-tab"
+ tabindex="0"
+ >
+ <div class="">
+ <label class="form-label text-sm">[[groups:bulk-invite-instructions]]</label>
+ <textarea class="form-control" component="groups/members/bulk-invite"></textarea>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/views/partials/groups/invited.tpl b/src/views/partials/groups/invited.tpl
index 3b15ce0143..606a3b4a21 100644
--- a/src/views/partials/groups/invited.tpl
+++ b/src/views/partials/groups/invited.tpl
@@ -1,18 +1,3 @@
-<label class="text-xs text-muted">[[groups:invited.search]]</label>
-<div class="input-group mb-2">
- <input class="form-control" type="text" component="groups/members/invite"/>
- <span class="input-group-text search-button"><i class="fa fa-search"></i></span>
-</div>
-
-<div class="mb-2">
- <label class="text-xs text-muted">[[groups:bulk-invite-instructions]]</label>
- <textarea class="form-control" component="groups/members/bulk-invite"></textarea>
-</div>
-
-<div class="mb-2 clearfix">
- <button type="button" class="btn btn-primary btn-sm float-end" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button>
-</div>
-
<div style="max-height: 500px; overflow: auto;">
<div component="groups/invited/alert" class="alert alert-info {{{ if group.invited.length }}}hidden{{{ end }}}">[[groups:invited.none]]</div>
<table component="groups/invited" class="table table-hover">