FabInfra-Mirror/bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2025-06-11 10:53:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

run cargo fmt --all

Browse Source
This commit is contained in:
Mario Voigt
2025-03-07 00:33:38 +01:00
parent 140752b4e3
commit d5d7507116
11 changed files with 65 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bffhd/capnp/machine.rs
View File

@ -3,15 +3,16 @@ use crate::resources::modules::fabaccess::{ArchivedStatus, Status};
use crate::resources::Resource;
use crate::session::SessionHandle;
use api::general_capnp::optional;
use api::machine_capnp::machine::prodable::{ProdWithDataParams, ProdWithDataResults};
use api::machine_capnp::machine::{
self, admin, admin::Server as AdminServer, check, check::Server as CheckServer,
in_use as inuse, in_use::Server as InUseServer, info, info::Server as InfoServer, manage,
manage::Server as ManageServer, use_, use_::Server as UseServer, MachineState, prodable::Server as ProdableServer,
manage::Server as ManageServer, prodable::Server as ProdableServer, use_,
use_::Server as UseServer, MachineState,
};
use capnp::capability::Promise;
use capnp::Error;
use capnp_rpc::pry;
use api::machine_capnp::machine::prodable::{ProdWithDataParams, ProdWithDataResults};
#[derive(Clone)]
pub struct Machine {
@ -188,7 +189,11 @@ impl InUseServer for Machine {
}
impl ProdableServer for Machine {
fn prod_with_data(&mut self, params: ProdWithDataParams, _: ProdWithDataResults) -> Promise<(), Error> {
fn prod_with_data(
&mut self,
params: ProdWithDataParams,
_: ProdWithDataResults,
) -> Promise<(), Error> {
let data: Vec<u8> = pry!(pry!(params.get()).get_data()).to_vec();
self.resource.send_raw(data);
Promise::ok(())

11
bffhd/capnp/user.rs
View File

@ -143,7 +143,8 @@ impl admin::Server for User {
// Only update if needed
if !target.userdata.roles.iter().any(|r| r.as_str() == rolename) {
target.userdata.roles.push(rolename.to_string());
pry!(self.session
pry!(self
.session
.users
.put_user(self.user.get_username(), &target));
}
@ -168,7 +169,8 @@ impl admin::Server for User {
// Only update if needed
if target.userdata.roles.iter().any(|r| r.as_str() == rolename) {
target.userdata.roles.retain(|r| r.as_str() != rolename);
pry!(self.session
pry!(self
.session
.users
.put_user(self.user.get_username(), &target));
}
@ -210,10 +212,7 @@ impl card_d_e_s_fire_e_v2::Server for User {
"User API object with nonexisting user \"{}\"",
self.user.get_username()
))));
if let Some(tk) = user
.userdata
.kv
.get("cardtoken") {
if let Some(tk) = user.userdata.kv.get("cardtoken") {
let b = results.get();
let mut lb = b.init_token_list(1);
lb.set(0, tk.as_ref());