Merge pull request #133 from buster-so/staging

Try moving user to non auth endpoint.

api/src/routes/rest/routes/assets/get_asset_access.rs

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

api/src/routes/rest/routes/mod.rs

@@ -13,9 +13,11 @@ use axum::{middleware, Router};
 use crate::buster_middleware::auth::auth;
 
 pub fn router() -> Router {
-    Router::new().nest("/api_keys", api_keys::router()).merge(
     Router::new()
+        .nest("/api_keys", api_keys::router())
         .nest("/users", users::router())
+        .merge(
+            Router::new()
                 .nest("/assets", assets::router())
                 .nest("/datasets", datasets::router())
                 .nest("/data_sources", data_sources::router())

api/src/routes/rest/routes/users/mod.rs

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