github-starred/komodo
2
0
Fork 1
mirror of https://github.com/moghtech/komodo.git synced 2026-05-01 07:36:16 -05:00
Code Issues 3.1k Packages Projects Releases 103 Wiki Activity

refactor core to use global &'statics

Browse Source
This commit is contained in:
mbecker20
2024-03-19 05:18:42 -07:00
parent 12315e90de
commit 5266b01e4c
60 changed files with 2000 additions and 1977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/core/src/api/read/user.rs
View File

@@ -12,7 +12,7 @@ use mungos::{
};
use resolver_api::Resolve;
use crate::{auth::RequestUser, state::State};
use crate::{auth::RequestUser, db_client, state::State};
#[async_trait]
impl Resolve<GetUser, RequestUser> for State {
@@ -21,7 +21,7 @@ impl Resolve<GetUser, RequestUser> for State {
GetUser {}: GetUser,
user: RequestUser,
) -> anyhow::Result<User> {
let mut user = find_one_by_id(&self.db.users, &user.id)
let mut user = find_one_by_id(&db_client().await.users, &user.id)
.await
.context("failed at mongo query")?
.context("no user found with id")?;
@@ -37,7 +37,7 @@ impl Resolve<GetUsername, RequestUser> for State {
GetUsername { user_id }: GetUsername,
_: RequestUser,
) -> anyhow::Result<GetUsernameResponse> {
let user = find_one_by_id(&self.db.users, &user_id)
let user = find_one_by_id(&db_client().await.users, &user_id)
.await
.context("failed at mongo query for user")?
.context("no user found with id")?;
@@ -58,9 +58,10 @@ impl Resolve<GetUsers, RequestUser> for State {
if !user.is_admin {
return Err(anyhow!("this route is only accessable by admins"));
}
let mut users = find_collect(&self.db.users, None, None)
.await
.context("failed to pull users from db")?;
let mut users =
find_collect(&db_client().await.users, None, None)
.await
.context("failed to pull users from db")?;
users.iter_mut().for_each(|user| user.sanitize());
Ok(users)
}
@@ -74,7 +75,7 @@ impl Resolve<ListApiKeys, RequestUser> for State {
user: RequestUser,
) -> anyhow::Result<ListApiKeysResponse> {
let api_keys = find_collect(
&self.db.api_keys,
&db_client().await.api_keys,
doc! { "user_id": &user.id },
None,
)