NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename acl.* methods and always accept identifiers.

Browse Source
This commit is contained in:
Julien Fontanet 2015-02-19 16:28:16 +01:00
parent a989e296b0
commit 2c4e46c630
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/api/acl.js
View File

@ -7,7 +7,7 @@ let get = coroutine(function *({subject, object}) {
let sieve = {};
try {
if (subject !== undefined) {
sieve.subject = (yield this.users.first({ email: subject })).get('id');
sieve.subject = (yield this.users.first(subject)).get('id');
}
if (object !== undefined) {
object = this.getObject(object).id;
@ -44,9 +44,9 @@ export {getCurrent};
//--------------------------------------------------------------------
let set = coroutine(function *({subject, object}) {
let add = coroutine(function *({subject, object}) {
try {
subject = (yield this.users.first({ email: subject })).get('id');
subject = (yield this.users.first(subject)).get('id');
object = this.getObject(object).id;
} catch (error) {
this.throw('NO_SUCH_OBJECT');
@ -61,37 +61,30 @@ let set = coroutine(function *({subject, object}) {
}
});
set.permission = 'admin';
add.permission = 'admin';
set.params = {
add.params = {
subject: { type: 'string' },
object: { type: 'string' },
};
set.description = 'create a new ACL entry';
add.description = 'add a new ACL entry';
export {set};
export {add};
//--------------------------------------------------------------------
let unset = coroutine(function *({subject, object}) {
try {
subject = (yield this.users.first({ email: subject })).get('id');
object = this.getObject(object).id;
} catch (error) {
this.throw('NO_SUCH_OBJECT');
}
let remove = coroutine(function *({subject, object}) {
yield this.acls.delete(subject, object);
});
unset.permission = 'admin';
remove.permission = 'admin';
unset.params = {
remove.params = {
subject: { type: 'string' },
object: { type: 'string' },
};
unset.description = 'remove an existing ACL entry';
remove.description = 'remove an existing ACL entry';
export {unset};
export {remove};