mirror of
https://gitlab.com/fabinfra/fabaccess/bffh.git
synced 2024-11-22 06:47:56 +01:00
Be consistent in the api
This commit is contained in:
parent
75f8911c1f
commit
14402d627c
@ -104,8 +104,8 @@ impl machines::Server for Machines {
|
|||||||
builder.set_use(capnp_rpc::new_client(machineapi.clone()));
|
builder.set_use(capnp_rpc::new_client(machineapi.clone()));
|
||||||
}
|
}
|
||||||
if perms.manage {
|
if perms.manage {
|
||||||
builder.set_transfer(capnp_rpc::new_client(machineapi.clone()));
|
//builder.set_transfer(capnp_rpc::new_client(machineapi.clone()));
|
||||||
builder.set_check(capnp_rpc::new_client(machineapi.clone()));
|
//builder.set_check(capnp_rpc::new_client(machineapi.clone()));
|
||||||
builder.set_manage(capnp_rpc::new_client(machineapi.clone()));
|
builder.set_manage(capnp_rpc::new_client(machineapi.clone()));
|
||||||
}
|
}
|
||||||
if permissions.iter().any(|r| r.match_perm(&admin_perm())) {
|
if permissions.iter().any(|r| r.match_perm(&admin_perm())) {
|
||||||
@ -150,12 +150,13 @@ impl machines::Server for Machines {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let machineapi = Machine::new(user.clone(), perms, machine.clone());
|
let machineapi = Machine::new(user.clone(), perms, machine.clone());
|
||||||
if perms.write {
|
let state = machine.get_status().await;
|
||||||
|
if perms.write && state == Status::Free {
|
||||||
builder.set_use(capnp_rpc::new_client(machineapi.clone()));
|
builder.set_use(capnp_rpc::new_client(machineapi.clone()));
|
||||||
}
|
}
|
||||||
if perms.manage {
|
if perms.manage {
|
||||||
builder.set_transfer(capnp_rpc::new_client(machineapi.clone()));
|
//builder.set_transfer(capnp_rpc::new_client(machineapi.clone()));
|
||||||
builder.set_check(capnp_rpc::new_client(machineapi.clone()));
|
//builder.set_check(capnp_rpc::new_client(machineapi.clone()));
|
||||||
builder.set_manage(capnp_rpc::new_client(machineapi.clone()));
|
builder.set_manage(capnp_rpc::new_client(machineapi.clone()));
|
||||||
}
|
}
|
||||||
if permissions.iter().any(|r| r.match_perm(&admin_perm())) {
|
if permissions.iter().any(|r| r.match_perm(&admin_perm())) {
|
||||||
|
Loading…
Reference in New Issue
Block a user