Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #133 from buster-so/staging 

Try moving user to non auth endpoint.
This commit is contained in:
dal 2025-02-14 13:44:49 -08:00 committed by GitHub
parent 84d30b5ccd 43a8a09796
commit 6f50eec573
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/src/routes/rest/routes/assets/get_asset_access.rs
View File

@ -331,7 +331,6 @@ async fn is_organization_admin_or_owner(
let user_organization_id = match get_user_organization_id(&user_id).await { let user_organization_id = match get_user_organization_id(&user_id).await {
Ok(organization_id) => organization_id, Ok(organization_id) => organization_id,
Err(e) => { Err(e) => {
tracing::error!("Error getting user organization ID: {}", e);
return Ok(false); return Ok(false);
} }
}; };

26
api/src/routes/rest/routes/mod.rs
View File

@ -13,16 +13,18 @@ use axum::{middleware, Router};
use crate::buster_middleware::auth::auth; use crate::buster_middleware::auth::auth;
pub fn router() -> Router { pub fn router() -> Router {
Router::new().nest("/api_keys", api_keys::router()).merge( Router::new()
Router::new() .nest("/api_keys", api_keys::router())
.nest("/users", users::router()) .nest("/users", users::router())
.nest("/assets", assets::router()) .merge(
.nest("/datasets", datasets::router()) Router::new()
.nest("/data_sources", data_sources::router()) .nest("/assets", assets::router())
.nest("/permission_groups", permission_groups::router()) .nest("/datasets", datasets::router())
.nest("/dataset_groups", dataset_groups::router()) .nest("/data_sources", data_sources::router())
.nest("/sql", sql::router()) .nest("/permission_groups", permission_groups::router())
.nest("/organizations", organizations::router()) .nest("/dataset_groups", dataset_groups::router())
.route_layer(middleware::from_fn(auth)), .nest("/sql", sql::router())
) .nest("/organizations", organizations::router())
.route_layer(middleware::from_fn(auth)),
)
} }

13
api/src/routes/rest/routes/users/mod.rs
View File

@ -1,8 +1,11 @@
use axum::{ use axum::{
middleware,
routing::{get, put}, routing::{get, put},
Router, Router,
}; };
use crate::buster_middleware::auth::auth;
mod assets; mod assets;
mod get_user; mod get_user;
mod get_user_by_id; mod get_user_by_id;
@ -11,7 +14,11 @@ mod update_user;
pub fn router() -> Router { pub fn router() -> Router {
Router::new() Router::new()
.route("/", get(get_user::get_user)) .route("/", get(get_user::get_user))
.route("/:user_id", put(update_user::update_user)) .merge(
.route("/:user_id", get(get_user_by_id::get_user_by_id)) Router::new()
.nest("/:user_id", assets::router()) .route("/:user_id", put(update_user::update_user))
.route("/:user_id", get(get_user_by_id::get_user_by_id))
.nest("/:user_id", assets::router())
.route_layer(middleware::from_fn(auth))
)
} }