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

Start using req.resources = { app, volume, ...} pattern

Browse Source 
Reason was that req.app was clashing with expressjs v5 which
stores the main expressjs app object there
This commit is contained in:
Johannes Zellner
2025-06-10 11:02:41 +02:00
parent a556237963
commit 2e4bc5e218
12 changed files with 223 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/groups.js
+9 -9
View File
@@ -27,7 +27,7 @@ async function load(req, res, next) {
if (error) return next(BoxError.toHttpError(error));
if (!result) return next(new HttpError(404, 'Group not found'));
req.resource = result;
req.resources.group = result;
next();
}
@@ -46,41 +46,41 @@ async function add(req, res, next) {
async function get(req, res, next) {
assert.strictEqual(typeof req.params.groupId, 'string');
next(new HttpSuccess(200, req.resource));
next(new HttpSuccess(200, req.resources.group));
}
async function setName(req, res, next) {
assert.strictEqual(typeof req.resource, 'object');
assert.strictEqual(typeof req.resources.group, 'object');
assert.strictEqual(typeof req.body, 'object');
if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
const [error] = await safe(groups.setName(req.resource, req.body.name, AuditSource.fromRequest(req)));
const [error] = await safe(groups.setName(req.resources.group, req.body.name, AuditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, {}));
}
async function setMembers(req, res, next) {
assert.strictEqual(typeof req.resource, 'object');
assert.strictEqual(typeof req.resources.group, 'object');
if (!req.body.userIds) return next(new HttpError(404, 'missing or invalid userIds fields'));
if (!Array.isArray(req.body.userIds)) return next(new HttpError(404, 'userIds must be an array'));
if (req.body.userIds.some((u) => typeof u !== 'string')) return next(new HttpError(400, 'userIds array must contain strings'));
const [error] = await safe(groups.setMembers(req.resource, req.body.userIds, { skipSourceCheck: false }, AuditSource.fromRequest(req)));
const [error] = await safe(groups.setMembers(req.resources.group, req.body.userIds, { skipSourceCheck: false }, AuditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, {}));
}
async function setAllowedApps(req, res, next) {
assert.strictEqual(typeof req.resource, 'object');
assert.strictEqual(typeof req.resources.group, 'object');
if (!req.body.appIds) return next(new HttpError(404, 'missing or invalid userIds fields'));
if (!Array.isArray(req.body.appIds)) return next(new HttpError(404, 'appIds must be an array'));
if (req.body.appIds.some((a) => typeof a !== 'string')) return next(new HttpError(400, 'appIds array must contain strings'));
const [error] = await safe(groups.setAllowedApps(req.resource, req.body.appIds, AuditSource.fromRequest(req)));
const [error] = await safe(groups.setAllowedApps(req.resources.group, req.body.appIds, AuditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, {}));
@@ -96,7 +96,7 @@ async function list(req, res, next) {
async function del(req, res, next) {
assert.strictEqual(typeof req.params.groupId, 'string');
const [error] = await safe(groups.del(req.resource, AuditSource.fromRequest(req)));
const [error] = await safe(groups.del(req.resources.group, AuditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(204));