magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add some accessors to Ar for common patterns

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-10-24 12:03:56 +00:00
parent 60cc07134f
commit ee92a33a4d
17 changed files with 109 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/server/user.rs
View file

@ -27,8 +27,6 @@ pub(crate) async fn get_devices_route(
));
}
let origin = body.origin.as_ref().expect("server is authenticated");
let user_id = &body.user_id;
Ok(get_devices::v1::Response {
user_id: user_id.clone(),
@ -66,12 +64,12 @@ pub(crate) async fn get_devices_route(
.await,
master_key: services
.users
.get_master_key(None, &body.user_id, &|u| u.server_name() == origin)
.get_master_key(None, &body.user_id, &|u| u.server_name() == body.origin())
.await
.ok(),
self_signing_key: services
.users
.get_self_signing_key(None, &body.user_id, &|u| u.server_name() == origin)
.get_self_signing_key(None, &body.user_id, &|u| u.server_name() == body.origin())
.await
.ok(),
})