diff --git "a/diffs/pr_6701/35b89e8/diff.json" "b/diffs/pr_6701/35b89e8/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6701/35b89e8/diff.json" @@ -0,0 +1,534 @@ +{ + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4", + "pr_number": 6701, + "rust_files": [ + "crates/diesel_models/src/query/role.rs", + "crates/router/src/analytics.rs", + "crates/router/src/core/user.rs", + "crates/router/src/core/user_role.rs", + "crates/router/src/core/user_role/role.rs", + "crates/router/src/db/kafka_store.rs", + "crates/router/src/db/role.rs", + "crates/router/src/services/authorization.rs", + "crates/router/src/services/authorization/roles.rs", + "crates/router/src/utils/user.rs", + "crates/router/src/utils/user_role.rs" + ], + "diffs": [ + { + "id": "crates/router/src/utils/user.rs::impl::UserFromToken", + "file": "crates/router/src/utils/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl UserFromToken {\n pub async fn get_merchant_account_from_db(\n &self,\n state: SessionState,\n ) -> UserResult {\n let key_manager_state = &(&state).into();\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &self.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::MerchantIdNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?;\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(key_manager_state, &self.merchant_id, &key_store)\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::MerchantIdNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?;\n Ok(merchant_account)\n }\n\n pub async fn get_user_from_db(&self, state: &SessionState) -> UserResult {\n let user = state\n .global_store\n .find_user_by_id(&self.user_id)\n .await\n .change_context(UserErrors::InternalServerError)?;\n Ok(user.into())\n }\n\n pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_in_merchant_scope(\n state,\n &self.role_id,\n &self.merchant_id,\n &self.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n }\n}", + "after_code": "impl UserFromToken {\n pub async fn get_merchant_account_from_db(\n &self,\n state: SessionState,\n ) -> UserResult {\n let key_manager_state = &(&state).into();\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &self.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::MerchantIdNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?;\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(key_manager_state, &self.merchant_id, &key_store)\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::MerchantIdNotFound)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?;\n Ok(merchant_account)\n }\n\n pub async fn get_user_from_db(&self, state: &SessionState) -> UserResult {\n let user = state\n .global_store\n .find_user_by_id(&self.user_id)\n .await\n .change_context(UserErrors::InternalServerError)?;\n Ok(user.into())\n }\n\n pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_and_org_id(state, &self.role_id, &self.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n }\n}", + "diff_span": { + "before": "\n pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_in_merchant_scope(\n state,\n &self.role_id,\n &self.merchant_id,\n &self.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n }\n}", + "after": "\n pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_and_org_id(state, &self.role_id, &self.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n }\n}" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/services/authorization.rs::function::get_role_info", + "file": "crates/router/src/services/authorization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_role_info(state: &A, token: &AuthToken) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n if let Some(role_info) = roles::predefined_roles::PREDEFINED_ROLES.get(token.role_id.as_str()) {\n return Ok(role_info.clone());\n }\n\n if let Ok(role_info) = get_role_info_from_cache(state, &token.role_id)\n .await\n .map_err(|e| logger::error!(\"Failed to get permissions from cache {e:?}\"))\n {\n return Ok(role_info.clone());\n }\n\n let role_info =\n get_role_info_from_db(state, &token.role_id, &token.merchant_id, &token.org_id).await?;\n\n let token_expiry =\n i64::try_from(token.exp).change_context(ApiErrorResponse::InternalServerError)?;\n let cache_ttl = token_expiry - common_utils::date_time::now_unix_timestamp();\n\n set_role_info_in_cache(state, &token.role_id, &role_info, cache_ttl)\n .await\n .map_err(|e| logger::error!(\"Failed to set role info in cache {e:?}\"))\n .ok();\n Ok(role_info)\n}", + "after_code": "pub async fn get_role_info(state: &A, token: &AuthToken) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n if let Some(role_info) = roles::predefined_roles::PREDEFINED_ROLES.get(token.role_id.as_str()) {\n return Ok(role_info.clone());\n }\n\n if let Ok(role_info) = get_role_info_from_cache(state, &token.role_id)\n .await\n .map_err(|e| logger::error!(\"Failed to get permissions from cache {e:?}\"))\n {\n return Ok(role_info.clone());\n }\n\n let role_info = get_role_info_from_db(state, &token.role_id, &token.org_id).await?;\n\n let token_expiry =\n i64::try_from(token.exp).change_context(ApiErrorResponse::InternalServerError)?;\n let cache_ttl = token_expiry - common_utils::date_time::now_unix_timestamp();\n\n set_role_info_in_cache(state, &token.role_id, &role_info, cache_ttl)\n .await\n .map_err(|e| logger::error!(\"Failed to set role info in cache {e:?}\"))\n .ok();\n Ok(role_info)\n}", + "diff_span": { + "before": " }\n\n let role_info =\n get_role_info_from_db(state, &token.role_id, &token.merchant_id, &token.org_id).await?;\n\n let token_expiry =", + "after": " }\n\n let role_info = get_role_info_from_db(state, &token.role_id, &token.org_id).await?;\n\n let token_expiry =" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/analytics.rs::mod::routes", + "file": "crates/router/src/analytics.rs", + "kind": "mod_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub mod routes {\n use std::{\n collections::{HashMap, HashSet},\n sync::Arc,\n };\n\n use actix_web::{web, Responder, Scope};\n use analytics::{\n api_event::api_events_core, connector_events::connector_events_core, enums::AuthInfo,\n errors::AnalyticsError, lambda_utils::invoke_lambda, opensearch::OpenSearchError,\n outgoing_webhook_event::outgoing_webhook_events_core, sdk_events::sdk_events_core,\n AnalyticsFlow,\n };\n use api_models::analytics::{\n api_event::QueryType,\n search::{\n GetGlobalSearchRequest, GetSearchRequest, GetSearchRequestWithIndex, SearchIndex,\n },\n GenerateReportRequest, GetActivePaymentsMetricRequest, GetApiEventFiltersRequest,\n GetApiEventMetricRequest, GetAuthEventMetricRequest, GetDisputeMetricRequest,\n GetFrmFilterRequest, GetFrmMetricRequest, GetPaymentFiltersRequest,\n GetPaymentIntentFiltersRequest, GetPaymentIntentMetricRequest, GetPaymentMetricRequest,\n GetRefundFilterRequest, GetRefundMetricRequest, GetSdkEventFiltersRequest,\n GetSdkEventMetricRequest, ReportRequest,\n };\n use common_enums::EntityType;\n use common_utils::types::TimeRange;\n use error_stack::{report, ResultExt};\n use futures::{stream::FuturesUnordered, StreamExt};\n\n use crate::{\n consts::opensearch::SEARCH_INDEXES,\n core::{\n api_locking, currency::get_forex_exchange_rates, errors::user::UserErrors,\n verification::utils,\n },\n db::{user::UserInterface, user_role::ListUserRolesByUserIdPayload},\n routes::AppState,\n services::{\n api,\n authentication::{self as auth, AuthenticationData, UserFromToken},\n authorization::{permissions::Permission, roles::RoleInfo},\n ApplicationResponse,\n },\n types::{domain::UserEmail, storage::UserRole},\n };\n\n pub struct Analytics;\n\n impl Analytics {\n #[cfg(feature = \"v2\")]\n pub fn server(state: AppState) -> Scope {\n web::scope(\"/analytics\").app_data(web::Data::new(state))\n }\n #[cfg(feature = \"v1\")]\n pub fn server(state: AppState) -> Scope {\n web::scope(\"/analytics\")\n .app_data(web::Data::new(state))\n .service(\n web::scope(\"/v1\")\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_merchant_payment_metrics)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_merchant_refund_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_merchant_payment_filters)),\n )\n .service(\n web::resource(\"filters/frm\").route(web::post().to(get_frm_filters)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_merchant_refund_filters)),\n )\n .service(web::resource(\"{domain}/info\").route(web::get().to(get_info)))\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_merchant_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_merchant_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_merchant_payment_report)),\n )\n .service(\n web::resource(\"metrics/sdk_events\")\n .route(web::post().to(get_sdk_event_metrics)),\n )\n .service(\n web::resource(\"metrics/active_payments\")\n .route(web::post().to(get_active_payments_metrics)),\n )\n .service(\n web::resource(\"filters/sdk_events\")\n .route(web::post().to(get_sdk_event_filters)),\n )\n .service(\n web::resource(\"metrics/auth_events\")\n .route(web::post().to(get_auth_event_metrics)),\n )\n .service(\n web::resource(\"metrics/frm\").route(web::post().to(get_frm_metrics)),\n )\n .service(\n web::resource(\"api_event_logs\")\n .route(web::get().to(get_profile_api_events)),\n )\n .service(\n web::resource(\"sdk_event_logs\")\n .route(web::post().to(get_profile_sdk_events)),\n )\n .service(\n web::resource(\"connector_event_logs\")\n .route(web::get().to(get_profile_connector_events)),\n )\n .service(\n web::resource(\"outgoing_webhook_event_logs\")\n .route(web::get().to(get_profile_outgoing_webhook_events)),\n )\n .service(\n web::resource(\"metrics/api_events\")\n .route(web::post().to(get_merchant_api_events_metrics)),\n )\n .service(\n web::resource(\"filters/api_events\")\n .route(web::post().to(get_merchant_api_event_filters)),\n )\n .service(\n web::resource(\"search\")\n .route(web::post().to(get_global_search_results)),\n )\n .service(\n web::resource(\"search/{domain}\")\n .route(web::post().to(get_search_results)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_merchant_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_merchant_dispute_filters)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_merchant_sankey)),\n )\n .service(\n web::scope(\"/merchant\")\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_merchant_payment_metrics)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_merchant_refund_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_merchant_payment_filters)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_merchant_refund_filters)),\n )\n .service(\n web::resource(\"{domain}/info\").route(web::get().to(get_info)),\n )\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_merchant_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_merchant_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_merchant_payment_report)),\n )\n .service(\n web::resource(\"metrics/api_events\")\n .route(web::post().to(get_merchant_api_events_metrics)),\n )\n .service(\n web::resource(\"filters/api_events\")\n .route(web::post().to(get_merchant_api_event_filters)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_merchant_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_merchant_dispute_filters)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_merchant_sankey)),\n ),\n )\n .service(\n web::scope(\"/org\")\n .service(\n web::resource(\"{domain}/info\").route(web::get().to(get_info)),\n )\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_org_payment_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_org_payment_filters)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_org_refund_metrics)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_org_refund_filters)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_org_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_org_dispute_filters)),\n )\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_org_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_org_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_org_payment_report)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_org_sankey)),\n ),\n )\n .service(\n web::scope(\"/profile\")\n .service(\n web::resource(\"{domain}/info\").route(web::get().to(get_info)),\n )\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_profile_payment_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_profile_payment_filters)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_profile_refund_metrics)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_profile_refund_filters)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_profile_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_profile_dispute_filters)),\n )\n .service(\n web::resource(\"connector_event_logs\")\n .route(web::get().to(get_profile_connector_events)),\n )\n .service(\n web::resource(\"outgoing_webhook_event_logs\")\n .route(web::get().to(get_profile_outgoing_webhook_events)),\n )\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_profile_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_profile_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_profile_payment_report)),\n )\n .service(\n web::resource(\"api_event_logs\")\n .route(web::get().to(get_profile_api_events)),\n )\n .service(\n web::resource(\"sdk_event_logs\")\n .route(web::post().to(get_profile_sdk_events)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_profile_sankey)),\n ),\n ),\n )\n .service(\n web::scope(\"/v2\")\n .service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_merchant_payment_intent_metrics)),\n )\n .service(\n web::resource(\"/filters/payments\")\n .route(web::post().to(get_payment_intents_filters)),\n )\n .service(\n web::scope(\"/merchant\")\n .service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_merchant_payment_intent_metrics)),\n )\n .service(\n web::resource(\"/filters/payments\")\n .route(web::post().to(get_payment_intents_filters)),\n ),\n )\n .service(\n web::scope(\"/org\").service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_org_payment_intent_metrics)),\n ),\n )\n .service(\n web::scope(\"/profile\").service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_profile_payment_intent_metrics)),\n ),\n ),\n )\n }\n }\n\n pub async fn get_info(\n state: web::Data,\n req: actix_web::HttpRequest,\n domain: web::Path,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetInfo;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n domain.into_inner(),\n |_, _: (), domain: analytics::AnalyticsDomain, _| async {\n analytics::core::get_domain_info(domain)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::NoAuth,\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.\n pub async fn get_merchant_payment_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payments::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.\n pub async fn get_org_payment_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payments::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.\n pub async fn get_profile_payment_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payments::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentIntentMetricRequest` element.\n pub async fn get_merchant_payment_intent_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentIntentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentIntentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentIntentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payment_intents::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentIntentMetricRequest` element.\n pub async fn get_org_payment_intent_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentIntentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentIntentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentIntentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payment_intents::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentIntentMetricRequest` element.\n pub async fn get_profile_payment_intent_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentIntentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentIntentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentIntentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payment_intents::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.\n pub async fn get_merchant_refund_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetRefundMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetRefundMetricRequest\");\n let flow = AnalyticsFlow::GetRefundsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::refunds::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.\n pub async fn get_org_refund_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetRefundMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetRefundMetricRequest\");\n let flow = AnalyticsFlow::GetRefundsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::refunds::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.\n pub async fn get_profile_refund_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetRefundMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetRefundMetricRequest\");\n let flow = AnalyticsFlow::GetRefundsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::refunds::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetFrmMetricRequest` element.\n pub async fn get_frm_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetFrmMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetFrmMetricRequest\");\n let flow = AnalyticsFlow::GetFrmMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::frm::get_metrics(&state.pool, auth.merchant_account.get_id(), req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetSdkEventMetricRequest` element.\n pub async fn get_sdk_event_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetSdkEventMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetSdkEventMetricRequest\");\n let flow = AnalyticsFlow::GetSdkMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::sdk_events::get_metrics(\n &state.pool,\n &auth.merchant_account.publishable_key,\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetActivePaymentsMetricRequest` element.\n pub async fn get_active_payments_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetActivePaymentsMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetActivePaymentsMetricRequest\");\n let flow = AnalyticsFlow::GetActivePaymentsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::active_payments::get_metrics(\n &state.pool,\n &auth.merchant_account.publishable_key,\n auth.merchant_account.get_id(),\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetAuthEventMetricRequest` element.\n pub async fn get_auth_event_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetAuthEventMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetAuthEventMetricRequest\");\n let flow = AnalyticsFlow::GetAuthMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::auth_events::get_metrics(\n &state.pool,\n auth.merchant_account.get_id(),\n &auth.merchant_account.publishable_key,\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_payment_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::payments::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_payment_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::payments::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_payment_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::payments::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_payment_intents_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentIntentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n analytics::payment_intents::get_filters(\n &state.pool,\n req,\n auth.merchant_account.get_id(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_refund_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetRefundFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetRefundFilterRequest, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::refunds::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_refund_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetRefundFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetRefundFilterRequest, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::refunds::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_refund_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetRefundFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetRefundFilterRequest, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::refunds::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_frm_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetFrmFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetFrmFilterRequest, _| async move {\n analytics::frm::get_filters(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_sdk_event_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSdkEventFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n analytics::sdk_events::get_filters(\n &state.pool,\n req,\n &auth.merchant_account.publishable_key,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_profile_api_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Query,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetApiEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let payment_id = match req.query_param.clone() {\n QueryType::Payment { payment_id } => payment_id,\n QueryType::Refund { payment_id, .. } => payment_id,\n QueryType::Dispute { payment_id, .. } => payment_id,\n };\n utils::check_if_profile_id_is_present_in_payment_intent(payment_id, &state, &auth)\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n api_events_core(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_profile_outgoing_webhook_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Query<\n api_models::analytics::outgoing_webhook_event::OutgoingWebhookLogsRequest,\n >,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetOutgoingWebhookEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n utils::check_if_profile_id_is_present_in_payment_intent(\n req.payment_id.clone(),\n &state,\n &auth,\n )\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n outgoing_webhook_events_core(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_sdk_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSdkEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n utils::check_if_profile_id_is_present_in_payment_intent(\n req.payment_id.clone(),\n &state,\n &auth,\n )\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n sdk_events_core(&state.pool, req, &auth.merchant_account.publishable_key)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_merchant_refund_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateRefundReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.refund_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_org_refund_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateRefundReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: None,\n auth: AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.refund_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_profile_refund_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateRefundReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.refund_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n #[cfg(feature = \"v1\")]\n pub async fn generate_merchant_dispute_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateDisputeReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.dispute_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n #[cfg(feature = \"v1\")]\n pub async fn generate_org_dispute_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateDisputeReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: None,\n auth: AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.dispute_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_profile_dispute_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateDisputeReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.dispute_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_merchant_payment_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GeneratePaymentReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.payment_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n #[cfg(feature = \"v1\")]\n pub async fn generate_org_payment_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GeneratePaymentReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: None,\n auth: AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.payment_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_profile_payment_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GeneratePaymentReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.payment_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetApiEventMetricRequest` element.\n pub async fn get_merchant_api_events_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetApiEventMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetApiEventMetricRequest\");\n let flow = AnalyticsFlow::GetApiEventMetrics;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::api_event::get_api_event_metrics(\n &state.pool,\n auth.merchant_account.get_id(),\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_api_event_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetApiEventFilters;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n analytics::api_event::get_filters(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_profile_connector_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Query,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetConnectorEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n utils::check_if_profile_id_is_present_in_payment_intent(\n req.payment_id.clone(),\n &state,\n &auth,\n )\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n connector_events_core(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_global_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetGlobalSearchResults;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n\n analytics::search::msearch_results(\n &state.opensearch_client,\n req,\n search_params,\n SEARCH_INDEXES.to_vec(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n index: web::Path,\n ) -> impl Responder {\n let index = index.into_inner();\n let flow = AnalyticsFlow::GetSearchResults;\n let indexed_req = GetSearchRequestWithIndex {\n search_req: json_payload.into_inner(),\n index,\n };\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n indexed_req,\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n analytics::search::search_results(&state.opensearch_client, req, search_params)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_dispute_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetDisputeFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::disputes::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_dispute_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetDisputeFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::disputes::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_dispute_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetDisputeFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::disputes::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetDisputeMetricRequest` element.\n pub async fn get_merchant_dispute_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetDisputeMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetDisputeMetricRequest\");\n let flow = AnalyticsFlow::GetDisputeMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::disputes::get_metrics(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetDisputeMetricRequest` element.\n pub async fn get_profile_dispute_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetDisputeMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetDisputeMetricRequest\");\n let flow = AnalyticsFlow::GetDisputeMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::disputes::get_metrics(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetDisputeMetricRequest` element.\n pub async fn get_org_dispute_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetDisputeMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetDisputeMetricRequest\");\n let flow = AnalyticsFlow::GetDisputeMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::disputes::get_metrics(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_sankey(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSankey;\n let payload = json_payload.into_inner();\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::payment_intents::get_sankey(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_sankey(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSankey;\n let payload = json_payload.into_inner();\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::payment_intents::get_sankey(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_sankey(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSankey;\n let payload = json_payload.into_inner();\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state: crate::routes::SessionState, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::payment_intents::get_sankey(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n}", + "after_code": "pub mod routes {\n use std::{\n collections::{HashMap, HashSet},\n sync::Arc,\n };\n\n use actix_web::{web, Responder, Scope};\n use analytics::{\n api_event::api_events_core, connector_events::connector_events_core, enums::AuthInfo,\n errors::AnalyticsError, lambda_utils::invoke_lambda, opensearch::OpenSearchError,\n outgoing_webhook_event::outgoing_webhook_events_core, sdk_events::sdk_events_core,\n AnalyticsFlow,\n };\n use api_models::analytics::{\n api_event::QueryType,\n search::{\n GetGlobalSearchRequest, GetSearchRequest, GetSearchRequestWithIndex, SearchIndex,\n },\n GenerateReportRequest, GetActivePaymentsMetricRequest, GetApiEventFiltersRequest,\n GetApiEventMetricRequest, GetAuthEventMetricRequest, GetDisputeMetricRequest,\n GetFrmFilterRequest, GetFrmMetricRequest, GetPaymentFiltersRequest,\n GetPaymentIntentFiltersRequest, GetPaymentIntentMetricRequest, GetPaymentMetricRequest,\n GetRefundFilterRequest, GetRefundMetricRequest, GetSdkEventFiltersRequest,\n GetSdkEventMetricRequest, ReportRequest,\n };\n use common_enums::EntityType;\n use common_utils::types::TimeRange;\n use error_stack::{report, ResultExt};\n use futures::{stream::FuturesUnordered, StreamExt};\n\n use crate::{\n consts::opensearch::SEARCH_INDEXES,\n core::{\n api_locking, currency::get_forex_exchange_rates, errors::user::UserErrors,\n verification::utils,\n },\n db::{user::UserInterface, user_role::ListUserRolesByUserIdPayload},\n routes::AppState,\n services::{\n api,\n authentication::{self as auth, AuthenticationData, UserFromToken},\n authorization::{permissions::Permission, roles::RoleInfo},\n ApplicationResponse,\n },\n types::{domain::UserEmail, storage::UserRole},\n };\n\n pub struct Analytics;\n\n impl Analytics {\n #[cfg(feature = \"v2\")]\n pub fn server(state: AppState) -> Scope {\n web::scope(\"/analytics\").app_data(web::Data::new(state))\n }\n #[cfg(feature = \"v1\")]\n pub fn server(state: AppState) -> Scope {\n web::scope(\"/analytics\")\n .app_data(web::Data::new(state))\n .service(\n web::scope(\"/v1\")\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_merchant_payment_metrics)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_merchant_refund_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_merchant_payment_filters)),\n )\n .service(\n web::resource(\"filters/frm\").route(web::post().to(get_frm_filters)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_merchant_refund_filters)),\n )\n .service(web::resource(\"{domain}/info\").route(web::get().to(get_info)))\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_merchant_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_merchant_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_merchant_payment_report)),\n )\n .service(\n web::resource(\"metrics/sdk_events\")\n .route(web::post().to(get_sdk_event_metrics)),\n )\n .service(\n web::resource(\"metrics/active_payments\")\n .route(web::post().to(get_active_payments_metrics)),\n )\n .service(\n web::resource(\"filters/sdk_events\")\n .route(web::post().to(get_sdk_event_filters)),\n )\n .service(\n web::resource(\"metrics/auth_events\")\n .route(web::post().to(get_auth_event_metrics)),\n )\n .service(\n web::resource(\"metrics/frm\").route(web::post().to(get_frm_metrics)),\n )\n .service(\n web::resource(\"api_event_logs\")\n .route(web::get().to(get_profile_api_events)),\n )\n .service(\n web::resource(\"sdk_event_logs\")\n .route(web::post().to(get_profile_sdk_events)),\n )\n .service(\n web::resource(\"connector_event_logs\")\n .route(web::get().to(get_profile_connector_events)),\n )\n .service(\n web::resource(\"outgoing_webhook_event_logs\")\n .route(web::get().to(get_profile_outgoing_webhook_events)),\n )\n .service(\n web::resource(\"metrics/api_events\")\n .route(web::post().to(get_merchant_api_events_metrics)),\n )\n .service(\n web::resource(\"filters/api_events\")\n .route(web::post().to(get_merchant_api_event_filters)),\n )\n .service(\n web::resource(\"search\")\n .route(web::post().to(get_global_search_results)),\n )\n .service(\n web::resource(\"search/{domain}\")\n .route(web::post().to(get_search_results)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_merchant_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_merchant_dispute_filters)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_merchant_sankey)),\n )\n .service(\n web::scope(\"/merchant\")\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_merchant_payment_metrics)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_merchant_refund_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_merchant_payment_filters)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_merchant_refund_filters)),\n )\n .service(\n web::resource(\"{domain}/info\").route(web::get().to(get_info)),\n )\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_merchant_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_merchant_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_merchant_payment_report)),\n )\n .service(\n web::resource(\"metrics/api_events\")\n .route(web::post().to(get_merchant_api_events_metrics)),\n )\n .service(\n web::resource(\"filters/api_events\")\n .route(web::post().to(get_merchant_api_event_filters)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_merchant_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_merchant_dispute_filters)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_merchant_sankey)),\n ),\n )\n .service(\n web::scope(\"/org\")\n .service(\n web::resource(\"{domain}/info\").route(web::get().to(get_info)),\n )\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_org_payment_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_org_payment_filters)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_org_refund_metrics)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_org_refund_filters)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_org_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_org_dispute_filters)),\n )\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_org_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_org_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_org_payment_report)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_org_sankey)),\n ),\n )\n .service(\n web::scope(\"/profile\")\n .service(\n web::resource(\"{domain}/info\").route(web::get().to(get_info)),\n )\n .service(\n web::resource(\"metrics/payments\")\n .route(web::post().to(get_profile_payment_metrics)),\n )\n .service(\n web::resource(\"filters/payments\")\n .route(web::post().to(get_profile_payment_filters)),\n )\n .service(\n web::resource(\"metrics/refunds\")\n .route(web::post().to(get_profile_refund_metrics)),\n )\n .service(\n web::resource(\"filters/refunds\")\n .route(web::post().to(get_profile_refund_filters)),\n )\n .service(\n web::resource(\"metrics/disputes\")\n .route(web::post().to(get_profile_dispute_metrics)),\n )\n .service(\n web::resource(\"filters/disputes\")\n .route(web::post().to(get_profile_dispute_filters)),\n )\n .service(\n web::resource(\"connector_event_logs\")\n .route(web::get().to(get_profile_connector_events)),\n )\n .service(\n web::resource(\"outgoing_webhook_event_logs\")\n .route(web::get().to(get_profile_outgoing_webhook_events)),\n )\n .service(\n web::resource(\"report/dispute\")\n .route(web::post().to(generate_profile_dispute_report)),\n )\n .service(\n web::resource(\"report/refunds\")\n .route(web::post().to(generate_profile_refund_report)),\n )\n .service(\n web::resource(\"report/payments\")\n .route(web::post().to(generate_profile_payment_report)),\n )\n .service(\n web::resource(\"api_event_logs\")\n .route(web::get().to(get_profile_api_events)),\n )\n .service(\n web::resource(\"sdk_event_logs\")\n .route(web::post().to(get_profile_sdk_events)),\n )\n .service(\n web::resource(\"metrics/sankey\")\n .route(web::post().to(get_profile_sankey)),\n ),\n ),\n )\n .service(\n web::scope(\"/v2\")\n .service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_merchant_payment_intent_metrics)),\n )\n .service(\n web::resource(\"/filters/payments\")\n .route(web::post().to(get_payment_intents_filters)),\n )\n .service(\n web::scope(\"/merchant\")\n .service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_merchant_payment_intent_metrics)),\n )\n .service(\n web::resource(\"/filters/payments\")\n .route(web::post().to(get_payment_intents_filters)),\n ),\n )\n .service(\n web::scope(\"/org\").service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_org_payment_intent_metrics)),\n ),\n )\n .service(\n web::scope(\"/profile\").service(\n web::resource(\"/metrics/payments\")\n .route(web::post().to(get_profile_payment_intent_metrics)),\n ),\n ),\n )\n }\n }\n\n pub async fn get_info(\n state: web::Data,\n req: actix_web::HttpRequest,\n domain: web::Path,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetInfo;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n domain.into_inner(),\n |_, _: (), domain: analytics::AnalyticsDomain, _| async {\n analytics::core::get_domain_info(domain)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::NoAuth,\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.\n pub async fn get_merchant_payment_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payments::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.\n pub async fn get_org_payment_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payments::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentMetricRequest` element.\n pub async fn get_profile_payment_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payments::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentIntentMetricRequest` element.\n pub async fn get_merchant_payment_intent_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentIntentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentIntentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentIntentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payment_intents::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentIntentMetricRequest` element.\n pub async fn get_org_payment_intent_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentIntentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentIntentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentIntentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payment_intents::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetPaymentIntentMetricRequest` element.\n pub async fn get_profile_payment_intent_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetPaymentIntentMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetPaymentIntentMetricRequest\");\n let flow = AnalyticsFlow::GetPaymentIntentMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::payment_intents::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.\n pub async fn get_merchant_refund_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetRefundMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetRefundMetricRequest\");\n let flow = AnalyticsFlow::GetRefundsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::refunds::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.\n pub async fn get_org_refund_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetRefundMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetRefundMetricRequest\");\n let flow = AnalyticsFlow::GetRefundsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::refunds::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetRefundMetricRequest` element.\n pub async fn get_profile_refund_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetRefundMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetRefundMetricRequest\");\n let flow = AnalyticsFlow::GetRefundsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n let ex_rates = get_forex_exchange_rates(state.clone()).await?;\n analytics::refunds::get_metrics(&state.pool, &ex_rates, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetFrmMetricRequest` element.\n pub async fn get_frm_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetFrmMetricRequest; 1]>,\n ) -> impl Responder {\n #[allow(clippy::expect_used)]\n // safety: This shouldn't panic owing to the data type\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetFrmMetricRequest\");\n let flow = AnalyticsFlow::GetFrmMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::frm::get_metrics(&state.pool, auth.merchant_account.get_id(), req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetSdkEventMetricRequest` element.\n pub async fn get_sdk_event_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetSdkEventMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetSdkEventMetricRequest\");\n let flow = AnalyticsFlow::GetSdkMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::sdk_events::get_metrics(\n &state.pool,\n &auth.merchant_account.publishable_key,\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetActivePaymentsMetricRequest` element.\n pub async fn get_active_payments_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetActivePaymentsMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetActivePaymentsMetricRequest\");\n let flow = AnalyticsFlow::GetActivePaymentsMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::active_payments::get_metrics(\n &state.pool,\n &auth.merchant_account.publishable_key,\n auth.merchant_account.get_id(),\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetAuthEventMetricRequest` element.\n pub async fn get_auth_event_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetAuthEventMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetAuthEventMetricRequest\");\n let flow = AnalyticsFlow::GetAuthMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::auth_events::get_metrics(\n &state.pool,\n auth.merchant_account.get_id(),\n &auth.merchant_account.publishable_key,\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_payment_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::payments::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_payment_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::payments::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_payment_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::payments::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_payment_intents_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetPaymentIntentFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n analytics::payment_intents::get_filters(\n &state.pool,\n req,\n auth.merchant_account.get_id(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_refund_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetRefundFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetRefundFilterRequest, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::refunds::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_refund_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetRefundFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetRefundFilterRequest, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::refunds::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_refund_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetRefundFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetRefundFilterRequest, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::refunds::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_frm_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetFrmFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req: GetFrmFilterRequest, _| async move {\n analytics::frm::get_filters(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_sdk_event_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSdkEventFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n analytics::sdk_events::get_filters(\n &state.pool,\n req,\n &auth.merchant_account.publishable_key,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_profile_api_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Query,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetApiEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let payment_id = match req.query_param.clone() {\n QueryType::Payment { payment_id } => payment_id,\n QueryType::Refund { payment_id, .. } => payment_id,\n QueryType::Dispute { payment_id, .. } => payment_id,\n };\n utils::check_if_profile_id_is_present_in_payment_intent(payment_id, &state, &auth)\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n api_events_core(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_profile_outgoing_webhook_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Query<\n api_models::analytics::outgoing_webhook_event::OutgoingWebhookLogsRequest,\n >,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetOutgoingWebhookEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n utils::check_if_profile_id_is_present_in_payment_intent(\n req.payment_id.clone(),\n &state,\n &auth,\n )\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n outgoing_webhook_events_core(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_sdk_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSdkEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n utils::check_if_profile_id_is_present_in_payment_intent(\n req.payment_id.clone(),\n &state,\n &auth,\n )\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n sdk_events_core(&state.pool, req, &auth.merchant_account.publishable_key)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_merchant_refund_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateRefundReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.refund_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_org_refund_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateRefundReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: None,\n auth: AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.refund_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_profile_refund_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateRefundReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.refund_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n #[cfg(feature = \"v1\")]\n pub async fn generate_merchant_dispute_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateDisputeReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.dispute_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n #[cfg(feature = \"v1\")]\n pub async fn generate_org_dispute_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateDisputeReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: None,\n auth: AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.dispute_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_profile_dispute_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GenerateDisputeReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.dispute_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_merchant_payment_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GeneratePaymentReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.payment_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n #[cfg(feature = \"v1\")]\n pub async fn generate_org_payment_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GeneratePaymentReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n\n let org_id = auth.merchant_account.get_org_id();\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: None,\n auth: AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.payment_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn generate_profile_payment_report(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GeneratePaymentReport;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {\n let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)\n .await\n .change_context(AnalyticsError::UnknownError)?;\n\n let user_email = UserEmail::from_pii_email(user.email)\n .change_context(AnalyticsError::UnknownError)?\n .get_secret();\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let lambda_req = GenerateReportRequest {\n request: payload,\n merchant_id: Some(merchant_id.clone()),\n auth: AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n },\n email: user_email,\n };\n\n let json_bytes =\n serde_json::to_vec(&lambda_req).map_err(|_| AnalyticsError::UnknownError)?;\n invoke_lambda(\n &state.conf.report_download_config.payment_function,\n &state.conf.report_download_config.region,\n &json_bytes,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileReportRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetApiEventMetricRequest` element.\n pub async fn get_merchant_api_events_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetApiEventMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetApiEventMetricRequest\");\n let flow = AnalyticsFlow::GetApiEventMetrics;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n analytics::api_event::get_api_event_metrics(\n &state.pool,\n auth.merchant_account.get_id(),\n req,\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_api_event_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetApiEventFilters;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n analytics::api_event::get_filters(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_profile_connector_events(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Query,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetConnectorEvents;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n utils::check_if_profile_id_is_present_in_payment_intent(\n req.payment_id.clone(),\n &state,\n &auth,\n )\n .await\n .change_context(AnalyticsError::AccessForbiddenError)?;\n connector_events_core(&state.pool, req, auth.merchant_account.get_id())\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_global_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetGlobalSearchResults;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n\n analytics::search::msearch_results(\n &state.opensearch_client,\n req,\n search_params,\n SEARCH_INDEXES.to_vec(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n index: web::Path,\n ) -> impl Responder {\n let index = index.into_inner();\n let flow = AnalyticsFlow::GetSearchResults;\n let indexed_req = GetSearchRequestWithIndex {\n search_req: json_payload.into_inner(),\n index,\n };\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n indexed_req,\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n analytics::search::search_results(&state.opensearch_client, req, search_params)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_dispute_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetDisputeFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::disputes::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_dispute_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetDisputeFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::disputes::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_dispute_filters(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetDisputeFilters;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::disputes::get_filters(&state.pool, req, &auth)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetDisputeMetricRequest` element.\n pub async fn get_merchant_dispute_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetDisputeMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetDisputeMetricRequest\");\n let flow = AnalyticsFlow::GetDisputeMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::disputes::get_metrics(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetDisputeMetricRequest` element.\n pub async fn get_profile_dispute_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetDisputeMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetDisputeMetricRequest\");\n let flow = AnalyticsFlow::GetDisputeMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::disputes::get_metrics(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n /// # Panics\n ///\n /// Panics if `json_payload` array does not contain one `GetDisputeMetricRequest` element.\n pub async fn get_org_dispute_metrics(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json<[GetDisputeMetricRequest; 1]>,\n ) -> impl Responder {\n // safety: This shouldn't panic owing to the data type\n #[allow(clippy::expect_used)]\n let payload = json_payload\n .into_inner()\n .to_vec()\n .pop()\n .expect(\"Couldn't get GetDisputeMetricRequest\");\n let flow = AnalyticsFlow::GetDisputeMetrics;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::disputes::get_metrics(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_merchant_sankey(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSankey;\n let payload = json_payload.into_inner();\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let auth: AuthInfo = AuthInfo::MerchantLevel {\n org_id: org_id.clone(),\n merchant_ids: vec![merchant_id.clone()],\n };\n analytics::payment_intents::get_sankey(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::MerchantAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_org_sankey(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSankey;\n let payload = json_payload.into_inner();\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let auth: AuthInfo = AuthInfo::OrgLevel {\n org_id: org_id.clone(),\n };\n analytics::payment_intents::get_sankey(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::OrganizationAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n #[cfg(feature = \"v1\")]\n pub async fn get_profile_sankey(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetSankey;\n let payload = json_payload.into_inner();\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n payload,\n |state: crate::routes::SessionState, auth: AuthenticationData, req, _| async move {\n let org_id = auth.merchant_account.get_org_id();\n let merchant_id = auth.merchant_account.get_id();\n let profile_id = auth\n .profile_id\n .ok_or(report!(UserErrors::JwtProfileIdMissing))\n .change_context(AnalyticsError::AccessForbiddenError)?;\n let auth: AuthInfo = AuthInfo::ProfileLevel {\n org_id: org_id.clone(),\n merchant_id: merchant_id.clone(),\n profile_ids: vec![profile_id.clone()],\n };\n analytics::payment_intents::get_sankey(&state.pool, &auth, req)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n}", + "diff_span": { + "before": " |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n\n analytics::search::msearch_results(\n &state.opensearch_client,\n req,\n search_params,\n SEARCH_INDEXES.to_vec(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n index: web::Path,\n ) -> impl Responder {\n let index = index.into_inner();\n let flow = AnalyticsFlow::GetSearchResults;\n let indexed_req = GetSearchRequestWithIndex {\n search_req: json_payload.into_inner(),\n index,\n };\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n indexed_req,\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {", + "after": " |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n\n analytics::search::msearch_results(\n &state.opensearch_client,\n req,\n search_params,\n SEARCH_INDEXES.to_vec(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }\n\n pub async fn get_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n index: web::Path,\n ) -> impl Responder {\n let index = index.into_inner();\n let flow = AnalyticsFlow::GetSearchResults;\n let indexed_req = GetSearchRequestWithIndex {\n search_req: json_payload.into_inner(),\n index,\n };\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n indexed_req,\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::set_role_permissions_in_cache_if_required", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn set_role_permissions_in_cache_if_required(\n state: &SessionState,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n) -> UserResult<()> {\n if roles::predefined_roles::PREDEFINED_ROLES.contains_key(role_id) {\n return Ok(());\n }\n\n let role_info =\n roles::RoleInfo::from_role_id_in_merchant_scope(state, role_id, merchant_id, org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error getting role_info from role_id\")?;\n\n authz::set_role_info_in_cache(\n state,\n role_id,\n &role_info,\n i64::try_from(consts::JWT_TOKEN_TIME_IN_SECS)\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error setting permissions in redis\")\n}", + "after_code": "pub async fn set_role_permissions_in_cache_if_required(\n state: &SessionState,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n) -> UserResult<()> {\n if roles::predefined_roles::PREDEFINED_ROLES.contains_key(role_id) {\n return Ok(());\n }\n\n let role_info = roles::RoleInfo::from_role_id_and_org_id(state, role_id, org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error getting role_info from role_id\")?;\n\n authz::set_role_info_in_cache(\n state,\n role_id,\n &role_info,\n i64::try_from(consts::JWT_TOKEN_TIME_IN_SECS)\n .change_context(UserErrors::InternalServerError)?,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error setting permissions in redis\")\n}", + "diff_span": { + "before": " state: &SessionState,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n) -> UserResult<()> {\n if roles::predefined_roles::PREDEFINED_ROLES.contains_key(role_id) {\n return Ok(());\n }\n\n let role_info =\n roles::RoleInfo::from_role_id_in_merchant_scope(state, role_id, merchant_id, org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error getting role_info from role_id\")?;\n\n authz::set_role_info_in_cache(", + "after": " }\n\n let role_info = roles::RoleInfo::from_role_id_and_org_id(state, role_id, org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error getting role_info from role_id\")?;\n\n authz::set_role_info_in_cache(" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/db/role.rs::trait::RoleInterface", + "file": "crates/router/src/db/role.rs", + "kind": "trait_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub trait RoleInterface {\n async fn insert_role(\n &self,\n role: storage::RoleNew,\n ) -> CustomResult;\n\n async fn find_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult;\n\n // Replace this everywhere to find_by_role_id_and_org_id\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n // Change this everywhere the func name\n async fn find_by_role_id_and_org_id(\n &self,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n async fn update_role_by_role_id(\n &self,\n role_id: &str,\n role_update: storage::RoleUpdate,\n ) -> CustomResult;\n\n async fn delete_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult;\n\n async fn list_all_roles(\n &self,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError>;\n\n async fn list_roles_for_org_by_parameters(\n &self,\n org_id: &id_type::OrganizationId,\n merchant_id: Option<&id_type::MerchantId>,\n entity_type: Option,\n limit: Option,\n ) -> CustomResult, errors::StorageError>;\n}", + "after_code": "pub trait RoleInterface {\n async fn insert_role(\n &self,\n role: storage::RoleNew,\n ) -> CustomResult;\n\n async fn find_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult;\n\n //TODO:remove once find_by_role_id_in_lineage is stable\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n async fn find_by_role_id_and_org_id(\n &self,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n async fn update_role_by_role_id(\n &self,\n role_id: &str,\n role_update: storage::RoleUpdate,\n ) -> CustomResult;\n\n async fn delete_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult;\n\n async fn list_all_roles(\n &self,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError>;\n\n async fn list_roles_for_org_by_parameters(\n &self,\n org_id: &id_type::OrganizationId,\n merchant_id: Option<&id_type::MerchantId>,\n entity_type: Option,\n limit: Option,\n ) -> CustomResult, errors::StorageError>;\n}", + "diff_span": { + "before": " ) -> CustomResult;\n\n // Replace this everywhere to find_by_role_id_and_org_id\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n // Change this everywhere the func name\n async fn find_by_role_id_and_org_id(\n &self,", + "after": " ) -> CustomResult;\n\n //TODO:remove once find_by_role_id_in_lineage is stable\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult;\n\n async fn find_by_role_id_and_org_id(\n &self," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role.rs::function::delete_user_role", + "file": "crates/router/src/core/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn delete_user_role(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_role_api::DeleteUserRoleRequest,\n _req_state: ReqState,\n) -> UserResponse<()> {\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?.into_inner())\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\")\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?\n .into();\n\n if user_from_db.get_user_id() == user_from_token.user_id {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User deleting himself\");\n }\n\n let deletion_requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut user_role_deleted_flag = false;\n\n // Find in V2\n let user_role_v2 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v2 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n // Find in V1\n let user_role_v1 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v1 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n if !user_role_deleted_flag {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User is not associated with the merchant\");\n }\n\n // Check if user has any more role associations\n let remaining_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_db.get_user_id(),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n // If user has no more role associated with him then deleting user\n if remaining_roles.is_empty() {\n state\n .global_store\n .delete_user_by_user_id(user_from_db.get_user_id())\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user entry\")?;\n }\n\n auth::blacklist::insert_user_in_blacklist(&state, user_from_db.get_user_id()).await?;\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn delete_user_role(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_role_api::DeleteUserRoleRequest,\n _req_state: ReqState,\n) -> UserResponse<()> {\n let user_from_db: domain::UserFromStorage = state\n .global_store\n .find_user_by_email(&domain::UserEmail::from_pii_email(request.email)?.into_inner())\n .await\n .map_err(|e| {\n if e.current_context().is_db_not_found() {\n e.change_context(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\")\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })?\n .into();\n\n if user_from_db.get_user_id() == user_from_token.user_id {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User deleting himself\");\n }\n\n let deletion_requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut user_role_deleted_flag = false;\n\n // Find in V2\n let user_role_v2 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v2 {\n let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n // Find in V1\n let user_role_v1 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v1 {\n let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n if !user_role_deleted_flag {\n return Err(report!(UserErrors::InvalidDeleteOperation))\n .attach_printable(\"User is not associated with the merchant\");\n }\n\n // Check if user has any more role associations\n let remaining_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_db.get_user_id(),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n // If user has no more role associated with him then deleting user\n if remaining_roles.is_empty() {\n state\n .global_store\n .delete_user_by_user_id(user_from_db.get_user_id())\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user entry\")?;\n }\n\n auth::blacklist::insert_user_in_blacklist(&state, user_from_db.get_user_id()).await?;\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " }\n\n let deletion_requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut user_role_deleted_flag = false;\n\n // Find in V2\n let user_role_v2 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v2 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n // Find in V1\n let user_role_v1 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v1 {\n let target_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " }\n\n let deletion_requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut user_role_deleted_flag = false;\n\n // Find in V2\n let user_role_v2 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v2 {\n let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &role_to_be_deleted.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !target_role_info.is_deletable() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, role_id = {} is not deletable\",\n role_to_be_deleted.role_id\n ));\n }\n\n if deletion_requestor_role_info.get_entity_type() < target_role_info.get_entity_type() {\n return Err(report!(UserErrors::InvalidDeleteOperation)).attach_printable(format!(\n \"Invalid operation, deletion requestor = {} cannot delete target = {}\",\n deletion_requestor_role_info.get_entity_type(),\n target_role_info.get_entity_type()\n ));\n }\n\n user_role_deleted_flag = true;\n state\n .global_store\n .delete_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while deleting user role\")?;\n }\n\n // Find in V1\n let user_role_v1 = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_from_db.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(role_to_be_deleted) = user_role_v1 {\n let target_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &role_to_be_deleted.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/diesel_models/src/query/role.rs::impl::Role", + "file": "crates/diesel_models/src/query/role.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl Role {\n pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_role_id_in_merchant_scope(\n conn: &PgPooledConn,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()).and(\n dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n .eq(org_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Organization))),\n ),\n )\n .await\n }\n\n pub async fn find_by_role_id_and_org_id(\n conn: &PgPooledConn,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id\n .eq(role_id.to_owned())\n .and(dsl::org_id.eq(org_id.to_owned())),\n )\n .await\n }\n\n pub async fn update_by_role_id(\n conn: &PgPooledConn,\n role_id: &str,\n role_update: RoleUpdate,\n ) -> StorageResult {\n generics::generic_update_with_unique_predicate_get_result::<\n ::Table,\n _,\n _,\n _,\n >(\n conn,\n dsl::role_id.eq(role_id.to_owned()),\n RoleUpdateInternal::from(role_update),\n )\n .await\n }\n\n pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult {\n generics::generic_delete_one_with_result::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()),\n )\n .await\n }\n\n pub async fn list_roles(\n conn: &PgPooledConn,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult> {\n let predicate = dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n .eq(org_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Organization)));\n\n generics::generic_filter::<::Table, _, _, _>(\n conn,\n predicate,\n None,\n None,\n Some(dsl::last_modified_at.asc()),\n )\n .await\n }\n\n pub async fn generic_roles_list_for_org(\n conn: &PgPooledConn,\n org_id: id_type::OrganizationId,\n merchant_id: Option,\n entity_type: Option,\n limit: Option,\n ) -> StorageResult> {\n let mut query = ::table()\n .filter(dsl::org_id.eq(org_id))\n .into_boxed();\n\n if let Some(merchant_id) = merchant_id {\n query = query.filter(\n dsl::merchant_id\n .eq(merchant_id)\n .or(dsl::scope.eq(RoleScope::Organization)),\n );\n }\n\n if let Some(entity_type) = entity_type {\n query = query.filter(dsl::entity_type.eq(entity_type))\n }\n\n if let Some(limit) = limit {\n query = query.limit(limit.into());\n }\n\n router_env::logger::debug!(query = %debug_query::(&query).to_string());\n\n match generics::db_metrics::track_database_call::(\n query.get_results_async(conn),\n generics::db_metrics::DatabaseOperation::Filter,\n )\n .await\n {\n Ok(value) => Ok(value),\n Err(err) => match err {\n DieselError::NotFound => {\n Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n }\n _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n },\n }\n }\n}", + "after_code": "impl Role {\n pub async fn find_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()),\n )\n .await\n }\n\n // TODO:remove once find_by_role_id_in_lineage is stable\n pub async fn find_by_role_id_in_merchant_scope(\n conn: &PgPooledConn,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()).and(\n dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n .eq(org_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Organization))),\n ),\n )\n .await\n }\n\n pub async fn find_by_role_id_in_lineage(\n conn: &PgPooledConn,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id\n .eq(role_id.to_owned())\n .and(dsl::org_id.eq(org_id.to_owned()))\n .and(\n dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n .eq(merchant_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Merchant))),\n ),\n )\n .await\n }\n\n pub async fn find_by_role_id_and_org_id(\n conn: &PgPooledConn,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id\n .eq(role_id.to_owned())\n .and(dsl::org_id.eq(org_id.to_owned())),\n )\n .await\n }\n\n pub async fn update_by_role_id(\n conn: &PgPooledConn,\n role_id: &str,\n role_update: RoleUpdate,\n ) -> StorageResult {\n generics::generic_update_with_unique_predicate_get_result::<\n ::Table,\n _,\n _,\n _,\n >(\n conn,\n dsl::role_id.eq(role_id.to_owned()),\n RoleUpdateInternal::from(role_update),\n )\n .await\n }\n\n pub async fn delete_by_role_id(conn: &PgPooledConn, role_id: &str) -> StorageResult {\n generics::generic_delete_one_with_result::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()),\n )\n .await\n }\n\n pub async fn list_roles(\n conn: &PgPooledConn,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult> {\n let predicate = dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n .eq(org_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Organization)));\n\n generics::generic_filter::<::Table, _, _, _>(\n conn,\n predicate,\n None,\n None,\n Some(dsl::last_modified_at.asc()),\n )\n .await\n }\n\n pub async fn generic_roles_list_for_org(\n conn: &PgPooledConn,\n org_id: id_type::OrganizationId,\n merchant_id: Option,\n entity_type: Option,\n limit: Option,\n ) -> StorageResult> {\n let mut query = ::table()\n .filter(dsl::org_id.eq(org_id))\n .into_boxed();\n\n if let Some(merchant_id) = merchant_id {\n query = query.filter(\n dsl::merchant_id\n .eq(merchant_id)\n .or(dsl::scope.eq(RoleScope::Organization)),\n );\n }\n\n if let Some(entity_type) = entity_type {\n query = query.filter(dsl::entity_type.eq(entity_type))\n }\n\n if let Some(limit) = limit {\n query = query.limit(limit.into());\n }\n\n router_env::logger::debug!(query = %debug_query::(&query).to_string());\n\n match generics::db_metrics::track_database_call::(\n query.get_results_async(conn),\n generics::db_metrics::DatabaseOperation::Filter,\n )\n .await\n {\n Ok(value) => Ok(value),\n Err(err) => match err {\n DieselError::NotFound => {\n Err(report!(err)).change_context(errors::DatabaseError::NotFound)\n }\n _ => Err(report!(err)).change_context(errors::DatabaseError::Others),\n },\n }\n }\n}", + "diff_span": { + "before": "", + "after": " }\n\n // TODO:remove once find_by_role_id_in_lineage is stable\n pub async fn find_by_role_id_in_merchant_scope(\n conn: &PgPooledConn,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id.eq(role_id.to_owned()).and(\n dsl::merchant_id.eq(merchant_id.to_owned()).or(dsl::org_id\n .eq(org_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Organization))),\n ),\n )\n .await\n }\n\n pub async fn find_by_role_id_in_lineage(\n conn: &PgPooledConn,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id\n .eq(role_id.to_owned())\n .and(dsl::org_id.eq(org_id.to_owned()))\n .and(\n dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n .eq(merchant_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Merchant))),\n ),\n )\n .await" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role/role.rs::function::get_role_with_groups", + "file": "crates/router/src/core/user_role/role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_role_with_groups(\n state: SessionState,\n user_from_token: UserFromToken,\n role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleId.into());\n }\n\n Ok(ApplicationResponse::Json(\n role_api::RoleInfoWithGroupsResponse {\n groups: role_info.get_permission_groups().to_vec(),\n role_id: role.role_id,\n role_name: role_info.get_role_name().to_string(),\n role_scope: role_info.get_scope(),\n },\n ))\n}", + "after_code": "pub async fn get_role_with_groups(\n state: SessionState,\n user_from_token: UserFromToken,\n role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, &role.role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleId.into());\n }\n\n Ok(ApplicationResponse::Json(\n role_api::RoleInfoWithGroupsResponse {\n groups: role_info.get_permission_groups().to_vec(),\n role_id: role.role_id,\n role_name: role_info.get_role_name().to_string(),\n role_scope: role_info.get_scope(),\n },\n ))\n}", + "diff_span": { + "before": " role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {", + "after": " role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, &role.role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/utils/user.rs::UserFromToken::function::get_role_info_from_db", + "file": "crates/router/src/utils/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_in_merchant_scope(\n state,\n &self.role_id,\n &self.merchant_id,\n &self.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n }", + "after_code": "pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_and_org_id(state, &self.role_id, &self.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n }", + "diff_span": { + "before": "pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_in_merchant_scope(\n state,\n &self.role_id,\n &self.merchant_id,\n &self.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n }", + "after": "pub async fn get_role_info_from_db(&self, state: &SessionState) -> UserResult {\n RoleInfo::from_role_id_and_org_id(state, &self.role_id, &self.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n }" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::list_profiles_for_user_in_org_and_merchant_account", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_profiles_for_user_in_org_and_merchant_account(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let key_manager_state = &(&state).into();\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &user_from_token.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n let profiles = match role_info.get_entity_type() {\n EntityType::Organization | EntityType::Merchant => state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &key_store,\n &user_from_token.merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?,\n EntityType::Profile => {\n let profile_ids = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.profile_id)\n .collect::>();\n\n futures::future::try_join_all(profile_ids.iter().map(|profile_id| {\n state.store.find_business_profile_by_profile_id(\n key_manager_state,\n &key_store,\n profile_id,\n )\n }))\n .await\n .change_context(UserErrors::InternalServerError)?\n }\n };\n\n if profiles.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No profile found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(\n profiles\n .into_iter()\n .map(\n |profile| user_api::ListProfilesForUserInOrgAndMerchantAccountResponse {\n profile_id: profile.get_id().to_owned(),\n profile_name: profile.profile_name,\n },\n )\n .collect::>(),\n ))\n}", + "after_code": "pub async fn list_profiles_for_user_in_org_and_merchant_account(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let key_manager_state = &(&state).into();\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &user_from_token.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n let profiles = match role_info.get_entity_type() {\n EntityType::Organization | EntityType::Merchant => state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &key_store,\n &user_from_token.merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?,\n EntityType::Profile => {\n let profile_ids = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.profile_id)\n .collect::>();\n\n futures::future::try_join_all(profile_ids.iter().map(|profile_id| {\n state.store.find_business_profile_by_profile_id(\n key_manager_state,\n &key_store,\n profile_id,\n )\n }))\n .await\n .change_context(UserErrors::InternalServerError)?\n }\n };\n\n if profiles.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No profile found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(\n profiles\n .into_iter()\n .map(\n |profile| user_api::ListProfilesForUserInOrgAndMerchantAccountResponse {\n profile_id: profile.get_id().to_owned(),\n profile_name: profile.profile_name,\n },\n )\n .collect::>(),\n ))\n}", + "diff_span": { + "before": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/analytics.rs::routes::function::get_global_search_results", + "file": "crates/router/src/analytics.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_global_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetGlobalSearchResults;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n\n analytics::search::msearch_results(\n &state.opensearch_client,\n req,\n search_params,\n SEARCH_INDEXES.to_vec(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }", + "after_code": "pub async fn get_global_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n ) -> impl Responder {\n let flow = AnalyticsFlow::GetGlobalSearchResults;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n json_payload.into_inner(),\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n\n analytics::search::msearch_results(\n &state.opensearch_client,\n req,\n search_params,\n SEARCH_INDEXES.to_vec(),\n )\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }", + "diff_span": { + "before": " |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {", + "after": " |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/db/role.rs::impl::MockDb", + "file": "crates/router/src/db/role.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl RoleInterface for MockDb {\n async fn insert_role(\n &self,\n role: storage::RoleNew,\n ) -> CustomResult {\n let mut roles = self.roles.lock().await;\n if roles\n .iter()\n .any(|role_inner| role_inner.role_id == role.role_id)\n {\n Err(errors::StorageError::DuplicateValue {\n entity: \"role_id\",\n key: None,\n })?\n }\n let role = storage::Role {\n role_name: role.role_name,\n role_id: role.role_id,\n merchant_id: role.merchant_id,\n org_id: role.org_id,\n groups: role.groups,\n scope: role.scope,\n entity_type: role.entity_type,\n created_by: role.created_by,\n created_at: role.created_at,\n last_modified_at: role.last_modified_at,\n last_modified_by: role.last_modified_by,\n };\n roles.push(role.clone());\n Ok(role)\n }\n\n async fn find_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| role.role_id == role_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available role_id = {role_id}\"\n ))\n .into(),\n )\n }\n\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| {\n role.role_id == role_id\n && (role.merchant_id == *merchant_id\n || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n })\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in merchant scope for role_id = {role_id}, \\\n merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_by_role_id_and_org_id(\n &self,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| role.role_id == role_id && role.org_id == *org_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in org scope for role_id = {role_id} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }\n\n async fn update_role_by_role_id(\n &self,\n role_id: &str,\n role_update: storage::RoleUpdate,\n ) -> CustomResult {\n let mut roles = self.roles.lock().await;\n roles\n .iter_mut()\n .find(|role| role.role_id == role_id)\n .map(|role| {\n *role = match role_update {\n storage::RoleUpdate::UpdateDetails {\n groups,\n role_name,\n last_modified_at,\n last_modified_by,\n } => storage::Role {\n groups: groups.unwrap_or(role.groups.to_owned()),\n role_name: role_name.unwrap_or(role.role_name.to_owned()),\n last_modified_by,\n last_modified_at,\n ..role.to_owned()\n },\n };\n role.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available for role_id = {role_id}\"\n ))\n .into(),\n )\n }\n\n async fn delete_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let mut roles = self.roles.lock().await;\n let role_index = roles\n .iter()\n .position(|role| role.role_id == role_id)\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"No role available for role_id = {role_id}\"\n )))?;\n\n Ok(roles.remove(role_index))\n }\n\n async fn list_all_roles(\n &self,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let roles = self.roles.lock().await;\n\n let roles_list: Vec<_> = roles\n .iter()\n .filter(|role| {\n role.merchant_id == *merchant_id\n || (role.org_id == *org_id\n && role.scope == diesel_models::enums::RoleScope::Organization)\n })\n .cloned()\n .collect();\n\n if roles_list.is_empty() {\n return Err(errors::StorageError::ValueNotFound(format!(\n \"No role found for merchant id = {:?} and org_id = {:?}\",\n merchant_id, org_id\n ))\n .into());\n }\n\n Ok(roles_list)\n }\n\n #[instrument(skip_all)]\n async fn list_roles_for_org_by_parameters(\n &self,\n org_id: &id_type::OrganizationId,\n merchant_id: Option<&id_type::MerchantId>,\n entity_type: Option,\n limit: Option,\n ) -> CustomResult, errors::StorageError> {\n let roles = self.roles.lock().await;\n let limit_usize = limit.unwrap_or(u32::MAX).try_into().unwrap_or(usize::MAX);\n let roles_list: Vec<_> = roles\n .iter()\n .filter(|role| {\n let matches_merchant = match merchant_id {\n Some(merchant_id) => role.merchant_id == *merchant_id,\n None => true,\n };\n\n matches_merchant && role.org_id == *org_id && Some(role.entity_type) == entity_type\n })\n .take(limit_usize)\n .cloned()\n .collect();\n\n Ok(roles_list)\n }\n}", + "after_code": "impl RoleInterface for MockDb {\n async fn insert_role(\n &self,\n role: storage::RoleNew,\n ) -> CustomResult {\n let mut roles = self.roles.lock().await;\n if roles\n .iter()\n .any(|role_inner| role_inner.role_id == role.role_id)\n {\n Err(errors::StorageError::DuplicateValue {\n entity: \"role_id\",\n key: None,\n })?\n }\n let role = storage::Role {\n role_name: role.role_name,\n role_id: role.role_id,\n merchant_id: role.merchant_id,\n org_id: role.org_id,\n groups: role.groups,\n scope: role.scope,\n entity_type: role.entity_type,\n created_by: role.created_by,\n created_at: role.created_at,\n last_modified_at: role.last_modified_at,\n last_modified_by: role.last_modified_by,\n };\n roles.push(role.clone());\n Ok(role)\n }\n\n async fn find_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| role.role_id == role_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available role_id = {role_id}\"\n ))\n .into(),\n )\n }\n\n // TODO:remove once find_by_role_id_in_lineage is stable\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| {\n role.role_id == role_id\n && (role.merchant_id == *merchant_id\n || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n })\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in merchant scope for role_id = {role_id}, \\\n merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| {\n role.role_id == role_id\n && role.org_id == *org_id\n && ((role.scope == enums::RoleScope::Organization)\n || (role.merchant_id == *merchant_id\n && role.scope == enums::RoleScope::Merchant))\n })\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in merchant scope for role_id = {role_id}, \\\n merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_by_role_id_and_org_id(\n &self,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| role.role_id == role_id && role.org_id == *org_id)\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in org scope for role_id = {role_id} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }\n\n async fn update_role_by_role_id(\n &self,\n role_id: &str,\n role_update: storage::RoleUpdate,\n ) -> CustomResult {\n let mut roles = self.roles.lock().await;\n roles\n .iter_mut()\n .find(|role| role.role_id == role_id)\n .map(|role| {\n *role = match role_update {\n storage::RoleUpdate::UpdateDetails {\n groups,\n role_name,\n last_modified_at,\n last_modified_by,\n } => storage::Role {\n groups: groups.unwrap_or(role.groups.to_owned()),\n role_name: role_name.unwrap_or(role.role_name.to_owned()),\n last_modified_by,\n last_modified_at,\n ..role.to_owned()\n },\n };\n role.to_owned()\n })\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available for role_id = {role_id}\"\n ))\n .into(),\n )\n }\n\n async fn delete_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let mut roles = self.roles.lock().await;\n let role_index = roles\n .iter()\n .position(|role| role.role_id == role_id)\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"No role available for role_id = {role_id}\"\n )))?;\n\n Ok(roles.remove(role_index))\n }\n\n async fn list_all_roles(\n &self,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let roles = self.roles.lock().await;\n\n let roles_list: Vec<_> = roles\n .iter()\n .filter(|role| {\n role.merchant_id == *merchant_id\n || (role.org_id == *org_id\n && role.scope == diesel_models::enums::RoleScope::Organization)\n })\n .cloned()\n .collect();\n\n if roles_list.is_empty() {\n return Err(errors::StorageError::ValueNotFound(format!(\n \"No role found for merchant id = {:?} and org_id = {:?}\",\n merchant_id, org_id\n ))\n .into());\n }\n\n Ok(roles_list)\n }\n\n #[instrument(skip_all)]\n async fn list_roles_for_org_by_parameters(\n &self,\n org_id: &id_type::OrganizationId,\n merchant_id: Option<&id_type::MerchantId>,\n entity_type: Option,\n limit: Option,\n ) -> CustomResult, errors::StorageError> {\n let roles = self.roles.lock().await;\n let limit_usize = limit.unwrap_or(u32::MAX).try_into().unwrap_or(usize::MAX);\n let roles_list: Vec<_> = roles\n .iter()\n .filter(|role| {\n let matches_merchant = match merchant_id {\n Some(merchant_id) => role.merchant_id == *merchant_id,\n None => true,\n };\n\n matches_merchant && role.org_id == *org_id && Some(role.entity_type) == entity_type\n })\n .take(limit_usize)\n .cloned()\n .collect();\n\n Ok(roles_list)\n }\n}", + "diff_span": { + "before": "", + "after": " }\n\n // TODO:remove once find_by_role_id_in_lineage is stable\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| {\n role.role_id == role_id\n && (role.merchant_id == *merchant_id\n || (role.org_id == *org_id && role.scope == enums::RoleScope::Organization))\n })\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in merchant scope for role_id = {role_id}, \\\n merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }\n\n async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| {\n role.role_id == role_id\n && role.org_id == *org_id\n && ((role.scope == enums::RoleScope::Organization)\n || (role.merchant_id == *merchant_id\n && role.scope == enums::RoleScope::Merchant))\n })\n .cloned()" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role.rs::function::list_users_in_lineage", + "file": "crates/router/src/core/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_users_in_lineage(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_role_api::ListUsersInEntityRequest,\n) -> UserResponse> {\n let requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let user_roles_set: HashSet<_> = match utils::user_role::get_min_entity(\n requestor_role_info.get_entity_type(),\n request.entity_type,\n )? {\n EntityType::Organization => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n org_id: &user_from_token.org_id,\n merchant_id: None,\n profile_id: None,\n version: None,\n limit: None,\n },\n request.entity_type,\n )\n .await?\n }\n EntityType::Merchant => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n org_id: &user_from_token.org_id,\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id: None,\n version: None,\n limit: None,\n },\n request.entity_type,\n )\n .await?\n }\n EntityType::Profile => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n org_id: &user_from_token.org_id,\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id: Some(&user_from_token.profile_id),\n version: None,\n limit: None,\n },\n request.entity_type,\n )\n .await?\n }\n };\n\n // This filtering is needed because for org level users in V1, merchant_id is present.\n // Due to this, we get org level users in merchant level users list.\n let user_roles_set = user_roles_set\n .into_iter()\n .filter_map(|user_role| {\n let (_entity_id, entity_type) = user_role.get_entity_id_and_type()?;\n (entity_type <= requestor_role_info.get_entity_type()).then_some(user_role)\n })\n .collect::>();\n\n let mut email_map = state\n .global_store\n .find_users_by_user_ids(\n user_roles_set\n .iter()\n .map(|user_role| user_role.user_id.clone())\n .collect(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|user| (user.user_id.clone(), user.email))\n .collect::>();\n\n let role_info_map =\n futures::future::try_join_all(user_roles_set.iter().map(|user_role| async {\n roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_role.role_id,\n &user_from_token.org_id,\n )\n .await\n .map(|role_info| {\n (\n user_role.role_id.clone(),\n user_role_api::role::MinimalRoleInfo {\n role_id: user_role.role_id.clone(),\n role_name: role_info.get_role_name().to_string(),\n },\n )\n })\n }))\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n let user_role_map = user_roles_set\n .into_iter()\n .fold(HashMap::new(), |mut map, user_role| {\n map.entry(user_role.user_id)\n .or_insert(Vec::with_capacity(1))\n .push(user_role.role_id);\n map\n });\n\n Ok(ApplicationResponse::Json(\n user_role_map\n .into_iter()\n .map(|(user_id, role_id_vec)| {\n Ok::<_, error_stack::Report>(user_role_api::ListUsersInEntityResponse {\n email: email_map\n .remove(&user_id)\n .ok_or(UserErrors::InternalServerError)?,\n roles: role_id_vec\n .into_iter()\n .map(|role_id| {\n role_info_map\n .get(&role_id)\n .cloned()\n .ok_or(UserErrors::InternalServerError)\n })\n .collect::, _>>()?,\n })\n })\n .collect::, _>>()?,\n ))\n}", + "after_code": "pub async fn list_users_in_lineage(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_role_api::ListUsersInEntityRequest,\n) -> UserResponse> {\n let requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let user_roles_set: HashSet<_> = match utils::user_role::get_min_entity(\n requestor_role_info.get_entity_type(),\n request.entity_type,\n )? {\n EntityType::Organization => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n org_id: &user_from_token.org_id,\n merchant_id: None,\n profile_id: None,\n version: None,\n limit: None,\n },\n request.entity_type,\n )\n .await?\n }\n EntityType::Merchant => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n org_id: &user_from_token.org_id,\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id: None,\n version: None,\n limit: None,\n },\n request.entity_type,\n )\n .await?\n }\n EntityType::Profile => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n org_id: &user_from_token.org_id,\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id: Some(&user_from_token.profile_id),\n version: None,\n limit: None,\n },\n request.entity_type,\n )\n .await?\n }\n };\n\n // This filtering is needed because for org level users in V1, merchant_id is present.\n // Due to this, we get org level users in merchant level users list.\n let user_roles_set = user_roles_set\n .into_iter()\n .filter_map(|user_role| {\n let (_entity_id, entity_type) = user_role.get_entity_id_and_type()?;\n (entity_type <= requestor_role_info.get_entity_type()).then_some(user_role)\n })\n .collect::>();\n\n let mut email_map = state\n .global_store\n .find_users_by_user_ids(\n user_roles_set\n .iter()\n .map(|user_role| user_role.user_id.clone())\n .collect(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|user| (user.user_id.clone(), user.email))\n .collect::>();\n\n let role_info_map =\n futures::future::try_join_all(user_roles_set.iter().map(|user_role| async {\n roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_role.role_id,\n &user_from_token.org_id,\n )\n .await\n .map(|role_info| {\n (\n user_role.role_id.clone(),\n user_role_api::role::MinimalRoleInfo {\n role_id: user_role.role_id.clone(),\n role_name: role_info.get_role_name().to_string(),\n },\n )\n })\n }))\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n let user_role_map = user_roles_set\n .into_iter()\n .fold(HashMap::new(), |mut map, user_role| {\n map.entry(user_role.user_id)\n .or_insert(Vec::with_capacity(1))\n .push(user_role.role_id);\n map\n });\n\n Ok(ApplicationResponse::Json(\n user_role_map\n .into_iter()\n .map(|(user_id, role_id_vec)| {\n Ok::<_, error_stack::Report>(user_role_api::ListUsersInEntityResponse {\n email: email_map\n .remove(&user_id)\n .ok_or(UserErrors::InternalServerError)?,\n roles: role_id_vec\n .into_iter()\n .map(|role_id| {\n role_info_map\n .get(&role_id)\n .cloned()\n .ok_or(UserErrors::InternalServerError)\n })\n .collect::, _>>()?,\n })\n })\n .collect::, _>>()?,\n ))\n}", + "diff_span": { + "before": " request: user_role_api::ListUsersInEntityRequest,\n) -> UserResponse> {\n let requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " request: user_role_api::ListUsersInEntityRequest,\n) -> UserResponse> {\n let requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::switch_profile_for_user_in_org_and_merchant", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn switch_profile_for_user_in_org_and_merchant(\n state: SessionState,\n request: user_api::SwitchProfileRequest,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n if user_from_token.profile_id == request.profile_id {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User switching to same profile\".to_string(),\n )\n .into());\n }\n\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n let (profile_id, role_id) = match role_info.get_entity_type() {\n EntityType::Organization | EntityType::Merchant => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &user_from_token.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve merchant key store by merchant_id\")?;\n\n let profile_id = state\n .store\n .find_business_profile_by_merchant_id_profile_id(\n key_manager_state,\n &merchant_key_store,\n &user_from_token.merchant_id,\n &request.profile_id,\n )\n .await\n .change_context(UserErrors::InvalidRoleOperationWithMessage(\n \"No such profile found for the merchant\".to_string(),\n ))?\n .get_id()\n .to_owned();\n (profile_id, user_from_token.role_id)\n }\n\n EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload{\n user_id:&user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id:Some(&request.profile_id),\n entity_id: None,\n version:None,\n status: Some(UserStatus::Active),\n limit: Some(1)\n }\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles for the given user_id, org_id, merchant_id and profile_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the profile\".to_string(),\n ))?;\n\n (request.profile_id, user_role.role_id)\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n user_from_token.merchant_id.clone(),\n user_from_token.org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n &state,\n &role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: common_enums::TokenPurpose::UserInfo,\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn switch_profile_for_user_in_org_and_merchant(\n state: SessionState,\n request: user_api::SwitchProfileRequest,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n if user_from_token.profile_id == request.profile_id {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User switching to same profile\".to_string(),\n )\n .into());\n }\n\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n let (profile_id, role_id) = match role_info.get_entity_type() {\n EntityType::Organization | EntityType::Merchant => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &user_from_token.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve merchant key store by merchant_id\")?;\n\n let profile_id = state\n .store\n .find_business_profile_by_merchant_id_profile_id(\n key_manager_state,\n &merchant_key_store,\n &user_from_token.merchant_id,\n &request.profile_id,\n )\n .await\n .change_context(UserErrors::InvalidRoleOperationWithMessage(\n \"No such profile found for the merchant\".to_string(),\n ))?\n .get_id()\n .to_owned();\n (profile_id, user_from_token.role_id)\n }\n\n EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload{\n user_id:&user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id:Some(&request.profile_id),\n entity_id: None,\n version:None,\n status: Some(UserStatus::Active),\n limit: Some(1)\n }\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles for the given user_id, org_id, merchant_id and profile_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the profile\".to_string(),\n ))?;\n\n (request.profile_id, user_role.role_id)\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n user_from_token.merchant_id.clone(),\n user_from_token.org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_org_id(\n &state,\n &role_id,\n &user_from_token.org_id,\n )\n .await;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: common_enums::TokenPurpose::UserInfo,\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": "\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n let (profile_id, role_id) = match role_info.get_entity_type() {\n EntityType::Organization | EntityType::Merchant => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &user_from_token.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve merchant key store by merchant_id\")?;\n\n let profile_id = state\n .store\n .find_business_profile_by_merchant_id_profile_id(\n key_manager_state,\n &merchant_key_store,\n &user_from_token.merchant_id,\n &request.profile_id,\n )\n .await\n .change_context(UserErrors::InvalidRoleOperationWithMessage(\n \"No such profile found for the merchant\".to_string(),\n ))?\n .get_id()\n .to_owned();\n (profile_id, user_from_token.role_id)\n }\n\n EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload{\n user_id:&user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id:Some(&request.profile_id),\n entity_id: None,\n version:None,\n status: Some(UserStatus::Active),\n limit: Some(1)\n }\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles for the given user_id, org_id, merchant_id and profile_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the profile\".to_string(),\n ))?;\n\n (request.profile_id, user_role.role_id)\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n user_from_token.merchant_id.clone(),\n user_from_token.org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n &state,\n &role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": "\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n let (profile_id, role_id) = match role_info.get_entity_type() {\n EntityType::Organization | EntityType::Merchant => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &user_from_token.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve merchant key store by merchant_id\")?;\n\n let profile_id = state\n .store\n .find_business_profile_by_merchant_id_profile_id(\n key_manager_state,\n &merchant_key_store,\n &user_from_token.merchant_id,\n &request.profile_id,\n )\n .await\n .change_context(UserErrors::InvalidRoleOperationWithMessage(\n \"No such profile found for the merchant\".to_string(),\n ))?\n .get_id()\n .to_owned();\n (profile_id, user_from_token.role_id)\n }\n\n EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload{\n user_id:&user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&user_from_token.merchant_id),\n profile_id:Some(&request.profile_id),\n entity_id: None,\n version:None,\n status: Some(UserStatus::Active),\n limit: Some(1)\n }\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles for the given user_id, org_id, merchant_id and profile_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the profile\".to_string(),\n ))?;\n\n (request.profile_id, user_role.role_id)\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n user_from_token.merchant_id.clone(),\n user_from_token.org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_org_id(\n &state,\n &role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::get_user_details", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_user_details(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n let user = user_from_token.get_user_from_db(&state).await?;\n let verification_days_left = utils::user::get_verification_days_left(&state, &user)?;\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::Json(\n user_api::GetUserDetailsResponse {\n merchant_id: user_from_token.merchant_id,\n name: user.get_name(),\n email: user.get_email(),\n user_id: user.get_user_id().to_string(),\n verification_days_left,\n role_id: user_from_token.role_id,\n org_id: user_from_token.org_id,\n is_two_factor_auth_setup: user.get_totp_status() == TotpStatus::Set,\n recovery_codes_left: user.get_recovery_codes().map(|codes| codes.len()),\n profile_id: user_from_token.profile_id,\n entity_type: role_info.get_entity_type(),\n },\n ))\n}", + "after_code": "pub async fn get_user_details(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n let user = user_from_token.get_user_from_db(&state).await?;\n let verification_days_left = utils::user::get_verification_days_left(&state, &user)?;\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::Json(\n user_api::GetUserDetailsResponse {\n merchant_id: user_from_token.merchant_id,\n name: user.get_name(),\n email: user.get_email(),\n user_id: user.get_user_id().to_string(),\n verification_days_left,\n role_id: user_from_token.role_id,\n org_id: user_from_token.org_id,\n is_two_factor_auth_setup: user.get_totp_status() == TotpStatus::Set,\n recovery_codes_left: user.get_recovery_codes().map(|codes| codes.len()),\n profile_id: user_from_token.profile_id,\n entity_type: role_info.get_entity_type(),\n },\n ))\n}", + "diff_span": { + "before": " let user = user_from_token.get_user_from_db(&state).await?;\n let verification_days_left = utils::user::get_verification_days_left(&state, &user)?;\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " let user = user_from_token.get_user_from_db(&state).await?;\n let verification_days_left = utils::user::get_verification_days_left(&state, &user)?;\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::list_user_roles_details", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_user_roles_details(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_api::GetUserRoleDetailsRequest,\n _req_state: ReqState,\n) -> UserResponse> {\n let required_user = utils::user::get_user_from_db_by_email(&state, request.email.try_into()?)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n let requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InternalServerError)\n .attach_printable(\"Failed to fetch role info\")?;\n\n if requestor_role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n\n let user_roles_set = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: required_user.get_user_id(),\n org_id: Some(&user_from_token.org_id),\n merchant_id: (requestor_role_info.get_entity_type() <= EntityType::Merchant)\n .then_some(&user_from_token.merchant_id),\n profile_id: (requestor_role_info.get_entity_type() <= EntityType::Profile)\n .then_some(&user_from_token.profile_id),\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to fetch user roles\")?\n .into_iter()\n .collect::>();\n\n let org_name = state\n .store\n .find_organization_by_org_id(&user_from_token.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Org id not found\")?\n .get_organization_name();\n\n let org = NameIdUnit {\n id: user_from_token.org_id.clone(),\n name: org_name,\n };\n\n let (merchant_ids, merchant_profile_ids) = user_roles_set.iter().try_fold(\n (Vec::new(), Vec::new()),\n |(mut merchant, mut merchant_profile), user_role| {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Failed to compute entity id and type\")?;\n\n match entity_type {\n EntityType::Merchant => {\n let merchant_id = user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\n \"Merchant id not found in user role for merchant level entity\",\n )?;\n merchant.push(merchant_id)\n }\n EntityType::Profile => {\n let merchant_id = user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\n \"Merchant id not found in user role for merchant level entity\",\n )?;\n let profile_id = user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\n \"Profile id not found in user role for profile level entity\",\n )?;\n\n merchant.push(merchant_id.clone());\n merchant_profile.push((merchant_id, profile_id))\n }\n EntityType::Organization => (),\n };\n\n Ok::<_, error_stack::Report>((merchant, merchant_profile))\n },\n )?;\n\n let merchant_map = state\n .store\n .list_multiple_merchant_accounts(&(&state).into(), merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while listing merchant accounts\")?\n .into_iter()\n .map(|merchant_account| {\n (\n merchant_account.get_id().to_owned(),\n merchant_account.merchant_name.clone(),\n )\n })\n .collect::>();\n\n let key_manager_state = &(&state).into();\n\n let profile_map = futures::future::try_join_all(merchant_profile_ids.iter().map(\n |merchant_profile_id| async {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &merchant_profile_id.0,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve merchant key store by merchant_id\")?;\n\n state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n &merchant_key_store,\n &merchant_profile_id.1,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve business profile\")\n },\n ))\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to construct profile map\")?\n .into_iter()\n .map(|profile| (profile.get_id().to_owned(), profile.profile_name))\n .collect::>();\n\n let role_name_map = futures::future::try_join_all(\n user_roles_set\n .iter()\n .map(|user_role| user_role.role_id.clone())\n .collect::>()\n .into_iter()\n .map(|role_id| async {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok::<_, error_stack::Report<_>>((role_id, role_info.get_role_name().to_string()))\n }),\n )\n .await?\n .into_iter()\n .collect::>();\n\n let role_details_list: Vec<_> = user_roles_set\n .iter()\n .map(|user_role| {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n let (merchant, profile) = match entity_type {\n EntityType::Organization => (None, None),\n EntityType::Merchant => {\n let merchant_id = &user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?;\n\n (\n Some(NameIdUnit {\n id: merchant_id.clone(),\n name: merchant_map\n .get(merchant_id)\n .ok_or(UserErrors::InternalServerError)?\n .to_owned(),\n }),\n None,\n )\n }\n EntityType::Profile => {\n let merchant_id = &user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?;\n let profile_id = &user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?;\n\n (\n Some(NameIdUnit {\n id: merchant_id.clone(),\n name: merchant_map\n .get(merchant_id)\n .ok_or(UserErrors::InternalServerError)?\n .to_owned(),\n }),\n Some(NameIdUnit {\n id: profile_id.clone(),\n name: profile_map\n .get(profile_id)\n .ok_or(UserErrors::InternalServerError)?\n .to_owned(),\n }),\n )\n }\n };\n\n Ok(user_api::GetUserRoleDetailsResponseV2 {\n role_id: user_role.role_id.clone(),\n org: org.clone(),\n merchant,\n profile,\n status: user_role.status.foreign_into(),\n entity_type,\n role_name: role_name_map\n .get(&user_role.role_id)\n .ok_or(UserErrors::InternalServerError)\n .cloned()?,\n })\n })\n .collect::, UserErrors>>()?;\n\n Ok(ApplicationResponse::Json(role_details_list))\n}", + "after_code": "pub async fn list_user_roles_details(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n request: user_api::GetUserRoleDetailsRequest,\n _req_state: ReqState,\n) -> UserResponse> {\n let required_user = utils::user::get_user_from_db_by_email(&state, request.email.try_into()?)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n let requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InternalServerError)\n .attach_printable(\"Failed to fetch role info\")?;\n\n if requestor_role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n\n let user_roles_set = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: required_user.get_user_id(),\n org_id: Some(&user_from_token.org_id),\n merchant_id: (requestor_role_info.get_entity_type() <= EntityType::Merchant)\n .then_some(&user_from_token.merchant_id),\n profile_id: (requestor_role_info.get_entity_type() <= EntityType::Profile)\n .then_some(&user_from_token.profile_id),\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to fetch user roles\")?\n .into_iter()\n .collect::>();\n\n let org_name = state\n .store\n .find_organization_by_org_id(&user_from_token.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Org id not found\")?\n .get_organization_name();\n\n let org = NameIdUnit {\n id: user_from_token.org_id.clone(),\n name: org_name,\n };\n\n let (merchant_ids, merchant_profile_ids) = user_roles_set.iter().try_fold(\n (Vec::new(), Vec::new()),\n |(mut merchant, mut merchant_profile), user_role| {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Failed to compute entity id and type\")?;\n\n match entity_type {\n EntityType::Merchant => {\n let merchant_id = user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\n \"Merchant id not found in user role for merchant level entity\",\n )?;\n merchant.push(merchant_id)\n }\n EntityType::Profile => {\n let merchant_id = user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\n \"Merchant id not found in user role for merchant level entity\",\n )?;\n let profile_id = user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\n \"Profile id not found in user role for profile level entity\",\n )?;\n\n merchant.push(merchant_id.clone());\n merchant_profile.push((merchant_id, profile_id))\n }\n EntityType::Organization => (),\n };\n\n Ok::<_, error_stack::Report>((merchant, merchant_profile))\n },\n )?;\n\n let merchant_map = state\n .store\n .list_multiple_merchant_accounts(&(&state).into(), merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while listing merchant accounts\")?\n .into_iter()\n .map(|merchant_account| {\n (\n merchant_account.get_id().to_owned(),\n merchant_account.merchant_name.clone(),\n )\n })\n .collect::>();\n\n let key_manager_state = &(&state).into();\n\n let profile_map = futures::future::try_join_all(merchant_profile_ids.iter().map(\n |merchant_profile_id| async {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &merchant_profile_id.0,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve merchant key store by merchant_id\")?;\n\n state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n &merchant_key_store,\n &merchant_profile_id.1,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve business profile\")\n },\n ))\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to construct profile map\")?\n .into_iter()\n .map(|profile| (profile.get_id().to_owned(), profile.profile_name))\n .collect::>();\n\n let role_name_map = futures::future::try_join_all(\n user_roles_set\n .iter()\n .map(|user_role| user_role.role_id.clone())\n .collect::>()\n .into_iter()\n .map(|role_id| async {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok::<_, error_stack::Report<_>>((role_id, role_info.get_role_name().to_string()))\n }),\n )\n .await?\n .into_iter()\n .collect::>();\n\n let role_details_list: Vec<_> = user_roles_set\n .iter()\n .map(|user_role| {\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n let (merchant, profile) = match entity_type {\n EntityType::Organization => (None, None),\n EntityType::Merchant => {\n let merchant_id = &user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?;\n\n (\n Some(NameIdUnit {\n id: merchant_id.clone(),\n name: merchant_map\n .get(merchant_id)\n .ok_or(UserErrors::InternalServerError)?\n .to_owned(),\n }),\n None,\n )\n }\n EntityType::Profile => {\n let merchant_id = &user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?;\n let profile_id = &user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?;\n\n (\n Some(NameIdUnit {\n id: merchant_id.clone(),\n name: merchant_map\n .get(merchant_id)\n .ok_or(UserErrors::InternalServerError)?\n .to_owned(),\n }),\n Some(NameIdUnit {\n id: profile_id.clone(),\n name: profile_map\n .get(profile_id)\n .ok_or(UserErrors::InternalServerError)?\n .to_owned(),\n }),\n )\n }\n };\n\n Ok(user_api::GetUserRoleDetailsResponseV2 {\n role_id: user_role.role_id.clone(),\n org: org.clone(),\n merchant,\n profile,\n status: user_role.status.foreign_into(),\n entity_type,\n role_name: role_name_map\n .get(&user_role.role_id)\n .ok_or(UserErrors::InternalServerError)\n .cloned()?,\n })\n })\n .collect::, UserErrors>>()?;\n\n Ok(ApplicationResponse::Json(role_details_list))\n}", + "diff_span": { + "before": " .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n let requestor_role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n let requestor_role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/db/role.rs::impl::Store", + "file": "crates/router/src/db/role.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl RoleInterface for Store {\n #[instrument(skip_all)]\n async fn insert_role(\n &self,\n role: storage::RoleNew,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n role.insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id(&conn, role_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_in_merchant_scope(&conn, role_id, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_by_role_id_and_org_id(\n &self,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_and_org_id(&conn, role_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_role_by_role_id(\n &self,\n role_id: &str,\n role_update: storage::RoleUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::Role::update_by_role_id(&conn, role_id, role_update)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn delete_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::Role::delete_by_role_id(&conn, role_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn list_all_roles(\n &self,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::list_roles(&conn, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn list_roles_for_org_by_parameters(\n &self,\n org_id: &id_type::OrganizationId,\n merchant_id: Option<&id_type::MerchantId>,\n entity_type: Option,\n limit: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::generic_roles_list_for_org(\n &conn,\n org_id.to_owned(),\n merchant_id.cloned(),\n entity_type,\n limit,\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n}", + "after_code": "impl RoleInterface for Store {\n #[instrument(skip_all)]\n async fn insert_role(\n &self,\n role: storage::RoleNew,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n role.insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id(&conn, role_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n //TODO:remove once find_by_role_id_in_lineage is stable\n #[instrument(skip_all)]\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_in_merchant_scope(&conn, role_id, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_in_lineage(&conn, role_id, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_by_role_id_and_org_id(\n &self,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_and_org_id(&conn, role_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn update_role_by_role_id(\n &self,\n role_id: &str,\n role_update: storage::RoleUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::Role::update_by_role_id(&conn, role_id, role_update)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn delete_role_by_role_id(\n &self,\n role_id: &str,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n storage::Role::delete_by_role_id(&conn, role_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn list_all_roles(\n &self,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::list_roles(&conn, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn list_roles_for_org_by_parameters(\n &self,\n org_id: &id_type::OrganizationId,\n merchant_id: Option<&id_type::MerchantId>,\n entity_type: Option,\n limit: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::generic_roles_list_for_org(\n &conn,\n org_id.to_owned(),\n merchant_id.cloned(),\n entity_type,\n limit,\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n}", + "diff_span": { + "before": "", + "after": " }\n\n //TODO:remove once find_by_role_id_in_lineage is stable\n #[instrument(skip_all)]\n async fn find_role_by_role_id_in_merchant_scope(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_in_merchant_scope(&conn, role_id, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }\n\n #[instrument(skip_all)]\n async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_in_lineage(&conn, role_id, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::switch_org_for_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn switch_org_for_user(\n state: SessionState,\n request: user_api::SwitchOrganizationRequest,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n if user_from_token.org_id == request.org_id {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User switching to same org\".to_string(),\n )\n .into());\n }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Org switching not allowed for Internal role\".to_string(),\n )\n .into());\n }\n\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&request.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role found for the requested org_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n request.org_id.clone(),\n user_role.role_id.clone(),\n profile_id.clone(),\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n &state,\n &user_role.role_id,\n &merchant_id,\n &request.org_id,\n )\n .await;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: common_enums::TokenPurpose::UserInfo,\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn switch_org_for_user(\n state: SessionState,\n request: user_api::SwitchOrganizationRequest,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n if user_from_token.org_id == request.org_id {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User switching to same org\".to_string(),\n )\n .into());\n }\n\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Org switching not allowed for Internal role\".to_string(),\n )\n .into());\n }\n\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&request.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role found for the requested org_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n request.org_id.clone(),\n user_role.role_id.clone(),\n profile_id.clone(),\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_org_id(\n &state,\n &user_role.role_id,\n &request.org_id,\n )\n .await;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: common_enums::TokenPurpose::UserInfo,\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": " }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Org switching not allowed for Internal role\".to_string(),\n )\n .into());\n }\n\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&request.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role found for the requested org_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n request.org_id.clone(),\n user_role.role_id.clone(),\n profile_id.clone(),\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n &state,\n &user_role.role_id,\n &merchant_id,\n &request.org_id,\n )", + "after": " }\n\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Org switching not allowed for Internal role\".to_string(),\n )\n .into());\n }\n\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&request.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles by user_id and org_id\")?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role found for the requested org_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role).await?;\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n request.org_id.clone(),\n user_role.role_id.clone(),\n profile_id.clone(),\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_org_id(\n &state,\n &user_role.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role/role.rs::function::update_role", + "file": "crates/router/src/core/user_role/role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn update_role(\n state: SessionState,\n user_from_token: UserFromToken,\n req: role_api::UpdateRoleRequest,\n role_id: &str,\n) -> UserResponse {\n let role_name = req.role_name.map(RoleName::new).transpose()?;\n\n if let Some(ref role_name) = role_name {\n utils::user_role::validate_role_name(\n &state,\n role_name,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await?;\n }\n\n if let Some(ref groups) = req.groups {\n utils::user_role::validate_role_groups(groups)?;\n }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n if matches!(role_info.get_scope(), RoleScope::Organization)\n && user_from_token.role_id != common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN\n {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"Non org admin user changing org level role\");\n }\n\n let updated_role = state\n .store\n .update_role_by_role_id(\n role_id,\n RoleUpdate::UpdateDetails {\n groups: req.groups,\n role_name: role_name.map(RoleName::get_role_name),\n last_modified_at: common_utils::date_time::now(),\n last_modified_by: user_from_token.user_id,\n },\n )\n .await\n .to_duplicate_response(UserErrors::RoleNameAlreadyExists)?;\n\n blacklist::insert_role_in_blacklist(&state, role_id).await?;\n\n Ok(ApplicationResponse::Json(\n role_api::RoleInfoWithGroupsResponse {\n groups: updated_role.groups,\n role_id: updated_role.role_id,\n role_name: updated_role.role_name,\n role_scope: updated_role.scope,\n },\n ))\n}", + "after_code": "pub async fn update_role(\n state: SessionState,\n user_from_token: UserFromToken,\n req: role_api::UpdateRoleRequest,\n role_id: &str,\n) -> UserResponse {\n let role_name = req.role_name.map(RoleName::new).transpose()?;\n\n if let Some(ref role_name) = role_name {\n utils::user_role::validate_role_name(\n &state,\n role_name,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await?;\n }\n\n if let Some(ref groups) = req.groups {\n utils::user_role::validate_role_groups(groups)?;\n }\n\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n if matches!(role_info.get_scope(), RoleScope::Organization)\n && user_from_token.role_id != common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN\n {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"Non org admin user changing org level role\");\n }\n\n let updated_role = state\n .store\n .update_role_by_role_id(\n role_id,\n RoleUpdate::UpdateDetails {\n groups: req.groups,\n role_name: role_name.map(RoleName::get_role_name),\n last_modified_at: common_utils::date_time::now(),\n last_modified_by: user_from_token.user_id,\n },\n )\n .await\n .to_duplicate_response(UserErrors::RoleNameAlreadyExists)?;\n\n blacklist::insert_role_in_blacklist(&state, role_id).await?;\n\n Ok(ApplicationResponse::Json(\n role_api::RoleInfoWithGroupsResponse {\n groups: updated_role.groups,\n role_id: updated_role.role_id,\n role_name: updated_role.role_name,\n role_scope: updated_role.scope,\n },\n ))\n}", + "diff_span": { + "before": " }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n if matches!(role_info.get_scope(), RoleScope::Organization)", + "after": " }\n\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)?;\n\n if matches!(role_info.get_scope(), RoleScope::Organization)" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::list_orgs_for_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_orgs_for_user(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n\n let orgs = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.org_id)\n .collect::>();\n\n let resp = futures::future::try_join_all(\n orgs.iter()\n .map(|org_id| state.store.find_organization_by_org_id(org_id)),\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|org| user_api::ListOrgsForUserResponse {\n org_id: org.get_organization_id(),\n org_name: org.get_organization_name(),\n })\n .collect::>();\n\n if resp.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No orgs found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(resp))\n}", + "after_code": "pub async fn list_orgs_for_user(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n\n let orgs = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.org_id)\n .collect::>();\n\n let resp = futures::future::try_join_all(\n orgs.iter()\n .map(|org_id| state.store.find_organization_by_org_id(org_id)),\n )\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|org| user_api::ListOrgsForUserResponse {\n org_id: org.get_organization_id(),\n org_name: org.get_organization_name(),\n })\n .collect::>();\n\n if resp.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No orgs found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(resp))\n}", + "diff_span": { + "before": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::handle_invitation", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn handle_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n req_state: &ReqState,\n auth_id: &Option,\n) -> UserResult {\n let inviter_user = user_from_token.get_user_from_db(state).await?;\n\n if inviter_user.get_email() == request.email {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User Inviting themselves\".to_string(),\n )\n .into());\n }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n state,\n &request.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_invitable() {\n return Err(report!(UserErrors::InvalidRoleId))\n .attach_printable(format!(\"role_id = {} is not invitable\", request.role_id));\n }\n\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let invitee_user = state\n .global_store\n .find_user_by_email(&invitee_email.into_inner())\n .await;\n\n if let Ok(invitee_user) = invitee_user {\n handle_existing_user_invitation(\n state,\n user_from_token,\n request,\n invitee_user.into(),\n role_info,\n auth_id,\n )\n .await\n } else if invitee_user\n .as_ref()\n .map_err(|e| e.current_context().is_db_not_found())\n .err()\n .unwrap_or(false)\n {\n handle_new_user_invitation(\n state,\n user_from_token,\n request,\n role_info,\n req_state.clone(),\n auth_id,\n )\n .await\n } else {\n Err(UserErrors::InternalServerError.into())\n }\n}", + "after_code": "async fn handle_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n req_state: &ReqState,\n auth_id: &Option,\n) -> UserResult {\n let inviter_user = user_from_token.get_user_from_db(state).await?;\n\n if inviter_user.get_email() == request.email {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User Inviting themselves\".to_string(),\n )\n .into());\n }\n\n let role_info = roles::RoleInfo::from_role_id_in_lineage(\n state,\n &request.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_invitable() {\n return Err(report!(UserErrors::InvalidRoleId))\n .attach_printable(format!(\"role_id = {} is not invitable\", request.role_id));\n }\n\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let invitee_user = state\n .global_store\n .find_user_by_email(&invitee_email.into_inner())\n .await;\n\n if let Ok(invitee_user) = invitee_user {\n handle_existing_user_invitation(\n state,\n user_from_token,\n request,\n invitee_user.into(),\n role_info,\n auth_id,\n )\n .await\n } else if invitee_user\n .as_ref()\n .map_err(|e| e.current_context().is_db_not_found())\n .err()\n .unwrap_or(false)\n {\n handle_new_user_invitation(\n state,\n user_from_token,\n request,\n role_info,\n req_state.clone(),\n auth_id,\n )\n .await\n } else {\n Err(UserErrors::InternalServerError.into())\n }\n}", + "diff_span": { + "before": " }\n\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n state,\n &request.role_id,", + "after": " }\n\n let role_info = roles::RoleInfo::from_role_id_in_lineage(\n state,\n &request.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::switch_merchant_for_user_in_org", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn switch_merchant_for_user_in_org(\n state: SessionState,\n request: user_api::SwitchMerchantRequest,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n if user_from_token.merchant_id == request.merchant_id {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User switching to same merchant\".to_string(),\n )\n .into());\n }\n\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n // Check if the role is internal and handle separately\n let (org_id, merchant_id, profile_id, role_id) = if role_info.is_internal() {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &request.merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the given merchant_id\")?\n .get_id()\n .to_owned();\n\n (\n merchant_account.organization_id,\n request.merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n } else {\n // Match based on the other entity types\n match role_info.get_entity_type() {\n EntityType::Organization => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_id = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .change_context(UserErrors::MerchantIdNotFound)?\n .organization_id\n .eq(&user_from_token.org_id)\n .then(|| request.merchant_id.clone())\n .ok_or_else(|| {\n UserErrors::InvalidRoleOperationWithMessage(\n \"No such merchant_id found for the user in the org\".to_string(),\n )\n })?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the merchant_id\")?\n .get_id()\n .to_owned();\n (\n user_from_token.org_id.clone(),\n merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n }\n\n EntityType::Merchant | EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&request.merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\n \"Failed to list user roles for the given user_id, org_id and merchant_id\",\n )?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the requested merchant_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role)\n .await?;\n (\n user_from_token.org_id,\n merchant_id,\n profile_id,\n user_role.role_id,\n )\n }\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n &state,\n &role_id,\n &merchant_id,\n &org_id,\n )\n .await;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: common_enums::TokenPurpose::UserInfo,\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "after_code": "pub async fn switch_merchant_for_user_in_org(\n state: SessionState,\n request: user_api::SwitchMerchantRequest,\n user_from_token: auth::UserFromToken,\n) -> UserResponse {\n if user_from_token.merchant_id == request.merchant_id {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User switching to same merchant\".to_string(),\n )\n .into());\n }\n\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n // Check if the role is internal and handle separately\n let (org_id, merchant_id, profile_id, role_id) = if role_info.is_internal() {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &request.merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the given merchant_id\")?\n .get_id()\n .to_owned();\n\n (\n merchant_account.organization_id,\n request.merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n } else {\n // Match based on the other entity types\n match role_info.get_entity_type() {\n EntityType::Organization => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_id = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .change_context(UserErrors::MerchantIdNotFound)?\n .organization_id\n .eq(&user_from_token.org_id)\n .then(|| request.merchant_id.clone())\n .ok_or_else(|| {\n UserErrors::InvalidRoleOperationWithMessage(\n \"No such merchant_id found for the user in the org\".to_string(),\n )\n })?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the merchant_id\")?\n .get_id()\n .to_owned();\n (\n user_from_token.org_id.clone(),\n merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n }\n\n EntityType::Merchant | EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&request.merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\n \"Failed to list user roles for the given user_id, org_id and merchant_id\",\n )?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the requested merchant_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role)\n .await?;\n (\n user_from_token.org_id,\n merchant_id,\n profile_id,\n user_role.role_id,\n )\n }\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_org_id(&state, &role_id, &org_id)\n .await;\n\n let response = user_api::TokenResponse {\n token: token.clone(),\n token_type: common_enums::TokenPurpose::UserInfo,\n };\n\n auth::cookies::set_cookie_response(response, token)\n}", + "diff_span": { + "before": "\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n // Check if the role is internal and handle separately\n let (org_id, merchant_id, profile_id, role_id) = if role_info.is_internal() {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &request.merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the given merchant_id\")?\n .get_id()\n .to_owned();\n\n (\n merchant_account.organization_id,\n request.merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n } else {\n // Match based on the other entity types\n match role_info.get_entity_type() {\n EntityType::Organization => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_id = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .change_context(UserErrors::MerchantIdNotFound)?\n .organization_id\n .eq(&user_from_token.org_id)\n .then(|| request.merchant_id.clone())\n .ok_or_else(|| {\n UserErrors::InvalidRoleOperationWithMessage(\n \"No such merchant_id found for the user in the org\".to_string(),\n )\n })?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the merchant_id\")?\n .get_id()\n .to_owned();\n (\n user_from_token.org_id.clone(),\n merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n }\n\n EntityType::Merchant | EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&request.merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\n \"Failed to list user roles for the given user_id, org_id and merchant_id\",\n )?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the requested merchant_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role)\n .await?;\n (\n user_from_token.org_id,\n merchant_id,\n profile_id,\n user_role.role_id,\n )\n }\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n &state,\n &role_id,\n &merchant_id,\n &org_id,\n )\n .await;\n\n let response = user_api::TokenResponse {", + "after": "\n let key_manager_state = &(&state).into();\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to retrieve role information\")?;\n\n // Check if the role is internal and handle separately\n let (org_id, merchant_id, profile_id, role_id) = if role_info.is_internal() {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_account = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &request.merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the given merchant_id\")?\n .get_id()\n .to_owned();\n\n (\n merchant_account.organization_id,\n request.merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n } else {\n // Match based on the other entity types\n match role_info.get_entity_type() {\n EntityType::Organization => {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .to_not_found_response(UserErrors::MerchantIdNotFound)?;\n\n let merchant_id = state\n .store\n .find_merchant_account_by_merchant_id(\n key_manager_state,\n &request.merchant_id,\n &merchant_key_store,\n )\n .await\n .change_context(UserErrors::MerchantIdNotFound)?\n .organization_id\n .eq(&user_from_token.org_id)\n .then(|| request.merchant_id.clone())\n .ok_or_else(|| {\n UserErrors::InvalidRoleOperationWithMessage(\n \"No such merchant_id found for the user in the org\".to_string(),\n )\n })?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(\n key_manager_state,\n &merchant_key_store,\n &merchant_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list business profiles by merchant_id\")?\n .pop()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No business profile found for the merchant_id\")?\n .get_id()\n .to_owned();\n (\n user_from_token.org_id.clone(),\n merchant_id,\n profile_id,\n user_from_token.role_id.clone(),\n )\n }\n\n EntityType::Merchant | EntityType::Profile => {\n let user_role = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n org_id: Some(&user_from_token.org_id),\n merchant_id: Some(&request.merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: Some(1),\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\n \"Failed to list user roles for the given user_id, org_id and merchant_id\",\n )?\n .pop()\n .ok_or(UserErrors::InvalidRoleOperationWithMessage(\n \"No user role associated with the requested merchant_id\".to_string(),\n ))?;\n\n let (merchant_id, profile_id) =\n utils::user_role::get_single_merchant_id_and_profile_id(&state, &user_role)\n .await?;\n (\n user_from_token.org_id,\n merchant_id,\n profile_id,\n user_role.role_id,\n )\n }\n }\n };\n\n let token = utils::user::generate_jwt_auth_token_with_attributes(\n &state,\n user_from_token.user_id,\n merchant_id.clone(),\n org_id.clone(),\n role_id.clone(),\n profile_id,\n user_from_token.tenant_id,\n )\n .await?;\n\n utils::user_role::set_role_permissions_in_cache_by_role_id_org_id(&state, &role_id, &org_id)\n .await;\n\n let response = user_api::TokenResponse {" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role/role.rs::function::get_parent_info_for_role", + "file": "crates/router/src/core/user_role/role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_parent_info_for_role(\n state: SessionState,\n user_from_token: UserFromToken,\n role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleId.into());\n }\n\n let parent_groups = ParentGroup::get_descriptions_for_groups(\n role_info.get_entity_type(),\n role_info.get_permission_groups().to_vec(),\n )\n .into_iter()\n .map(|(parent_group, description)| role_api::ParentGroupInfo {\n name: parent_group.clone(),\n description,\n scopes: role_info\n .get_permission_groups()\n .iter()\n .filter_map(|group| (group.parent() == parent_group).then_some(group.scope()))\n // TODO: Remove this hashset conversion when merhant access\n // and organization access groups are removed\n .collect::>()\n .into_iter()\n .collect(),\n })\n .collect();\n\n Ok(ApplicationResponse::Json(role_api::RoleInfoWithParents {\n role_id: role.role_id,\n parent_groups,\n role_name: role_info.get_role_name().to_string(),\n role_scope: role_info.get_scope(),\n }))\n}", + "after_code": "pub async fn get_parent_info_for_role(\n state: SessionState,\n user_from_token: UserFromToken,\n role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, &role.role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleId.into());\n }\n\n let parent_groups = ParentGroup::get_descriptions_for_groups(\n role_info.get_entity_type(),\n role_info.get_permission_groups().to_vec(),\n )\n .into_iter()\n .map(|(parent_group, description)| role_api::ParentGroupInfo {\n name: parent_group.clone(),\n description,\n scopes: role_info\n .get_permission_groups()\n .iter()\n .filter_map(|group| (group.parent() == parent_group).then_some(group.scope()))\n // TODO: Remove this hashset conversion when merhant access\n // and organization access groups are removed\n .collect::>()\n .into_iter()\n .collect(),\n })\n .collect();\n\n Ok(ApplicationResponse::Json(role_api::RoleInfoWithParents {\n role_id: role.role_id,\n parent_groups,\n role_name: role_info.get_role_name().to_string(),\n role_scope: role_info.get_scope(),\n }))\n}", + "diff_span": { + "before": " role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {", + "after": " role: role_api::GetRoleRequest,\n) -> UserResponse {\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, &role.role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if role_info.is_internal() {" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/services/authorization.rs::function::get_role_info_from_db", + "file": "crates/router/src/services/authorization.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn get_role_info_from_db(\n state: &A,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n state\n .store()\n .find_role_by_role_id_in_merchant_scope(role_id, merchant_id, org_id)\n .await\n .map(roles::RoleInfo::from)\n .to_not_found_response(ApiErrorResponse::InvalidJwtToken)\n}", + "after_code": "async fn get_role_info_from_db(\n state: &A,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n state\n .store()\n .find_by_role_id_and_org_id(role_id, org_id)\n .await\n .map(roles::RoleInfo::from)\n .to_not_found_response(ApiErrorResponse::InvalidJwtToken)\n}", + "diff_span": { + "before": " state: &A,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n) -> RouterResult\nwhere\n A: SessionStateInfo + Sync,\n{\n state\n .store()\n .find_role_by_role_id_in_merchant_scope(role_id, merchant_id, org_id)\n .await\n .map(roles::RoleInfo::from)", + "after": " state\n .store()\n .find_by_role_id_and_org_id(role_id, org_id)\n .await\n .map(roles::RoleInfo::from)" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role.rs::function::get_parent_group_info", + "file": "crates/router/src/core/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_parent_group_info(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n let parent_groups = ParentGroup::get_descriptions_for_groups(\n role_info.get_entity_type(),\n PermissionGroup::iter().collect(),\n )\n .into_iter()\n .map(|(parent_group, description)| role_api::ParentGroupInfo {\n name: parent_group.clone(),\n description,\n scopes: PermissionGroup::iter()\n .filter_map(|group| (group.parent() == parent_group).then_some(group.scope()))\n // TODO: Remove this hashset conversion when merhant access\n // and organization access groups are removed\n .collect::>()\n .into_iter()\n .collect(),\n })\n .collect::>();\n\n Ok(ApplicationResponse::Json(parent_groups))\n}", + "after_code": "pub async fn get_parent_group_info(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n let parent_groups = ParentGroup::get_descriptions_for_groups(\n role_info.get_entity_type(),\n PermissionGroup::iter().collect(),\n )\n .into_iter()\n .map(|(parent_group, description)| role_api::ParentGroupInfo {\n name: parent_group.clone(),\n description,\n scopes: PermissionGroup::iter()\n .filter_map(|group| (group.parent() == parent_group).then_some(group.scope()))\n // TODO: Remove this hashset conversion when merhant access\n // and organization access groups are removed\n .collect::>()\n .into_iter()\n .collect(),\n })\n .collect::>();\n\n Ok(ApplicationResponse::Json(parent_groups))\n}", + "diff_span": { + "before": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user_role.rs::function::update_user_role", + "file": "crates/router/src/core/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn update_user_role(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n req: user_role_api::UpdateUserRoleRequest,\n _req_state: ReqState,\n) -> UserResponse<()> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &req.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(format!(\"User role cannot be updated to {}\", req.role_id));\n }\n\n let user_to_be_updated =\n utils::user::get_user_from_db_by_email(&state, domain::UserEmail::try_from(req.email)?)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\".to_string())?;\n\n if user_from_token.user_id == user_to_be_updated.get_user_id() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User Changing their own role\");\n }\n\n let updator_role = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut is_updated = false;\n\n let v2_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v2_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !role_to_be_updated.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"User role cannot be updated from {}\",\n role_to_be_updated.get_role_id()\n ));\n }\n\n if role_info.get_entity_type() != role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Upgrade and downgrade of roles is not allowed, user_entity_type = {} req_entity_type = {}\",\n role_to_be_updated.get_entity_type(),\n role_info.get_entity_type(),\n ));\n }\n\n if updator_role.get_entity_type() < role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Invalid operation, update requestor = {} cannot update target = {}\",\n updator_role.get_entity_type(),\n role_to_be_updated.get_entity_type()\n ));\n }\n\n state\n .global_store\n .update_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n UserRoleUpdate::UpdateRole {\n role_id: req.role_id.clone(),\n modified_by: user_from_token.user_id.clone(),\n },\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n is_updated = true;\n }\n\n let v1_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v1_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !role_to_be_updated.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"User role cannot be updated from {}\",\n role_to_be_updated.get_role_id()\n ));\n }\n\n if role_info.get_entity_type() != role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Upgrade and downgrade of roles is not allowed, user_entity_type = {} req_entity_type = {}\",\n role_to_be_updated.get_entity_type(),\n role_info.get_entity_type(),\n ));\n }\n\n if updator_role.get_entity_type() < role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Invalid operation, update requestor = {} cannot update target = {}\",\n updator_role.get_entity_type(),\n role_to_be_updated.get_entity_type()\n ));\n }\n\n state\n .global_store\n .update_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n UserRoleUpdate::UpdateRole {\n role_id: req.role_id.clone(),\n modified_by: user_from_token.user_id,\n },\n UserRoleVersion::V1,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n is_updated = true;\n }\n\n if !is_updated {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User with given email is not found in the organization\")?;\n }\n\n auth::blacklist::insert_user_in_blacklist(&state, user_to_be_updated.get_user_id()).await?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "after_code": "pub async fn update_user_role(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n req: user_role_api::UpdateUserRoleRequest,\n _req_state: ReqState,\n) -> UserResponse<()> {\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, &req.role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(format!(\"User role cannot be updated to {}\", req.role_id));\n }\n\n let user_to_be_updated =\n utils::user::get_user_from_db_by_email(&state, domain::UserEmail::try_from(req.email)?)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\".to_string())?;\n\n if user_from_token.user_id == user_to_be_updated.get_user_id() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User Changing their own role\");\n }\n\n let updator_role = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut is_updated = false;\n\n let v2_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v2_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_role.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !role_to_be_updated.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"User role cannot be updated from {}\",\n role_to_be_updated.get_role_id()\n ));\n }\n\n if role_info.get_entity_type() != role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Upgrade and downgrade of roles is not allowed, user_entity_type = {} req_entity_type = {}\",\n role_to_be_updated.get_entity_type(),\n role_info.get_entity_type(),\n ));\n }\n\n if updator_role.get_entity_type() < role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Invalid operation, update requestor = {} cannot update target = {}\",\n updator_role.get_entity_type(),\n role_to_be_updated.get_entity_type()\n ));\n }\n\n state\n .global_store\n .update_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n UserRoleUpdate::UpdateRole {\n role_id: req.role_id.clone(),\n modified_by: user_from_token.user_id.clone(),\n },\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n is_updated = true;\n }\n\n let v1_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v1_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_role.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !role_to_be_updated.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"User role cannot be updated from {}\",\n role_to_be_updated.get_role_id()\n ));\n }\n\n if role_info.get_entity_type() != role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Upgrade and downgrade of roles is not allowed, user_entity_type = {} req_entity_type = {}\",\n role_to_be_updated.get_entity_type(),\n role_info.get_entity_type(),\n ));\n }\n\n if updator_role.get_entity_type() < role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Invalid operation, update requestor = {} cannot update target = {}\",\n updator_role.get_entity_type(),\n role_to_be_updated.get_entity_type()\n ));\n }\n\n state\n .global_store\n .update_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n UserRoleUpdate::UpdateRole {\n role_id: req.role_id.clone(),\n modified_by: user_from_token.user_id,\n },\n UserRoleVersion::V1,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n is_updated = true;\n }\n\n if !is_updated {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User with given email is not found in the organization\")?;\n }\n\n auth::blacklist::insert_user_in_blacklist(&state, user_to_be_updated.get_user_id()).await?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": { + "before": " _req_state: ReqState,\n) -> UserResponse<()> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &req.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(format!(\"User role cannot be updated to {}\", req.role_id));\n }\n\n let user_to_be_updated =\n utils::user::get_user_from_db_by_email(&state, domain::UserEmail::try_from(req.email)?)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\".to_string())?;\n\n if user_from_token.user_id == user_to_be_updated.get_user_id() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User Changing their own role\");\n }\n\n let updator_role = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut is_updated = false;\n\n let v2_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v2_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !role_to_be_updated.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"User role cannot be updated from {}\",\n role_to_be_updated.get_role_id()\n ));\n }\n\n if role_info.get_entity_type() != role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Upgrade and downgrade of roles is not allowed, user_entity_type = {} req_entity_type = {}\",\n role_to_be_updated.get_entity_type(),\n role_info.get_entity_type(),\n ));\n }\n\n if updator_role.get_entity_type() < role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Invalid operation, update requestor = {} cannot update target = {}\",\n updator_role.get_entity_type(),\n role_to_be_updated.get_entity_type()\n ));\n }\n\n state\n .global_store\n .update_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n UserRoleUpdate::UpdateRole {\n role_id: req.role_id.clone(),\n modified_by: user_from_token.user_id.clone(),\n },\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n is_updated = true;\n }\n\n let v1_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v1_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_role.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " _req_state: ReqState,\n) -> UserResponse<()> {\n let role_info =\n roles::RoleInfo::from_role_id_and_org_id(&state, &req.role_id, &user_from_token.org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleId)?;\n\n if !role_info.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(format!(\"User role cannot be updated to {}\", req.role_id));\n }\n\n let user_to_be_updated =\n utils::user::get_user_from_db_by_email(&state, domain::UserEmail::try_from(req.email)?)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperation)\n .attach_printable(\"User not found in our records\".to_string())?;\n\n if user_from_token.user_id == user_to_be_updated.get_user_id() {\n return Err(report!(UserErrors::InvalidRoleOperation))\n .attach_printable(\"User Changing their own role\");\n }\n\n let updator_role = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let mut is_updated = false;\n\n let v2_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V2,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v2_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_role.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if !role_to_be_updated.is_updatable() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"User role cannot be updated from {}\",\n role_to_be_updated.get_role_id()\n ));\n }\n\n if role_info.get_entity_type() != role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Upgrade and downgrade of roles is not allowed, user_entity_type = {} req_entity_type = {}\",\n role_to_be_updated.get_entity_type(),\n role_info.get_entity_type(),\n ));\n }\n\n if updator_role.get_entity_type() < role_to_be_updated.get_entity_type() {\n return Err(report!(UserErrors::InvalidRoleOperation)).attach_printable(format!(\n \"Invalid operation, update requestor = {} cannot update target = {}\",\n updator_role.get_entity_type(),\n role_to_be_updated.get_entity_type()\n ));\n }\n\n state\n .global_store\n .update_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n UserRoleUpdate::UpdateRole {\n role_id: req.role_id.clone(),\n modified_by: user_from_token.user_id.clone(),\n },\n UserRoleVersion::V2,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n is_updated = true;\n }\n\n let v1_user_role_to_be_updated = match state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n user_to_be_updated.get_user_id(),\n &user_from_token.org_id,\n &user_from_token.merchant_id,\n &user_from_token.profile_id,\n UserRoleVersion::V1,\n )\n .await\n {\n Ok(user_role) => Some(user_role),\n Err(e) => {\n if e.current_context().is_db_not_found() {\n None\n } else {\n return Err(UserErrors::InternalServerError.into());\n }\n }\n };\n\n if let Some(user_role) = v1_user_role_to_be_updated {\n let role_to_be_updated = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_role.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/analytics.rs::routes::function::get_search_results", + "file": "crates/router/src/analytics.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n index: web::Path,\n ) -> impl Responder {\n let index = index.into_inner();\n let flow = AnalyticsFlow::GetSearchResults;\n let indexed_req = GetSearchRequestWithIndex {\n search_req: json_payload.into_inner(),\n index,\n };\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n indexed_req,\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n analytics::search::search_results(&state.opensearch_client, req, search_params)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }", + "after_code": "pub async fn get_search_results(\n state: web::Data,\n req: actix_web::HttpRequest,\n json_payload: web::Json,\n index: web::Path,\n ) -> impl Responder {\n let index = index.into_inner();\n let flow = AnalyticsFlow::GetSearchResults;\n let indexed_req = GetSearchRequestWithIndex {\n search_req: json_payload.into_inner(),\n index,\n };\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &req,\n indexed_req,\n |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {\n return Err(OpenSearchError::AccessForbiddenError)?;\n }\n let user_roles: HashSet = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &auth.user_id,\n org_id: Some(&auth.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: None,\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?\n .into_iter()\n .collect();\n let state = Arc::new(state);\n let role_info_map: HashMap = user_roles\n .iter()\n .map(|user_role| {\n let state = Arc::clone(&state);\n let role_id = user_role.role_id.clone();\n let org_id = user_role.org_id.clone().unwrap_or_default();\n async move {\n RoleInfo::from_role_id_and_org_id(&state, &role_id, &org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)\n .map(|role_info| (role_id, role_info))\n }\n })\n .collect::>()\n .collect::>()\n .await\n .into_iter()\n .collect::, _>>()?;\n\n let filtered_user_roles: Vec<&UserRole> = user_roles\n .iter()\n .filter(|user_role| {\n let user_role_id = &user_role.role_id;\n if let Some(role_info) = role_info_map.get(user_role_id) {\n let permissions = role_info.get_permission_groups();\n permissions.contains(&common_enums::PermissionGroup::OperationsView)\n } else {\n false\n }\n })\n .collect();\n\n let search_params: Vec = filtered_user_roles\n .iter()\n .filter_map(|user_role| {\n user_role\n .get_entity_id_and_type()\n .and_then(|(_, entity_type)| match entity_type {\n EntityType::Profile => Some(AuthInfo::ProfileLevel {\n org_id: user_role.org_id.clone()?,\n merchant_id: user_role.merchant_id.clone()?,\n profile_ids: vec![user_role.profile_id.clone()?],\n }),\n EntityType::Merchant => Some(AuthInfo::MerchantLevel {\n org_id: user_role.org_id.clone()?,\n merchant_ids: vec![user_role.merchant_id.clone()?],\n }),\n EntityType::Organization => Some(AuthInfo::OrgLevel {\n org_id: user_role.org_id.clone()?,\n }),\n })\n })\n .collect();\n analytics::search::search_results(&state.opensearch_client, req, search_params)\n .await\n .map(ApplicationResponse::Json)\n },\n &auth::JWTAuth {\n permission: Permission::ProfileAnalyticsRead,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n }", + "diff_span": { + "before": " |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &role_id,\n &auth.merchant_id,\n &auth.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {", + "after": " |state, auth: UserFromToken, req, _| async move {\n let role_id = auth.role_id;\n let role_info = RoleInfo::from_role_id_and_org_id(&state, &role_id, &auth.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .change_context(OpenSearchError::UnknownError)?;\n let permission_groups = role_info.get_permission_groups();\n if !permission_groups.contains(&common_enums::PermissionGroup::OperationsView) {" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::set_role_permissions_in_cache_by_user_role", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn set_role_permissions_in_cache_by_user_role(\n state: &SessionState,\n user_role: &UserRole,\n) -> bool {\n let Some(ref merchant_id) = user_role.merchant_id else {\n return false;\n };\n\n let Some(ref org_id) = user_role.org_id else {\n return false;\n };\n set_role_permissions_in_cache_if_required(\n state,\n user_role.role_id.as_str(),\n merchant_id,\n org_id,\n )\n .await\n .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n .is_ok()\n}", + "after_code": "pub async fn set_role_permissions_in_cache_by_user_role(\n state: &SessionState,\n user_role: &UserRole,\n) -> bool {\n let Some(ref org_id) = user_role.org_id else {\n return false;\n };\n set_role_permissions_in_cache_if_required(state, user_role.role_id.as_str(), org_id)\n .await\n .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n .is_ok()\n}", + "diff_span": { + "before": " user_role: &UserRole,\n) -> bool {\n let Some(ref merchant_id) = user_role.merchant_id else {\n return false;\n };\n\n let Some(ref org_id) = user_role.org_id else {\n return false;\n };\n set_role_permissions_in_cache_if_required(\n state,\n user_role.role_id.as_str(),\n merchant_id,\n org_id,\n )\n .await\n .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n .is_ok()\n}", + "after": " return false;\n };\n set_role_permissions_in_cache_if_required(state, user_role.role_id.as_str(), org_id)\n .await\n .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n .is_ok()\n}" + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/core/user.rs::function::list_merchants_for_user_in_org", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn list_merchants_for_user_in_org(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n\n let merchant_accounts = match role_info.get_entity_type() {\n EntityType::Organization => state\n .store\n .list_merchant_accounts_by_organization_id(&(&state).into(), &user_from_token.org_id)\n .await\n .change_context(UserErrors::InternalServerError)?,\n EntityType::Merchant | EntityType::Profile => {\n let merchant_ids = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n org_id: Some(&user_from_token.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.merchant_id)\n .collect::>()\n .into_iter()\n .collect();\n\n state\n .store\n .list_multiple_merchant_accounts(&(&state).into(), merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)?\n }\n };\n\n if merchant_accounts.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No merchant found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(\n merchant_accounts\n .into_iter()\n .map(\n |merchant_account| user_api::ListMerchantsForUserInOrgResponse {\n merchant_name: merchant_account.merchant_name.clone(),\n merchant_id: merchant_account.get_id().to_owned(),\n },\n )\n .collect::>(),\n ))\n}", + "after_code": "pub async fn list_merchants_for_user_in_org(\n state: SessionState,\n user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id,\n &user_from_token.org_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n if role_info.is_internal() {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Internal roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n\n let merchant_accounts = match role_info.get_entity_type() {\n EntityType::Organization => state\n .store\n .list_merchant_accounts_by_organization_id(&(&state).into(), &user_from_token.org_id)\n .await\n .change_context(UserErrors::InternalServerError)?,\n EntityType::Merchant | EntityType::Profile => {\n let merchant_ids = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n org_id: Some(&user_from_token.org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::Active),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|user_role| user_role.merchant_id)\n .collect::>()\n .into_iter()\n .collect();\n\n state\n .store\n .list_multiple_merchant_accounts(&(&state).into(), merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)?\n }\n };\n\n if merchant_accounts.is_empty() {\n Err(UserErrors::InternalServerError).attach_printable(\"No merchant found for a user\")?;\n }\n\n Ok(ApplicationResponse::Json(\n merchant_accounts\n .into_iter()\n .map(\n |merchant_account| user_api::ListMerchantsForUserInOrgResponse {\n merchant_name: merchant_account.merchant_name.clone(),\n merchant_id: merchant_account.get_id().to_owned(),\n },\n )\n .collect::>(),\n ))\n}", + "diff_span": { + "before": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_in_merchant_scope(\n &state,\n &user_from_token.role_id,\n &user_from_token.merchant_id,\n &user_from_token.org_id,\n )", + "after": " user_from_token: auth::UserFromToken,\n) -> UserResponse> {\n let role_info = roles::RoleInfo::from_role_id_and_org_id(\n &state,\n &user_from_token.role_id," + }, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/db/role.rs::Store::function::find_role_by_role_id_in_lineage", + "file": "crates/router/src/db/role.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n storage::Role::find_by_role_id_in_lineage(&conn, role_id, merchant_id, org_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n }", + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/diesel_models/src/query/role.rs::Role::function::find_by_role_id_in_lineage", + "file": "crates/diesel_models/src/query/role.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn find_by_role_id_in_lineage(\n conn: &PgPooledConn,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::role_id\n .eq(role_id.to_owned())\n .and(dsl::org_id.eq(org_id.to_owned()))\n .and(\n dsl::scope.eq(RoleScope::Organization).or(dsl::merchant_id\n .eq(merchant_id.to_owned())\n .and(dsl::scope.eq(RoleScope::Merchant))),\n ),\n )\n .await\n }", + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/services/authorization/roles.rs::RoleInfo::function::from_role_id_in_lineage", + "file": "crates/router/src/services/authorization/roles.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn from_role_id_in_lineage(\n state: &SessionState,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n if let Some(role) = predefined_roles::PREDEFINED_ROLES.get(role_id) {\n Ok(role.clone())\n } else {\n state\n .store\n .find_role_by_role_id_in_lineage(role_id, merchant_id, org_id)\n .await\n .map(Self::from)\n }\n }", + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/db/role.rs::MockDb::function::find_role_by_role_id_in_lineage", + "file": "crates/router/src/db/role.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n let roles = self.roles.lock().await;\n roles\n .iter()\n .find(|role| {\n role.role_id == role_id\n && role.org_id == *org_id\n && ((role.scope == enums::RoleScope::Organization)\n || (role.merchant_id == *merchant_id\n && role.scope == enums::RoleScope::Merchant))\n })\n .cloned()\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"No role available in merchant scope for role_id = {role_id}, \\\n merchant_id = {merchant_id:?} and org_id = {org_id:?}\"\n ))\n .into(),\n )\n }", + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::find_role_by_role_id_in_lineage", + "file": "crates/router/src/db/kafka_store.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn find_role_by_role_id_in_lineage(\n &self,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n self.diesel_store\n .find_role_by_role_id_in_lineage(role_id, merchant_id, org_id)\n .await\n }", + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::set_role_permissions_in_cache_by_role_id_org_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn set_role_permissions_in_cache_by_role_id_org_id(\n state: &SessionState,\n role_id: &str,\n org_id: &id_type::OrganizationId,\n) -> bool {\n set_role_permissions_in_cache_if_required(state, role_id, org_id)\n .await\n .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n .is_ok()\n}", + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/services/authorization/roles.rs::RoleInfo::function::from_role_id_in_merchant_scope", + "file": "crates/router/src/services/authorization/roles.rs", + "kind": "function_item", + "status": "removed", + "before_code": "pub async fn from_role_id_in_merchant_scope(\n state: &SessionState,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n ) -> CustomResult {\n if let Some(role) = predefined_roles::PREDEFINED_ROLES.get(role_id) {\n Ok(role.clone())\n } else {\n state\n .store\n .find_role_by_role_id_in_merchant_scope(role_id, merchant_id, org_id)\n .await\n .map(Self::from)\n }\n }", + "after_code": null, + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::set_role_permissions_in_cache_by_role_id_merchant_id_org_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "removed", + "before_code": "pub async fn set_role_permissions_in_cache_by_role_id_merchant_id_org_id(\n state: &SessionState,\n role_id: &str,\n merchant_id: &id_type::MerchantId,\n org_id: &id_type::OrganizationId,\n) -> bool {\n set_role_permissions_in_cache_if_required(state, role_id, merchant_id, org_id)\n .await\n .map_err(|e| logger::error!(\"Error setting permissions in cache {:?}\", e))\n .is_ok()\n}", + "after_code": null, + "diff_span": null, + "commit_sha": "35b89e80f7f0c3c9e65ba549eb5df0fadeb9cac4" + } + ] +} \ No newline at end of file