From a201c054f2de1de6faa2cc46c52bc2f980d85195 Mon Sep 17 00:00:00 2001 From: Ashish Kolhe <35160958+oasisk@users.noreply.github.com> Date: Mon, 27 Jan 2025 18:19:34 +0530 Subject: [PATCH] fix: permission issue for native users (#5818) ## Summary by CodeRabbit - **Refactor** - Improved code readability by adjusting indentation and line organization in the permissions checking utility - No functional changes to the existing code logic --- src/handler/http/request/websocket/utils.rs | 54 ++++++++++----------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/src/handler/http/request/websocket/utils.rs b/src/handler/http/request/websocket/utils.rs index 92cda09e0f..d60c655b54 100644 --- a/src/handler/http/request/websocket/utils.rs +++ b/src/handler/http/request/websocket/utils.rs @@ -51,37 +51,35 @@ pub mod enterprise_utils { .clone(); // If the user is external, check permissions - if user.is_external { - let stream_type_str = stream_type.as_str(); - let o2_type = format!( - "{}:{}", - OFGA_MODELS - .get(stream_type_str) - .map_or(stream_type_str, |model| model.key), - stream_name - ); + let stream_type_str = stream_type.as_str(); + let o2_type = format!( + "{}:{}", + OFGA_MODELS + .get(stream_type_str) + .map_or(stream_type_str, |model| model.key), + stream_name + ); - let auth_extractor = AuthExtractor { - auth: "".to_string(), - method: "GET".to_string(), - o2_type, - org_id: org_id.to_string(), - bypass_check: false, - parent_id: "".to_string(), - }; + let auth_extractor = AuthExtractor { + auth: "".to_string(), + method: "GET".to_string(), + o2_type, + org_id: org_id.to_string(), + bypass_check: false, + parent_id: "".to_string(), + }; - let has_permission = crate::handler::http::auth::validator::check_permissions( - user_id, - auth_extractor, - user.role, - user.is_external, - ) - .await; + let has_permission = crate::handler::http::auth::validator::check_permissions( + user_id, + auth_extractor, + user.role, + user.is_external, + ) + .await; - if !has_permission { - return Err("Unauthorized Access".to_string()); - } - } + if !has_permission { + return Err("Unauthorized Access".to_string()); + }; Ok(()) }