Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 11:37:08 +00:00
Code Issues Packages Projects Releases Activity

Refactor class User (clean up)

Browse Source
This commit is contained in:
D. Berge
2025-07-24 23:01:34 +02:00
parent b1b7332216
commit 84c1385f88
2 changed files with 16 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
lib/modules/@dougal/user/User.js
View File

@@ -218,7 +218,7 @@ class User extends EventEmitter {
if (this.organisations.value("*")) { if (this.organisations.value("*")) {
return list; return list;
} else { } else {
return list.filter( user => this.canSee(user) ); return list.filter( user => this.canRead(user) );
// return list.filter( user => // return list.filter( user =>
// user.organisations.value("*") || // user.organisations.value("*") ||
// user.organisations.filter(this.organisations).length > 0 // user.organisations.filter(this.organisations).length > 0
@@ -255,71 +255,32 @@ class User extends EventEmitter {
return this.id == other.id; return this.id == other.id;
} }
/** Return `true` if we can see `other` canDo (operation, other) {
* if (this.organisations.get('*')?.[operation])
* If we are wildcarded, we can see everyone
*
* If not, we must have at least one common organisation
* that we are both members of
*/
canSee (other) {
if (this.organisations.value("*")?.read) {
return true; return true;
} else if (other instanceof User) {
return other.organisations.names().some( name => this.organisations.value(name) ); if (other instanceof User) {
return other.organisations.names().some(name => this.organisations.get(name)?.[operation]);
} else if (other instanceof Organisations) { } else if (other instanceof Organisations) {
return other.accessToOperation("read").names().some( name => this.organisations.value(name)?.read ); return other.accessToOperation(operation).names().some(name => this.organisations.get(name)?.[operation]);
} else { } else if (other?.organisations) {
// return other.organisations.names().some( name => this.organisations.value(name) ); return this.canDo(operation, new Organisations(other.organisations));
} else if (other instanceof Object) {
return this.canDo(operation, new Organisations(other));
} }
return false;
} }
canRead (other) { canRead (other) {
return this.canSee(other); return this.canDo("read", other);
} }
canWrite (other) { canWrite (other) {
if (this.organisations.value("*")?.write) { return this.canDo("write", other);
return true;
} else if (other instanceof User) {
return other.organisations.names().some( name => this.organisations.value(name) );
} else if (other instanceof Organisations) {
return other.accessToOperation("write").names().some( name => this.organisations.value(name)?.write );
} else {
// return other.organisations.names().some( name => this.organisations.value(name) );
}
} }
/** Return `true` if we can edit `other`
*
* If we are edit wildcarded we can edit everyone
*
* If not, we must have `edit` access on at least one
* of other's organisations
*/
canEdit (other) { canEdit (other) {
if (this.organisations.value("*")?.edit) { return this.canDo("edit", other);
return true;
} else if (other instanceof User) {
return other.organisations.names().some( name => this.organisations.value(name)?.edit );
} else if (other instanceof Organisations) {
return other.accessToOperation("edit").names().some( name => this.organisations.value(name)?.edit );
} else if (other?.organisations) {
return this.canEdit(this.#clone(other));
}
}
canDo (operation, other) {
switch (operation) {
case "read":
return this.canRead(other);
case "write":
return this.canWrite(other);
case "edit":
return this.canEdit(other);
default:
return false;
}
} }
/** Perform an edit on another user /** Perform an edit on another user

2
lib/www/server/api/middleware/user/get.js
View File

@@ -6,7 +6,7 @@ module.exports = async function (req, res, next) {
const user = new ServerUser(req.user); const user = new ServerUser(req.user);
const target = await ServerUser.fromSQL(null, req.params.user_id); const target = await ServerUser.fromSQL(null, req.params.user_id);
if (requestor.canSee(target)) { if (requestor.canRead(target)) {
res.status(200).send(target.toJSON()); res.status(200).send(target.toJSON());
} else { } else {
throw {status: 403, message: "Access denied"}; throw {status: 403, message: "Access denied"};