jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Invitation is now also just a single route like password reset

Browse Source
This commit is contained in:
Johannes Zellner
2021-09-16 14:56:10 +02:00
parent 074ce574dd
commit 6785253377
4 changed files with 18 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/routes/users.js
View File

@@ -8,7 +8,6 @@ exports = module.exports = {
del,
setPassword,
verifyPassword,
createInvite,
sendInvite,
setGroups,
makeOwner,
@@ -140,17 +139,6 @@ async function verifyPassword(req, res, next) {
next();
}
async function createInvite(req, res, next) {
assert.strictEqual(typeof req.resource, 'object');
if (users.compareRoles(req.user.role, req.resource.role) < 0) return next(new HttpError(403, `role '${req.resource.role}' is required but user has only '${req.user.role}'`));
const [error, result] = await safe(users.createInvite(req.resource, auditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, result));
}
async function disableTwoFactorAuthentication(req, res, next) {
assert.strictEqual(typeof req.resource, 'object');
@@ -167,10 +155,10 @@ async function sendInvite(req, res, next) {
if (users.compareRoles(req.user.role, req.resource.role) < 0) return next(new HttpError(403, `role '${req.resource.role}' is required but user has only '${req.user.role}'`));
const [error] = await safe(users.sendInvite(req.resource, { invitor: req.user }));
const [error, inviteLink ] = await safe(users.sendInvite(req.resource, { invitor: req.user }, auditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, { }));
next(new HttpSuccess(200, { inviteLink }));
}
async function setGroups(req, res, next) {