diff --git "a/diffs/pr_6708/d539dbd/diff.json" "b/diffs/pr_6708/d539dbd/diff.json" new file mode 100644--- /dev/null +++ "b/diffs/pr_6708/d539dbd/diff.json" @@ -0,0 +1,968 @@ +{ + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "pr_number": 6708, + "rust_files": [ + "crates/api_models/src/events/user.rs", + "crates/api_models/src/user.rs", + "crates/common_enums/src/enums.rs", + "crates/common_utils/src/consts.rs", + "crates/diesel_models/src/query/merchant_account.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/merchant_account.rs", + "crates/router/src/routes/app.rs", + "crates/router/src/routes/lock_utils.rs", + "crates/router/src/routes/user.rs", + "crates/router/src/services/authorization/permissions.rs", + "crates/router/src/services/authorization/roles/predefined_roles.rs", + "crates/router/src/types/domain/user.rs", + "crates/router/src/types/transformers.rs", + "crates/router/src/utils/user.rs", + "crates/router/src/utils/user_role.rs", + "crates/router_env/src/logger/types.rs" + ], + "diffs": [ + { + "id": "crates/router/src/services/authorization/roles/predefined_roles.rs::static::PREDEFINED_ROLES", + "file": "crates/router/src/services/authorization/roles/predefined_roles.rs", + "kind": "static_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub static PREDEFINED_ROLES: Lazy> = Lazy::new(|| {\n let mut roles = HashMap::new();\n\n // Internal Roles\n roles.insert(\n common_utils::consts::ROLE_ID_INTERNAL_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::OrganizationManage,\n PermissionGroup::ReconOps,\n ],\n role_id: common_utils::consts::ROLE_ID_INTERNAL_ADMIN.to_string(),\n role_name: \"internal_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: false,\n is_deletable: false,\n is_updatable: false,\n is_internal: true,\n },\n );\n roles.insert(\n common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),\n role_name: \"internal_view_only\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: false,\n is_deletable: false,\n is_updatable: false,\n is_internal: true,\n },\n );\n\n // Merchant Roles\n roles.insert(\n common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::OrganizationManage,\n PermissionGroup::ReconOps,\n ],\n role_id: common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n role_name: \"organization_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Organization,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n\n // MERCHANT ROLES\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::ReconOps,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),\n role_name: \"merchant_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),\n role_name: \"merchant_view_only\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),\n role_name: \"merchant_iam\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_DEVELOPER,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),\n role_name: \"merchant_developer\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_OPERATOR,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),\n role_name: \"merchant_operator\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),\n role_name: \"customer_support\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n\n // Profile Roles\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_ADMIN.to_string(),\n role_name: \"profile_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY.to_string(),\n role_name: \"profile_view_only\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN.to_string(),\n role_name: \"profile_iam\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_DEVELOPER,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_DEVELOPER.to_string(),\n role_name: \"profile_developer\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_OPERATOR,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_OPERATOR.to_string(),\n role_name: \"profile_operator\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT.to_string(),\n role_name: \"profile_customer_support\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles\n});", + "after_code": "pub static PREDEFINED_ROLES: Lazy> = Lazy::new(|| {\n let mut roles = HashMap::new();\n\n // Internal Roles\n roles.insert(\n common_utils::consts::ROLE_ID_INTERNAL_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::OrganizationManage,\n PermissionGroup::ReconOps,\n ],\n role_id: common_utils::consts::ROLE_ID_INTERNAL_ADMIN.to_string(),\n role_name: \"internal_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: false,\n is_deletable: false,\n is_updatable: false,\n is_internal: true,\n },\n );\n roles.insert(\n common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: common_utils::consts::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),\n role_name: \"internal_view_only\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: false,\n is_deletable: false,\n is_updatable: false,\n is_internal: true,\n },\n );\n\n // Tenant Roles\n roles.insert(\n common_utils::consts::ROLE_ID_TENANT_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::OrganizationManage,\n PermissionGroup::ReconOps,\n ],\n role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n role_name: \"tenant_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Tenant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n\n // Organization Roles\n roles.insert(\n common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::OrganizationManage,\n PermissionGroup::ReconOps,\n ],\n role_id: common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN.to_string(),\n role_name: \"organization_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Organization,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n\n // MERCHANT ROLES\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::ReconOps,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),\n role_name: \"merchant_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),\n role_name: \"merchant_view_only\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),\n role_name: \"merchant_iam\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_DEVELOPER,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),\n role_name: \"merchant_developer\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_OPERATOR,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),\n role_name: \"merchant_operator\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),\n role_name: \"customer_support\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Merchant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n\n // Profile Roles\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_ADMIN.to_string(),\n role_name: \"profile_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_VIEW_ONLY.to_string(),\n role_name: \"profile_view_only\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_IAM_ADMIN.to_string(),\n role_name: \"profile_iam\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_DEVELOPER,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::ConnectorsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_DEVELOPER.to_string(),\n role_name: \"profile_developer\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_OPERATOR,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::WorkflowsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_OPERATOR.to_string(),\n role_name: \"profile_operator\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles.insert(\n consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n ],\n role_id: consts::user_role::ROLE_ID_PROFILE_CUSTOMER_SUPPORT.to_string(),\n role_name: \"profile_customer_support\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Profile,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n roles\n});", + "diff_span": { + "before": " );\n\n // Merchant Roles\n roles.insert(\n common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN,", + "after": " );\n\n // Tenant Roles\n roles.insert(\n common_utils::consts::ROLE_ID_TENANT_ADMIN,\n RoleInfo {\n groups: vec![\n PermissionGroup::OperationsView,\n PermissionGroup::OperationsManage,\n PermissionGroup::ConnectorsView,\n PermissionGroup::ConnectorsManage,\n PermissionGroup::WorkflowsView,\n PermissionGroup::WorkflowsManage,\n PermissionGroup::AnalyticsView,\n PermissionGroup::UsersView,\n PermissionGroup::UsersManage,\n PermissionGroup::MerchantDetailsView,\n PermissionGroup::AccountView,\n PermissionGroup::MerchantDetailsManage,\n PermissionGroup::AccountManage,\n PermissionGroup::OrganizationManage,\n PermissionGroup::ReconOps,\n ],\n role_id: common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n role_name: \"tenant_admin\".to_string(),\n scope: RoleScope::Organization,\n entity_type: EntityType::Tenant,\n is_invitable: true,\n is_deletable: true,\n is_updatable: true,\n is_internal: false,\n },\n );\n\n // Organization Roles\n roles.insert(\n common_utils::consts::ROLE_ID_ORGANIZATION_ADMIN," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/routes/lock_utils.rs::impl::ApiIdentifier", + "file": "crates/router/src/routes/lock_utils.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl From for ApiIdentifier {\n fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }\n}", + "after_code": "impl From for ApiIdentifier {\n fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }\n}", + "diff_span": { + "before": "", + "after": " | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_merchant_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_single_merchant_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult {\n match user_role.entity_type {\n Some(EntityType::Organization) => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(\n &state.into(),\n user_role\n .org_id\n .as_ref()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"org_id not found\")?,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchant list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org_id\")?\n .get_id()\n .clone()),\n Some(EntityType::Merchant) | Some(EntityType::Profile) | None => user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"merchant_id not found\"),\n }\n}", + "after_code": "pub async fn get_single_merchant_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult {\n let org_id = get_single_org_id(state, user_role).await?;\n match user_role.entity_type {\n Some(EntityType::Tenant) | Some(EntityType::Organization) => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(&state.into(), &org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"Invalid Org Id\".to_string(),\n ))?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org_id\")?\n .get_id()\n .clone()),\n Some(EntityType::Merchant) | Some(EntityType::Profile) | None => user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"merchant_id not found\"),\n }\n}", + "diff_span": { + "before": ") -> UserResult {\n match user_role.entity_type {\n Some(EntityType::Organization) => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(\n &state.into(),\n user_role\n .org_id\n .as_ref()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"org_id not found\")?,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchant list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)", + "after": " user_role: &UserRole,\n) -> UserResult {\n let org_id = get_single_org_id(state, user_role).await?;\n match user_role.entity_type {\n Some(EntityType::Tenant) | Some(EntityType::Organization) => Ok(state\n .store\n .list_merchant_accounts_by_organization_id(&state.into(), &org_id)\n .await\n .to_not_found_response(UserErrors::InvalidRoleOperationWithMessage(\n \"Invalid Org Id\".to_string(),\n ))?\n .first()\n .ok_or(UserErrors::InternalServerError)" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/api_models/src/events/user.rs::VerifyTokenResponse::function::get_api_event_type", + "file": "crates/api_models/src/events/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }", + "after_code": "fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, VerifyEmailRequest, VerifyRecoveryCodeRequest,\n VerifyTotpRequest,\n};" + ], + "after_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, CreateTenantRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, UserOrgCreateRequest, VerifyEmailRequest,\n VerifyRecoveryCodeRequest, VerifyTotpRequest,\n};" + ] + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_lineage_for_user_id_and_entity_for_accepting_invite", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_lineage_for_user_id_and_entity_for_accepting_invite(\n state: &SessionState,\n user_id: &str,\n tenant_id: &id_type::TenantId,\n entity_id: String,\n entity_type: EntityType,\n) -> UserResult<\n Option<(\n id_type::OrganizationId,\n Option,\n Option,\n )>,\n> {\n match entity_type {\n EntityType::Organization => {\n let Ok(org_id) =\n id_type::OrganizationId::try_from(std::borrow::Cow::from(entity_id.clone()))\n else {\n return Ok(None);\n };\n\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id,\n tenant_id,\n org_id: Some(&org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n if user_roles.len() > 1 {\n return Ok(None);\n }\n\n if let Some(user_role) = user_roles.into_iter().next() {\n let (_entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n if entity_type != EntityType::Organization {\n return Ok(None);\n }\n\n return Ok(Some((\n user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n None,\n None,\n )));\n }\n\n Ok(None)\n }\n EntityType::Merchant => {\n let Ok(merchant_id) = id_type::MerchantId::wrap(entity_id) else {\n return Ok(None);\n };\n\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id,\n tenant_id,\n org_id: None,\n merchant_id: Some(&merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n if user_roles.len() > 1 {\n return Ok(None);\n }\n\n if let Some(user_role) = user_roles.into_iter().next() {\n let (_entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n if entity_type != EntityType::Merchant {\n return Ok(None);\n }\n\n return Ok(Some((\n user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n Some(merchant_id),\n None,\n )));\n }\n\n Ok(None)\n }\n EntityType::Profile => {\n let Ok(profile_id) = id_type::ProfileId::try_from(std::borrow::Cow::from(entity_id))\n else {\n return Ok(None);\n };\n\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id,\n tenant_id: &state.tenant.tenant_id,\n org_id: None,\n merchant_id: None,\n profile_id: Some(&profile_id),\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n if user_roles.len() > 1 {\n return Ok(None);\n }\n\n if let Some(user_role) = user_roles.into_iter().next() {\n let (_entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n if entity_type != EntityType::Profile {\n return Ok(None);\n }\n\n return Ok(Some((\n user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n Some(\n user_role\n .merchant_id\n .ok_or(UserErrors::InternalServerError)?,\n ),\n Some(profile_id),\n )));\n }\n\n Ok(None)\n }\n }\n}", + "after_code": "pub async fn get_lineage_for_user_id_and_entity_for_accepting_invite(\n state: &SessionState,\n user_id: &str,\n tenant_id: &id_type::TenantId,\n entity_id: String,\n entity_type: EntityType,\n) -> UserResult<\n Option<(\n id_type::OrganizationId,\n Option,\n Option,\n )>,\n> {\n match entity_type {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => {\n let Ok(org_id) =\n id_type::OrganizationId::try_from(std::borrow::Cow::from(entity_id.clone()))\n else {\n return Ok(None);\n };\n\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id,\n tenant_id,\n org_id: Some(&org_id),\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n if user_roles.len() > 1 {\n return Ok(None);\n }\n\n if let Some(user_role) = user_roles.into_iter().next() {\n let (_entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n if entity_type != EntityType::Organization {\n return Ok(None);\n }\n\n return Ok(Some((\n user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n None,\n None,\n )));\n }\n\n Ok(None)\n }\n EntityType::Merchant => {\n let Ok(merchant_id) = id_type::MerchantId::wrap(entity_id) else {\n return Ok(None);\n };\n\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id,\n tenant_id,\n org_id: None,\n merchant_id: Some(&merchant_id),\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n if user_roles.len() > 1 {\n return Ok(None);\n }\n\n if let Some(user_role) = user_roles.into_iter().next() {\n let (_entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n if entity_type != EntityType::Merchant {\n return Ok(None);\n }\n\n return Ok(Some((\n user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n Some(merchant_id),\n None,\n )));\n }\n\n Ok(None)\n }\n EntityType::Profile => {\n let Ok(profile_id) = id_type::ProfileId::try_from(std::borrow::Cow::from(entity_id))\n else {\n return Ok(None);\n };\n\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id,\n tenant_id: &state.tenant.tenant_id,\n org_id: None,\n merchant_id: None,\n profile_id: Some(&profile_id),\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .collect::>();\n\n if user_roles.len() > 1 {\n return Ok(None);\n }\n\n if let Some(user_role) = user_roles.into_iter().next() {\n let (_entity_id, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n\n if entity_type != EntityType::Profile {\n return Ok(None);\n }\n\n return Ok(Some((\n user_role.org_id.ok_or(UserErrors::InternalServerError)?,\n Some(\n user_role\n .merchant_id\n .ok_or(UserErrors::InternalServerError)?,\n ),\n Some(profile_id),\n )));\n }\n\n Ok(None)\n }\n }\n}", + "diff_span": { + "before": "", + "after": "> {\n match entity_type {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => {\n let Ok(org_id) =" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/common_enums/src/enums.rs::enum::EntityType", + "file": "crates/common_enums/src/enums.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub enum EntityType {\n Organization = 2,\n Merchant = 1,\n Profile = 0,\n}", + "after_code": "pub enum EntityType {\n Tenant = 3,\n Organization = 2,\n Merchant = 1,\n Profile = 0,\n}", + "diff_span": { + "before": "", + "after": "pub enum EntityType {\n Tenant = 3,\n Organization = 2,\n Merchant = 1," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::struct::EntityInfo", + "file": "crates/router/src/types/domain/user.rs", + "kind": "struct_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub struct EntityInfo {\n tenant_id: id_type::TenantId,\n org_id: id_type::OrganizationId,\n merchant_id: Option,\n profile_id: Option,\n entity_id: String,\n entity_type: EntityType,\n}", + "after_code": "pub struct EntityInfo {\n tenant_id: id_type::TenantId,\n org_id: Option,\n merchant_id: Option,\n profile_id: Option,\n entity_id: String,\n entity_type: EntityType,\n}", + "diff_span": { + "before": "pub struct EntityInfo {\n tenant_id: id_type::TenantId,\n org_id: id_type::OrganizationId,\n merchant_id: Option,\n profile_id: Option,", + "after": "pub struct EntityInfo {\n tenant_id: id_type::TenantId,\n org_id: Option,\n merchant_id: Option,\n profile_id: Option," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::NewUser::function::try_from", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "fn try_from(value: InviteeUserRequestWithInvitedUserToken) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.0.email.clone().try_into()?;\n let name = UserName::new(value.0.name.clone())?;\n let password = cfg!(not(feature = \"email\")).then_some(NewUserPassword {\n password: UserPassword::new(password::get_temp_password())?,\n is_temporary: true,\n });\n let new_merchant = NewUserMerchant::try_from(value)?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password,\n new_merchant,\n })\n }", + "after_code": "fn try_from(\n (value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount),\n ) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.email.clone().try_into()?;\n let name = UserName::new(value.name.clone())?;\n let password = NewUserPassword {\n password: UserPassword::new(value.password.clone())?,\n is_temporary: false,\n };\n let new_merchant = NewUserMerchant::try_from((value, merchant_account))?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password: Some(password),\n new_merchant,\n })\n }", + "diff_span": { + "before": "fn try_from(value: InviteeUserRequestWithInvitedUserToken) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.0.email.clone().try_into()?;\n let name = UserName::new(value.0.name.clone())?;\n let password = cfg!(not(feature = \"email\")).then_some(NewUserPassword {\n password: UserPassword::new(password::get_temp_password())?,\n is_temporary: true,\n });\n let new_merchant = NewUserMerchant::try_from(value)?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password,\n new_merchant,\n })", + "after": "fn try_from(\n (value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount),\n ) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.email.clone().try_into()?;\n let name = UserName::new(value.name.clone())?;\n let password = NewUserPassword {\n password: UserPassword::new(value.password.clone())?,\n is_temporary: false,\n };\n let new_merchant = NewUserMerchant::try_from((value, merchant_account))?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password: Some(password),\n new_merchant,\n })" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use hyperswitch_domain_models::merchant_account::MerchantAccount;" + ] + }, + { + "id": "crates/router/src/types/domain/user.rs::impl::EntityInfo", + "file": "crates/router/src/types/domain/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl From for EntityInfo {\n fn from(value: ProfileLevel) -> Self {\n Self {\n entity_id: value.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: value.org_id,\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id),\n }\n }\n}", + "after_code": "impl From for EntityInfo {\n fn from(value: ProfileLevel) -> Self {\n Self {\n entity_id: value.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: Some(value.org_id),\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id),\n }\n }\n}", + "diff_span": { + "before": " entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: value.org_id,\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id),", + "after": " entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: Some(value.org_id),\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id)," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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_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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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 EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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 EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.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": "", + "after": " org_id: user_role.org_id.clone()?,\n }),\n EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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 EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.org_id.clone(),\n }),\n })" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::impl::NewUser", + "file": "crates/router/src/types/domain/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl TryFrom for NewUser {\n type Error = error_stack::Report;\n fn try_from(value: InviteeUserRequestWithInvitedUserToken) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.0.email.clone().try_into()?;\n let name = UserName::new(value.0.name.clone())?;\n let password = cfg!(not(feature = \"email\")).then_some(NewUserPassword {\n password: UserPassword::new(password::get_temp_password())?,\n is_temporary: true,\n });\n let new_merchant = NewUserMerchant::try_from(value)?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password,\n new_merchant,\n })\n }\n}", + "after_code": "impl TryFrom<(user_api::CreateTenantRequest, MerchantAccount)> for NewUser {\n type Error = error_stack::Report;\n\n fn try_from(\n (value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount),\n ) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.email.clone().try_into()?;\n let name = UserName::new(value.name.clone())?;\n let password = NewUserPassword {\n password: UserPassword::new(value.password.clone())?,\n is_temporary: false,\n };\n let new_merchant = NewUserMerchant::try_from((value, merchant_account))?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password: Some(password),\n new_merchant,\n })\n }\n}", + "diff_span": { + "before": "impl TryFrom for NewUser {\n type Error = error_stack::Report;\n fn try_from(value: InviteeUserRequestWithInvitedUserToken) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.0.email.clone().try_into()?;\n let name = UserName::new(value.0.name.clone())?;\n let password = cfg!(not(feature = \"email\")).then_some(NewUserPassword {\n password: UserPassword::new(password::get_temp_password())?,\n is_temporary: true,\n });\n let new_merchant = NewUserMerchant::try_from(value)?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password,\n new_merchant,\n })", + "after": "impl TryFrom<(user_api::CreateTenantRequest, MerchantAccount)> for NewUser {\n type Error = error_stack::Report;\n\n fn try_from(\n (value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount),\n ) -> UserResult {\n let user_id = uuid::Uuid::new_v4().to_string();\n let email = value.email.clone().try_into()?;\n let name = UserName::new(value.name.clone())?;\n let password = NewUserPassword {\n password: UserPassword::new(value.password.clone())?,\n is_temporary: false,\n };\n let new_merchant = NewUserMerchant::try_from((value, merchant_account))?;\n\n Ok(Self {\n user_id,\n name,\n email,\n password: Some(password),\n new_merchant,\n })" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use hyperswitch_domain_models::merchant_account::MerchantAccount;" + ] + }, + { + "id": "crates/router/src/types/domain/user.rs::EntityInfo::function::from", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn from(value: ProfileLevel) -> Self {\n Self {\n entity_id: value.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: value.org_id,\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id),\n }\n }", + "after_code": "fn from(value: ProfileLevel) -> Self {\n Self {\n entity_id: value.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: Some(value.org_id),\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id),\n }\n }", + "diff_span": { + "before": " entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: value.org_id,\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id),", + "after": " entity_type: EntityType::Profile,\n tenant_id: value.tenant_id,\n org_id: Some(value.org_id),\n merchant_id: Some(value.merchant_id),\n profile_id: Some(value.profile_id)," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::NewUserMerchant::function::create_merchant_account_request", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "fn create_merchant_account_request(&self) -> UserResult {\n Ok(admin_api::MerchantAccountCreate {\n merchant_id: self.get_merchant_id(),\n metadata: None,\n locker_id: None,\n return_url: None,\n merchant_name: self.get_company_name().map(Secret::new),\n webhook_details: None,\n publishable_key: None,\n organization_id: Some(self.new_organization.get_organization_id()),\n merchant_details: None,\n routing_algorithm: None,\n parent_merchant_id: None,\n sub_merchants_enabled: None,\n frm_routing_algorithm: None,\n #[cfg(feature = \"payouts\")]\n payout_routing_algorithm: None,\n primary_business_details: None,\n payment_response_hash_key: None,\n enable_payment_response_hash: None,\n redirect_to_merchant_with_http_post: None,\n pm_collect_link_config: None,\n })\n }", + "after_code": "fn create_merchant_account_request(&self) -> UserResult {\n Ok(admin_api::MerchantAccountCreate {\n merchant_id: self.get_merchant_id(),\n metadata: None,\n locker_id: None,\n return_url: None,\n merchant_name: self.get_company_name().map(Secret::new),\n webhook_details: None,\n publishable_key: None,\n organization_id: Some(self.new_organization.get_organization_id()),\n merchant_details: None,\n routing_algorithm: None,\n parent_merchant_id: None,\n sub_merchants_enabled: None,\n frm_routing_algorithm: None,\n #[cfg(feature = \"payouts\")]\n payout_routing_algorithm: None,\n primary_business_details: None,\n payment_response_hash_key: None,\n enable_payment_response_hash: None,\n redirect_to_merchant_with_http_post: None,\n pm_collect_link_config: None,\n })\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use masking::{ExposeInterface, PeekInterface, Secret};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use hyperswitch_domain_models::merchant_account::MerchantAccount;", + "use masking::{ExposeInterface, PeekInterface, Secret};" + ] + }, + { + "id": "crates/router/src/routes/lock_utils.rs::ApiIdentifier::function::from", + "file": "crates/router/src/routes/lock_utils.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }", + "after_code": "fn from(flow: Flow) -> Self {\n match flow {\n Flow::MerchantsAccountCreate\n | Flow::MerchantsAccountRetrieve\n | Flow::MerchantsAccountUpdate\n | Flow::MerchantsAccountDelete\n | Flow::MerchantTransferKey\n | Flow::MerchantAccountList => Self::MerchantAccount,\n\n Flow::OrganizationCreate | Flow::OrganizationRetrieve | Flow::OrganizationUpdate => {\n Self::Organization\n }\n\n Flow::RoutingCreateConfig\n | Flow::RoutingLinkConfig\n | Flow::RoutingUnlinkConfig\n | Flow::RoutingRetrieveConfig\n | Flow::RoutingRetrieveActiveConfig\n | Flow::RoutingRetrieveDefaultConfig\n | Flow::RoutingRetrieveDictionary\n | Flow::RoutingUpdateConfig\n | Flow::RoutingUpdateDefaultConfig\n | Flow::RoutingDeleteConfig\n | Flow::DecisionManagerDeleteConfig\n | Flow::DecisionManagerRetrieveConfig\n | Flow::ToggleDynamicRouting\n | Flow::UpdateDynamicRoutingConfigs\n | Flow::DecisionManagerUpsertConfig => Self::Routing,\n\n Flow::RetrieveForexFlow => Self::Forex,\n\n Flow::AddToBlocklist => Self::Blocklist,\n Flow::DeleteFromBlocklist => Self::Blocklist,\n Flow::ListBlocklist => Self::Blocklist,\n Flow::ToggleBlocklistGuard => Self::Blocklist,\n\n Flow::MerchantConnectorsCreate\n | Flow::MerchantConnectorsRetrieve\n | Flow::MerchantConnectorsUpdate\n | Flow::MerchantConnectorsDelete\n | Flow::MerchantConnectorsList => Self::MerchantConnector,\n\n Flow::ConfigKeyCreate\n | Flow::ConfigKeyFetch\n | Flow::ConfigKeyUpdate\n | Flow::ConfigKeyDelete\n | Flow::CreateConfigKey => Self::Configs,\n\n Flow::CustomersCreate\n | Flow::CustomersRetrieve\n | Flow::CustomersUpdate\n | Flow::CustomersDelete\n | Flow::CustomersGetMandates\n | Flow::CustomersList => Self::Customers,\n\n Flow::EphemeralKeyCreate | Flow::EphemeralKeyDelete => Self::Ephemeral,\n\n Flow::DeepHealthCheck | Flow::HealthCheck => Self::Health,\n Flow::MandatesRetrieve | Flow::MandatesRevoke | Flow::MandatesList => Self::Mandates,\n\n Flow::PaymentMethodsCreate\n | Flow::PaymentMethodsMigrate\n | Flow::PaymentMethodsList\n | Flow::CustomerPaymentMethodsList\n | Flow::PaymentMethodsRetrieve\n | Flow::PaymentMethodsUpdate\n | Flow::PaymentMethodsDelete\n | Flow::PaymentMethodCollectLink\n | Flow::ValidatePaymentMethod\n | Flow::ListCountriesCurrencies\n | Flow::DefaultPaymentMethodsSet\n | Flow::PaymentMethodSave => Self::PaymentMethods,\n\n Flow::PmAuthLinkTokenCreate | Flow::PmAuthExchangeToken => Self::PaymentMethodAuth,\n\n Flow::PaymentsCreate\n | Flow::PaymentsRetrieve\n | Flow::PaymentsRetrieveForceSync\n | Flow::PaymentsUpdate\n | Flow::PaymentsConfirm\n | Flow::PaymentsCapture\n | Flow::PaymentsCancel\n | Flow::PaymentsApprove\n | Flow::PaymentsReject\n | Flow::PaymentsSessionToken\n | Flow::PaymentsStart\n | Flow::PaymentsList\n | Flow::PaymentsFilters\n | Flow::PaymentsAggregate\n | Flow::PaymentsRedirect\n | Flow::PaymentsIncrementalAuthorization\n | Flow::PaymentsExternalAuthentication\n | Flow::PaymentsAuthorize\n | Flow::GetExtendedCardInfo\n | Flow::PaymentsCompleteAuthorize\n | Flow::PaymentsManualUpdate\n | Flow::SessionUpdateTaxCalculation\n | Flow::PaymentsConfirmIntent\n | Flow::PaymentsCreateIntent\n | Flow::PaymentsGetIntent\n | Flow::PaymentsPostSessionTokens\n | Flow::PaymentStartRedirection => Self::Payments,\n\n Flow::PayoutsCreate\n | Flow::PayoutsRetrieve\n | Flow::PayoutsUpdate\n | Flow::PayoutsCancel\n | Flow::PayoutsFulfill\n | Flow::PayoutsList\n | Flow::PayoutsFilter\n | Flow::PayoutsAccounts\n | Flow::PayoutsConfirm\n | Flow::PayoutLinkInitiate => Self::Payouts,\n\n Flow::RefundsCreate\n | Flow::RefundsRetrieve\n | Flow::RefundsRetrieveForceSync\n | Flow::RefundsUpdate\n | Flow::RefundsList\n | Flow::RefundsFilters\n | Flow::RefundsAggregate\n | Flow::RefundsManualUpdate => Self::Refunds,\n\n Flow::FrmFulfillment\n | Flow::IncomingWebhookReceive\n | Flow::WebhookEventInitialDeliveryAttemptList\n | Flow::WebhookEventDeliveryAttemptList\n | Flow::WebhookEventDeliveryRetry => Self::Webhooks,\n\n Flow::ApiKeyCreate\n | Flow::ApiKeyRetrieve\n | Flow::ApiKeyUpdate\n | Flow::ApiKeyRevoke\n | Flow::ApiKeyList => Self::ApiKeys,\n\n Flow::DisputesRetrieve\n | Flow::DisputesList\n | Flow::DisputesFilters\n | Flow::DisputesEvidenceSubmit\n | Flow::AttachDisputeEvidence\n | Flow::RetrieveDisputeEvidence\n | Flow::DisputesAggregate\n | Flow::DeleteDisputeEvidence => Self::Disputes,\n\n Flow::CardsInfo => Self::CardsInfo,\n\n Flow::CreateFile | Flow::DeleteFile | Flow::RetrieveFile => Self::Files,\n\n Flow::CacheInvalidate => Self::Cache,\n\n Flow::ProfileCreate\n | Flow::ProfileUpdate\n | Flow::ProfileRetrieve\n | Flow::ProfileDelete\n | Flow::ProfileList\n | Flow::ToggleExtendedCardInfo\n | Flow::ToggleConnectorAgnosticMit => Self::Profile,\n\n Flow::PaymentLinkRetrieve\n | Flow::PaymentLinkInitiate\n | Flow::PaymentSecureLinkInitiate\n | Flow::PaymentLinkList\n | Flow::PaymentLinkStatus => Self::PaymentLink,\n\n Flow::Verification => Self::Verification,\n\n Flow::RustLockerMigration => Self::RustLockerMigration,\n Flow::GsmRuleCreate\n | Flow::GsmRuleRetrieve\n | Flow::GsmRuleUpdate\n | Flow::GsmRuleDelete => Self::Gsm,\n\n Flow::ApplePayCertificatesMigration => Self::ApplePayCertificatesMigration,\n\n Flow::UserConnectAccount\n | Flow::UserSignUp\n | Flow::UserSignIn\n | Flow::Signout\n | Flow::ChangePassword\n | Flow::SetDashboardMetadata\n | Flow::GetMultipleDashboardMetadata\n | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData\n | Flow::DeleteSampleData\n | Flow::GetUserDetails\n | Flow::GetUserRoleDetails\n | Flow::ForgotPassword\n | Flow::ResetPassword\n | Flow::RotatePassword\n | Flow::InviteMultipleUser\n | Flow::ReInviteUser\n | Flow::UserSignUpWithMerchantId\n | Flow::VerifyEmail\n | Flow::AcceptInviteFromEmail\n | Flow::VerifyEmailRequest\n | Flow::UpdateUserAccountDetails\n | Flow::TotpBegin\n | Flow::TotpReset\n | Flow::TotpVerify\n | Flow::TotpUpdate\n | Flow::RecoveryCodeVerify\n | Flow::RecoveryCodesGenerate\n | Flow::TerminateTwoFactorAuth\n | Flow::TwoFactorAuthStatus\n | Flow::CreateUserAuthenticationMethod\n | Flow::UpdateUserAuthenticationMethod\n | Flow::ListUserAuthenticationMethods\n | Flow::UserTransferKey\n | Flow::GetSsoAuthUrl\n | Flow::SignInWithSso\n | Flow::ListOrgForUser\n | Flow::ListMerchantsForUserInOrg\n | Flow::ListProfileForUserInOrgAndMerchant\n | Flow::ListInvitationsForUser\n | Flow::AuthSelect => Self::User,\n\n Flow::ListRolesV2\n | Flow::ListInvitableRolesAtEntityLevel\n | Flow::ListUpdatableRolesAtEntityLevel\n | Flow::GetRole\n | Flow::GetRoleV2\n | Flow::GetRoleFromToken\n | Flow::GetRoleFromTokenV2\n | Flow::UpdateUserRole\n | Flow::GetAuthorizationInfo\n | Flow::GetRolesInfo\n | Flow::GetParentGroupInfo\n | Flow::AcceptInvitationsV2\n | Flow::AcceptInvitationsPreAuth\n | Flow::DeleteUserRole\n | Flow::CreateRole\n | Flow::UpdateRole\n | Flow::UserFromEmail\n | Flow::ListUsersInLineage => Self::UserRole,\n\n Flow::GetActionUrl | Flow::SyncOnboardingStatus | Flow::ResetTrackingId => {\n Self::ConnectorOnboarding\n }\n\n Flow::ReconMerchantUpdate\n | Flow::ReconTokenRequest\n | Flow::ReconServiceRequest\n | Flow::ReconVerifyToken => Self::Recon,\n\n Flow::RetrievePollStatus => Self::Poll,\n }\n }", + "diff_span": { + "before": "", + "after": " | Flow::VerifyPaymentConnector\n | Flow::InternalUserSignup\n | Flow::TenantUserCreate\n | Flow::SwitchOrg\n | Flow::SwitchMerchantV2\n | Flow::SwitchProfile\n | Flow::UserOrgCreate\n | Flow::UserMerchantAccountCreate\n | Flow::GenerateSampleData" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/db/merchant_account.rs::trait::MerchantAccountInterface", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "trait_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub trait MerchantAccountInterface\nwhere\n domain::MerchantAccount:\n Conversion,\n{\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult;\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError>;\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult;\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n}", + "after_code": "pub trait MerchantAccountInterface\nwhere\n domain::MerchantAccount:\n Conversion,\n{\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult;\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult;\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError>;\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult;\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError>;\n}", + "diff_span": { + "before": "", + "after": " merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError>;\n\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError>;\n}" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::NewUserRole::function::convert_to_new_v2_role", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn convert_to_new_v2_role(self, entity: EntityInfo) -> UserRoleNew {\n UserRoleNew {\n user_id: self.user_id,\n role_id: self.role_id,\n status: self.status,\n created_by: self.created_by,\n last_modified_by: self.last_modified_by,\n created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: Some(entity.org_id),\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id,\n entity_id: Some(entity.entity_id),\n entity_type: Some(entity.entity_type),\n version: UserRoleVersion::V2,\n tenant_id: entity.tenant_id,\n }\n }", + "after_code": "fn convert_to_new_v2_role(self, entity: EntityInfo) -> UserRoleNew {\n UserRoleNew {\n user_id: self.user_id,\n role_id: self.role_id,\n status: self.status,\n created_by: self.created_by,\n last_modified_by: self.last_modified_by,\n created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: entity.org_id,\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id,\n entity_id: Some(entity.entity_id),\n entity_type: Some(entity.entity_type),\n version: UserRoleVersion::V2,\n tenant_id: entity.tenant_id,\n }\n }", + "diff_span": { + "before": " created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: Some(entity.org_id),\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id,", + "after": " created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: entity.org_id,\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/services/authorization/permissions.rs::function::get_resource_name", + "file": "crates/router/src/services/authorization/permissions.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn get_resource_name(resource: &Resource, entity_type: &EntityType) -> &'static str {\n match (resource, entity_type) {\n (Resource::Payment, _) => \"Payments\",\n (Resource::Refund, _) => \"Refunds\",\n (Resource::Dispute, _) => \"Disputes\",\n (Resource::Mandate, _) => \"Mandates\",\n (Resource::Customer, _) => \"Customers\",\n (Resource::Payout, _) => \"Payouts\",\n (Resource::ApiKey, _) => \"Api Keys\",\n (Resource::Connector, _) => \"Payment Processors, Payout Processors, Fraud & Risk Managers\",\n (Resource::Routing, _) => \"Routing\",\n (Resource::ThreeDsDecisionManager, _) => \"3DS Decision Manager\",\n (Resource::SurchargeDecisionManager, _) => \"Surcharge Decision Manager\",\n (Resource::Analytics, _) => \"Analytics\",\n (Resource::Report, _) => \"Operation Reports\",\n (Resource::User, _) => \"Users\",\n (Resource::WebhookEvent, _) => \"Webhook Events\",\n (Resource::Recon, _) => \"Reconciliation Reports\",\n (Resource::Account, EntityType::Profile) => \"Business Profile Account\",\n (Resource::Account, EntityType::Merchant) => \"Merchant Account\",\n (Resource::Account, EntityType::Organization) => \"Organization Account\",\n }\n}", + "after_code": "pub fn get_resource_name(resource: &Resource, entity_type: &EntityType) -> &'static str {\n match (resource, entity_type) {\n (Resource::Payment, _) => \"Payments\",\n (Resource::Refund, _) => \"Refunds\",\n (Resource::Dispute, _) => \"Disputes\",\n (Resource::Mandate, _) => \"Mandates\",\n (Resource::Customer, _) => \"Customers\",\n (Resource::Payout, _) => \"Payouts\",\n (Resource::ApiKey, _) => \"Api Keys\",\n (Resource::Connector, _) => \"Payment Processors, Payout Processors, Fraud & Risk Managers\",\n (Resource::Routing, _) => \"Routing\",\n (Resource::ThreeDsDecisionManager, _) => \"3DS Decision Manager\",\n (Resource::SurchargeDecisionManager, _) => \"Surcharge Decision Manager\",\n (Resource::Analytics, _) => \"Analytics\",\n (Resource::Report, _) => \"Operation Reports\",\n (Resource::User, _) => \"Users\",\n (Resource::WebhookEvent, _) => \"Webhook Events\",\n (Resource::Recon, _) => \"Reconciliation Reports\",\n (Resource::Account, EntityType::Profile) => \"Business Profile Account\",\n (Resource::Account, EntityType::Merchant) => \"Merchant Account\",\n (Resource::Account, EntityType::Organization) => \"Organization Account\",\n (Resource::Account, EntityType::Tenant) => \"Tenant Account\",\n }\n}", + "diff_span": { + "before": "", + "after": " (Resource::Account, EntityType::Merchant) => \"Merchant Account\",\n (Resource::Account, EntityType::Organization) => \"Organization Account\",\n (Resource::Account, EntityType::Tenant) => \"Tenant Account\",\n }\n}" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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_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::Tenant | 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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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": " .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(", + "after": " .change_context(UserErrors::InternalServerError)?;\n let profiles = match role_info.get_entity_type() {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => state\n .store\n .list_profile_by_merchant_id(" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/routes/app.rs::User::function::server", + "file": "crates/router/src/routes/app.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub fn server(state: AppState) -> Scope {\n let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n route = route\n .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n // signin/signup with sso using openidconnect\n .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n .service(\n web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n )\n .service(\n web::resource(\"/create_merchant\")\n .route(web::post().to(user::user_merchant_account_create)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/permission_info\")\n .route(web::get().to(user_role::get_authorization_info)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n )\n .service(\n web::resource(\"/parent/list\")\n .route(web::get().to(user_role::get_parent_group_info)),\n )\n .service(\n web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n )\n .service(\n web::resource(\"/data\")\n .route(web::get().to(user::get_multiple_dashboard_metadata))\n .route(web::post().to(user::set_dashboard_metadata)),\n );\n\n route = route\n .service(web::scope(\"/key\").service(\n web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n ));\n\n route = route.service(\n web::scope(\"/list\")\n .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::get().to(user::list_merchants_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n )\n .service(\n web::resource(\"/invitation\")\n .route(web::get().to(user_role::list_invitations_for_user)),\n ),\n );\n\n route = route.service(\n web::scope(\"/switch\")\n .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::post().to(user::switch_merchant_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n ),\n );\n\n // Two factor auth routes\n route = route.service(\n web::scope(\"/2fa\")\n // TODO: to be deprecated\n .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n .service(\n web::resource(\"/v2\")\n .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n )\n .service(\n web::scope(\"/totp\")\n .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::totp_verify))\n .route(web::put().to(user::totp_update)),\n ),\n )\n .service(\n web::scope(\"/recovery_code\")\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::verify_recovery_code)),\n )\n .service(\n web::resource(\"/generate\")\n .route(web::get().to(user::generate_recovery_codes)),\n ),\n )\n .service(\n web::resource(\"/terminate\")\n .route(web::get().to(user::terminate_two_factor_auth)),\n ),\n );\n\n route = route.service(\n web::scope(\"/auth\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user::create_user_authentication_method))\n .route(web::put().to(user::update_user_authentication_method)),\n )\n .service(\n web::resource(\"/list\")\n .route(web::get().to(user::list_user_authentication_methods)),\n )\n .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n .service(\n web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n ),\n );\n\n #[cfg(feature = \"email\")]\n {\n route = route\n .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n .service(\n web::resource(\"/connect_account\")\n .route(web::post().to(user::user_connect_account)),\n )\n .service(\n web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n )\n .service(\n web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n )\n .service(\n web::resource(\"/signup_with_merchant_id\")\n .route(web::post().to(user::user_signup_with_merchant_id)),\n )\n .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n .service(\n web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n )\n .service(\n web::resource(\"/verify_email_request\")\n .route(web::post().to(user::verify_email_request)),\n )\n .service(\n web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n )\n .service(\n web::resource(\"/accept_invite_from_email\")\n .route(web::post().to(user::accept_invite_from_email)),\n );\n }\n #[cfg(not(feature = \"email\"))]\n {\n route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n }\n\n // User management\n route = route.service(\n web::scope(\"/user\")\n .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n // TODO: To be deprecated\n .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n .service(\n web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_users_in_lineage)),\n )\n .service(\n web::resource(\"/invite_multiple\")\n .route(web::post().to(user::invite_multiple_user)),\n )\n .service(\n web::scope(\"/invite/accept\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre_auth\")\n .route(web::post().to(user_role::accept_invitations_pre_auth)),\n )\n .service(\n web::scope(\"/v2\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre-auth\").route(\n web::post().to(user_role::accept_invitations_pre_auth),\n ),\n ),\n ),\n )\n .service(\n web::resource(\"/update_role\")\n .route(web::post().to(user_role::update_user_role)),\n )\n .service(\n web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n ),\n );\n\n // Role information\n route =\n route.service(\n web::scope(\"/role\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::get_role_from_token))\n .route(web::post().to(user_role::create_role)),\n )\n .service(web::resource(\"/v2\").route(\n web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n ))\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(\n web::scope(\"/list\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(web::resource(\"/invite\").route(\n web::get().to(user_role::list_invitable_roles_at_entity_level),\n ))\n .service(web::resource(\"/update\").route(\n web::get().to(user_role::list_updatable_roles_at_entity_level),\n )),\n )\n .service(\n web::resource(\"/{role_id}\")\n .route(web::get().to(user_role::get_role))\n .route(web::put().to(user_role::update_role)),\n )\n .service(\n web::resource(\"/{role_id}/v2\")\n .route(web::get().to(user_role::get_parent_info_for_role)),\n ),\n );\n\n #[cfg(feature = \"dummy_connector\")]\n {\n route = route.service(\n web::resource(\"/sample_data\")\n .route(web::post().to(user::generate_sample_data))\n .route(web::delete().to(user::delete_sample_data)),\n )\n }\n route\n }", + "after_code": "pub fn server(state: AppState) -> Scope {\n let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n route = route\n .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n // signin/signup with sso using openidconnect\n .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n .service(\n web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n )\n .service(\n web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n )\n .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n .service(\n web::resource(\"/create_merchant\")\n .route(web::post().to(user::user_merchant_account_create)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/permission_info\")\n .route(web::get().to(user_role::get_authorization_info)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n )\n .service(\n web::resource(\"/parent/list\")\n .route(web::get().to(user_role::get_parent_group_info)),\n )\n .service(\n web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n )\n .service(\n web::resource(\"/data\")\n .route(web::get().to(user::get_multiple_dashboard_metadata))\n .route(web::post().to(user::set_dashboard_metadata)),\n );\n\n route = route\n .service(web::scope(\"/key\").service(\n web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n ));\n\n route = route.service(\n web::scope(\"/list\")\n .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::get().to(user::list_merchants_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n )\n .service(\n web::resource(\"/invitation\")\n .route(web::get().to(user_role::list_invitations_for_user)),\n ),\n );\n\n route = route.service(\n web::scope(\"/switch\")\n .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::post().to(user::switch_merchant_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n ),\n );\n\n // Two factor auth routes\n route = route.service(\n web::scope(\"/2fa\")\n // TODO: to be deprecated\n .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n .service(\n web::resource(\"/v2\")\n .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n )\n .service(\n web::scope(\"/totp\")\n .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::totp_verify))\n .route(web::put().to(user::totp_update)),\n ),\n )\n .service(\n web::scope(\"/recovery_code\")\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::verify_recovery_code)),\n )\n .service(\n web::resource(\"/generate\")\n .route(web::get().to(user::generate_recovery_codes)),\n ),\n )\n .service(\n web::resource(\"/terminate\")\n .route(web::get().to(user::terminate_two_factor_auth)),\n ),\n );\n\n route = route.service(\n web::scope(\"/auth\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user::create_user_authentication_method))\n .route(web::put().to(user::update_user_authentication_method)),\n )\n .service(\n web::resource(\"/list\")\n .route(web::get().to(user::list_user_authentication_methods)),\n )\n .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n .service(\n web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n ),\n );\n\n #[cfg(feature = \"email\")]\n {\n route = route\n .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n .service(\n web::resource(\"/connect_account\")\n .route(web::post().to(user::user_connect_account)),\n )\n .service(\n web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n )\n .service(\n web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n )\n .service(\n web::resource(\"/signup_with_merchant_id\")\n .route(web::post().to(user::user_signup_with_merchant_id)),\n )\n .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n .service(\n web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n )\n .service(\n web::resource(\"/verify_email_request\")\n .route(web::post().to(user::verify_email_request)),\n )\n .service(\n web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n )\n .service(\n web::resource(\"/accept_invite_from_email\")\n .route(web::post().to(user::accept_invite_from_email)),\n );\n }\n #[cfg(not(feature = \"email\"))]\n {\n route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n }\n\n // User management\n route = route.service(\n web::scope(\"/user\")\n .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n // TODO: To be deprecated\n .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n .service(\n web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_users_in_lineage)),\n )\n .service(\n web::resource(\"/invite_multiple\")\n .route(web::post().to(user::invite_multiple_user)),\n )\n .service(\n web::scope(\"/invite/accept\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre_auth\")\n .route(web::post().to(user_role::accept_invitations_pre_auth)),\n )\n .service(\n web::scope(\"/v2\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre-auth\").route(\n web::post().to(user_role::accept_invitations_pre_auth),\n ),\n ),\n ),\n )\n .service(\n web::resource(\"/update_role\")\n .route(web::post().to(user_role::update_user_role)),\n )\n .service(\n web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n ),\n );\n\n // Role information\n route =\n route.service(\n web::scope(\"/role\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::get_role_from_token))\n .route(web::post().to(user_role::create_role)),\n )\n .service(web::resource(\"/v2\").route(\n web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n ))\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(\n web::scope(\"/list\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(web::resource(\"/invite\").route(\n web::get().to(user_role::list_invitable_roles_at_entity_level),\n ))\n .service(web::resource(\"/update\").route(\n web::get().to(user_role::list_updatable_roles_at_entity_level),\n )),\n )\n .service(\n web::resource(\"/{role_id}\")\n .route(web::get().to(user_role::get_role))\n .route(web::put().to(user_role::update_role)),\n )\n .service(\n web::resource(\"/{role_id}/v2\")\n .route(web::get().to(user_role::get_parent_info_for_role)),\n ),\n );\n\n #[cfg(feature = \"dummy_connector\")]\n {\n route = route.service(\n web::resource(\"/sample_data\")\n .route(web::post().to(user::generate_sample_data))\n .route(web::delete().to(user::delete_sample_data)),\n )\n }\n route\n }", + "diff_span": { + "before": "", + "after": " web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n )\n .service(\n web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n )\n .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n .service(\n web::resource(\"/create_merchant\")" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router_env/src/logger/types.rs::enum::Flow", + "file": "crates/router_env/src/logger/types.rs", + "kind": "enum_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub enum Flow {\n /// Health check\n HealthCheck,\n /// Deep health Check\n DeepHealthCheck,\n /// Organization create flow\n OrganizationCreate,\n /// Organization retrieve flow\n OrganizationRetrieve,\n /// Organization update flow\n OrganizationUpdate,\n /// Merchants account create flow.\n MerchantsAccountCreate,\n /// Merchants account retrieve flow.\n MerchantsAccountRetrieve,\n /// Merchants account update flow.\n MerchantsAccountUpdate,\n /// Merchants account delete flow.\n MerchantsAccountDelete,\n /// Merchant Connectors create flow.\n MerchantConnectorsCreate,\n /// Merchant Connectors retrieve flow.\n MerchantConnectorsRetrieve,\n /// Merchant account list\n MerchantAccountList,\n /// Merchant Connectors update flow.\n MerchantConnectorsUpdate,\n /// Merchant Connectors delete flow.\n MerchantConnectorsDelete,\n /// Merchant Connectors list flow.\n MerchantConnectorsList,\n /// Merchant Transfer Keys\n MerchantTransferKey,\n /// ConfigKey create flow.\n ConfigKeyCreate,\n /// ConfigKey fetch flow.\n ConfigKeyFetch,\n /// ConfigKey Update flow.\n ConfigKeyUpdate,\n /// ConfigKey Delete flow.\n ConfigKeyDelete,\n /// Customers create flow.\n CustomersCreate,\n /// Customers retrieve flow.\n CustomersRetrieve,\n /// Customers update flow.\n CustomersUpdate,\n /// Customers delete flow.\n CustomersDelete,\n /// Customers get mandates flow.\n CustomersGetMandates,\n /// Create an Ephemeral Key.\n EphemeralKeyCreate,\n /// Delete an Ephemeral Key.\n EphemeralKeyDelete,\n /// Mandates retrieve flow.\n MandatesRetrieve,\n /// Mandates revoke flow.\n MandatesRevoke,\n /// Mandates list flow.\n MandatesList,\n /// Payment methods create flow.\n PaymentMethodsCreate,\n /// Payment methods migrate flow.\n PaymentMethodsMigrate,\n /// Payment methods list flow.\n PaymentMethodsList,\n /// Payment method save flow\n PaymentMethodSave,\n /// Customer payment methods list flow.\n CustomerPaymentMethodsList,\n /// List Customers for a merchant\n CustomersList,\n /// Retrieve countries and currencies for connector and payment method\n ListCountriesCurrencies,\n /// Payment method create collect link flow.\n PaymentMethodCollectLink,\n /// Payment methods retrieve flow.\n PaymentMethodsRetrieve,\n /// Payment methods update flow.\n PaymentMethodsUpdate,\n /// Payment methods delete flow.\n PaymentMethodsDelete,\n /// Default Payment method flow.\n DefaultPaymentMethodsSet,\n /// Payments create flow.\n PaymentsCreate,\n /// Payments Retrieve flow.\n PaymentsRetrieve,\n /// Payments Retrieve force sync flow.\n PaymentsRetrieveForceSync,\n /// Payments update flow.\n PaymentsUpdate,\n /// Payments confirm flow.\n PaymentsConfirm,\n /// Payments capture flow.\n PaymentsCapture,\n /// Payments cancel flow.\n PaymentsCancel,\n /// Payments approve flow.\n PaymentsApprove,\n /// Payments reject flow.\n PaymentsReject,\n /// Payments Session Token flow\n PaymentsSessionToken,\n /// Payments start flow.\n PaymentsStart,\n /// Payments list flow.\n PaymentsList,\n /// Payments filters flow\n PaymentsFilters,\n /// Payments aggregates flow\n PaymentsAggregate,\n /// Payments Create Intent flow\n PaymentsCreateIntent,\n /// Payments Get Intent flow\n PaymentsGetIntent,\n #[cfg(feature = \"payouts\")]\n /// Payouts create flow\n PayoutsCreate,\n #[cfg(feature = \"payouts\")]\n /// Payouts retrieve flow.\n PayoutsRetrieve,\n #[cfg(feature = \"payouts\")]\n /// Payouts update flow.\n PayoutsUpdate,\n /// Payouts confirm flow.\n PayoutsConfirm,\n #[cfg(feature = \"payouts\")]\n /// Payouts cancel flow.\n PayoutsCancel,\n #[cfg(feature = \"payouts\")]\n /// Payouts fulfill flow.\n PayoutsFulfill,\n #[cfg(feature = \"payouts\")]\n /// Payouts list flow.\n PayoutsList,\n #[cfg(feature = \"payouts\")]\n /// Payouts filter flow.\n PayoutsFilter,\n /// Payouts accounts flow.\n PayoutsAccounts,\n /// Payout link initiate flow\n PayoutLinkInitiate,\n /// Payments Redirect flow\n PaymentsRedirect,\n /// Payemnts Complete Authorize Flow\n PaymentsCompleteAuthorize,\n /// Refunds create flow.\n RefundsCreate,\n /// Refunds retrieve flow.\n RefundsRetrieve,\n /// Refunds retrieve force sync flow.\n RefundsRetrieveForceSync,\n /// Refunds update flow.\n RefundsUpdate,\n /// Refunds list flow.\n RefundsList,\n /// Refunds filters flow\n RefundsFilters,\n /// Refunds aggregates flow\n RefundsAggregate,\n // Retrieve forex flow.\n RetrieveForexFlow,\n /// Toggles recon service for a merchant.\n ReconMerchantUpdate,\n /// Recon token request flow.\n ReconTokenRequest,\n /// Initial request for recon service.\n ReconServiceRequest,\n /// Recon token verification flow\n ReconVerifyToken,\n /// Routing create flow,\n RoutingCreateConfig,\n /// Routing link config\n RoutingLinkConfig,\n /// Routing link config\n RoutingUnlinkConfig,\n /// Routing retrieve config\n RoutingRetrieveConfig,\n /// Routing retrieve active config\n RoutingRetrieveActiveConfig,\n /// Routing retrieve default config\n RoutingRetrieveDefaultConfig,\n /// Routing retrieve dictionary\n RoutingRetrieveDictionary,\n /// Routing update config\n RoutingUpdateConfig,\n /// Routing update default config\n RoutingUpdateDefaultConfig,\n /// Routing delete config\n RoutingDeleteConfig,\n /// Toggle dynamic routing\n ToggleDynamicRouting,\n /// Update dynamic routing config\n UpdateDynamicRoutingConfigs,\n /// Add record to blocklist\n AddToBlocklist,\n /// Delete record from blocklist\n DeleteFromBlocklist,\n /// List entries from blocklist\n ListBlocklist,\n /// Toggle blocklist for merchant\n ToggleBlocklistGuard,\n /// Incoming Webhook Receive\n IncomingWebhookReceive,\n /// Validate payment method flow\n ValidatePaymentMethod,\n /// API Key create flow\n ApiKeyCreate,\n /// API Key retrieve flow\n ApiKeyRetrieve,\n /// API Key update flow\n ApiKeyUpdate,\n /// API Key revoke flow\n ApiKeyRevoke,\n /// API Key list flow\n ApiKeyList,\n /// Dispute Retrieve flow\n DisputesRetrieve,\n /// Dispute List flow\n DisputesList,\n /// Dispute Filters flow\n DisputesFilters,\n /// Cards Info flow\n CardsInfo,\n /// Create File flow\n CreateFile,\n /// Delete File flow\n DeleteFile,\n /// Retrieve File flow\n RetrieveFile,\n /// Dispute Evidence submission flow\n DisputesEvidenceSubmit,\n /// Create Config Key flow\n CreateConfigKey,\n /// Attach Dispute Evidence flow\n AttachDisputeEvidence,\n /// Delete Dispute Evidence flow\n DeleteDisputeEvidence,\n /// Disputes aggregate flow\n DisputesAggregate,\n /// Retrieve Dispute Evidence flow\n RetrieveDisputeEvidence,\n /// Invalidate cache flow\n CacheInvalidate,\n /// Payment Link Retrieve flow\n PaymentLinkRetrieve,\n /// payment Link Initiate flow\n PaymentLinkInitiate,\n /// payment Link Initiate flow\n PaymentSecureLinkInitiate,\n /// Payment Link List flow\n PaymentLinkList,\n /// Payment Link Status\n PaymentLinkStatus,\n /// Create a profile\n ProfileCreate,\n /// Update a profile\n ProfileUpdate,\n /// Retrieve a profile\n ProfileRetrieve,\n /// Delete a profile\n ProfileDelete,\n /// List all the profiles for a merchant\n ProfileList,\n /// Different verification flows\n Verification,\n /// Rust locker migration\n RustLockerMigration,\n /// Gsm Rule Creation flow\n GsmRuleCreate,\n /// Gsm Rule Retrieve flow\n GsmRuleRetrieve,\n /// Gsm Rule Update flow\n GsmRuleUpdate,\n /// Apple pay certificates migration\n ApplePayCertificatesMigration,\n /// Gsm Rule Delete flow\n GsmRuleDelete,\n /// User Sign Up\n UserSignUp,\n /// User Sign Up\n UserSignUpWithMerchantId,\n /// User Sign In\n UserSignIn,\n /// User transfer key\n UserTransferKey,\n /// User connect account\n UserConnectAccount,\n /// Upsert Decision Manager Config\n DecisionManagerUpsertConfig,\n /// Delete Decision Manager Config\n DecisionManagerDeleteConfig,\n /// Retrieve Decision Manager Config\n DecisionManagerRetrieveConfig,\n /// Manual payment fulfillment acknowledgement\n FrmFulfillment,\n /// Change password flow\n ChangePassword,\n /// Signout flow\n Signout,\n /// Set Dashboard Metadata flow\n SetDashboardMetadata,\n /// Get Multiple Dashboard Metadata flow\n GetMultipleDashboardMetadata,\n /// Payment Connector Verify\n VerifyPaymentConnector,\n /// Internal user signup\n InternalUserSignup,\n /// Switch org\n SwitchOrg,\n /// Switch merchant v2\n SwitchMerchantV2,\n /// Switch profile\n SwitchProfile,\n /// Get permission info\n GetAuthorizationInfo,\n /// Get Roles info\n GetRolesInfo,\n /// Get Parent Group Info\n GetParentGroupInfo,\n /// List roles v2\n ListRolesV2,\n /// List invitable roles at entity level\n ListInvitableRolesAtEntityLevel,\n /// List updatable roles at entity level\n ListUpdatableRolesAtEntityLevel,\n /// Get role\n GetRole,\n /// Get parent info for role\n GetRoleV2,\n /// Get role from token\n GetRoleFromToken,\n /// Get resources and groups for role from token\n GetRoleFromTokenV2,\n /// Update user role\n UpdateUserRole,\n /// Create merchant account for user in a org\n UserMerchantAccountCreate,\n /// Generate Sample Data\n GenerateSampleData,\n /// Delete Sample Data\n DeleteSampleData,\n /// Get details of a user\n GetUserDetails,\n /// Get details of a user role in a merchant account\n GetUserRoleDetails,\n /// PaymentMethodAuth Link token create\n PmAuthLinkTokenCreate,\n /// PaymentMethodAuth Exchange token create\n PmAuthExchangeToken,\n /// Get reset password link\n ForgotPassword,\n /// Reset password using link\n ResetPassword,\n /// Force set or force change password\n RotatePassword,\n /// Invite multiple users\n InviteMultipleUser,\n /// Reinvite user\n ReInviteUser,\n /// Accept invite from email\n AcceptInviteFromEmail,\n /// Delete user role\n DeleteUserRole,\n /// Incremental Authorization flow\n PaymentsIncrementalAuthorization,\n /// Get action URL for connector onboarding\n GetActionUrl,\n /// Sync connector onboarding status\n SyncOnboardingStatus,\n /// Reset tracking id\n ResetTrackingId,\n /// Verify email Token\n VerifyEmail,\n /// Send verify email\n VerifyEmailRequest,\n /// Update user account details\n UpdateUserAccountDetails,\n /// Accept user invitation using entities\n AcceptInvitationsV2,\n /// Accept user invitation using entities before user login\n AcceptInvitationsPreAuth,\n /// Initiate external authentication for a payment\n PaymentsExternalAuthentication,\n /// Authorize the payment after external 3ds authentication\n PaymentsAuthorize,\n /// Create Role\n CreateRole,\n /// Update Role\n UpdateRole,\n /// User email flow start\n UserFromEmail,\n /// Begin TOTP\n TotpBegin,\n /// Reset TOTP\n TotpReset,\n /// Verify TOTP\n TotpVerify,\n /// Update TOTP secret\n TotpUpdate,\n /// Verify Access Code\n RecoveryCodeVerify,\n /// Generate or Regenerate recovery codes\n RecoveryCodesGenerate,\n /// Terminate two factor authentication\n TerminateTwoFactorAuth,\n /// Check 2FA status\n TwoFactorAuthStatus,\n /// Create user authentication method\n CreateUserAuthenticationMethod,\n /// Update user authentication method\n UpdateUserAuthenticationMethod,\n /// List user authentication methods\n ListUserAuthenticationMethods,\n /// Get sso auth url\n GetSsoAuthUrl,\n /// Signin with SSO\n SignInWithSso,\n /// Auth Select\n AuthSelect,\n /// List Orgs for user\n ListOrgForUser,\n /// List Merchants for user in org\n ListMerchantsForUserInOrg,\n /// List Profile for user in org and merchant\n ListProfileForUserInOrgAndMerchant,\n /// List Users in Org\n ListUsersInLineage,\n /// List invitations for user\n ListInvitationsForUser,\n /// List initial webhook delivery attempts\n WebhookEventInitialDeliveryAttemptList,\n /// List delivery attempts for a webhook event\n WebhookEventDeliveryAttemptList,\n /// Manually retry the delivery for a webhook event\n WebhookEventDeliveryRetry,\n /// Retrieve status of the Poll\n RetrievePollStatus,\n /// Toggles the extended card info feature in profile level\n ToggleExtendedCardInfo,\n /// Toggles the extended card info feature in profile level\n ToggleConnectorAgnosticMit,\n /// Get the extended card info associated to a payment_id\n GetExtendedCardInfo,\n /// Manually update the refund details like status, error code, error message etc.\n RefundsManualUpdate,\n /// Manually update the payment details like status, error code, error message etc.\n PaymentsManualUpdate,\n /// Dynamic Tax Calcultion\n SessionUpdateTaxCalculation,\n /// Payments confirm intent\n PaymentsConfirmIntent,\n /// Payments post session tokens flow\n PaymentsPostSessionTokens,\n /// Payments start redirection flow\n PaymentStartRedirection,\n}", + "after_code": "pub enum Flow {\n /// Health check\n HealthCheck,\n /// Deep health Check\n DeepHealthCheck,\n /// Organization create flow\n OrganizationCreate,\n /// Organization retrieve flow\n OrganizationRetrieve,\n /// Organization update flow\n OrganizationUpdate,\n /// Merchants account create flow.\n MerchantsAccountCreate,\n /// Merchants account retrieve flow.\n MerchantsAccountRetrieve,\n /// Merchants account update flow.\n MerchantsAccountUpdate,\n /// Merchants account delete flow.\n MerchantsAccountDelete,\n /// Merchant Connectors create flow.\n MerchantConnectorsCreate,\n /// Merchant Connectors retrieve flow.\n MerchantConnectorsRetrieve,\n /// Merchant account list\n MerchantAccountList,\n /// Merchant Connectors update flow.\n MerchantConnectorsUpdate,\n /// Merchant Connectors delete flow.\n MerchantConnectorsDelete,\n /// Merchant Connectors list flow.\n MerchantConnectorsList,\n /// Merchant Transfer Keys\n MerchantTransferKey,\n /// ConfigKey create flow.\n ConfigKeyCreate,\n /// ConfigKey fetch flow.\n ConfigKeyFetch,\n /// ConfigKey Update flow.\n ConfigKeyUpdate,\n /// ConfigKey Delete flow.\n ConfigKeyDelete,\n /// Customers create flow.\n CustomersCreate,\n /// Customers retrieve flow.\n CustomersRetrieve,\n /// Customers update flow.\n CustomersUpdate,\n /// Customers delete flow.\n CustomersDelete,\n /// Customers get mandates flow.\n CustomersGetMandates,\n /// Create an Ephemeral Key.\n EphemeralKeyCreate,\n /// Delete an Ephemeral Key.\n EphemeralKeyDelete,\n /// Mandates retrieve flow.\n MandatesRetrieve,\n /// Mandates revoke flow.\n MandatesRevoke,\n /// Mandates list flow.\n MandatesList,\n /// Payment methods create flow.\n PaymentMethodsCreate,\n /// Payment methods migrate flow.\n PaymentMethodsMigrate,\n /// Payment methods list flow.\n PaymentMethodsList,\n /// Payment method save flow\n PaymentMethodSave,\n /// Customer payment methods list flow.\n CustomerPaymentMethodsList,\n /// List Customers for a merchant\n CustomersList,\n /// Retrieve countries and currencies for connector and payment method\n ListCountriesCurrencies,\n /// Payment method create collect link flow.\n PaymentMethodCollectLink,\n /// Payment methods retrieve flow.\n PaymentMethodsRetrieve,\n /// Payment methods update flow.\n PaymentMethodsUpdate,\n /// Payment methods delete flow.\n PaymentMethodsDelete,\n /// Default Payment method flow.\n DefaultPaymentMethodsSet,\n /// Payments create flow.\n PaymentsCreate,\n /// Payments Retrieve flow.\n PaymentsRetrieve,\n /// Payments Retrieve force sync flow.\n PaymentsRetrieveForceSync,\n /// Payments update flow.\n PaymentsUpdate,\n /// Payments confirm flow.\n PaymentsConfirm,\n /// Payments capture flow.\n PaymentsCapture,\n /// Payments cancel flow.\n PaymentsCancel,\n /// Payments approve flow.\n PaymentsApprove,\n /// Payments reject flow.\n PaymentsReject,\n /// Payments Session Token flow\n PaymentsSessionToken,\n /// Payments start flow.\n PaymentsStart,\n /// Payments list flow.\n PaymentsList,\n /// Payments filters flow\n PaymentsFilters,\n /// Payments aggregates flow\n PaymentsAggregate,\n /// Payments Create Intent flow\n PaymentsCreateIntent,\n /// Payments Get Intent flow\n PaymentsGetIntent,\n #[cfg(feature = \"payouts\")]\n /// Payouts create flow\n PayoutsCreate,\n #[cfg(feature = \"payouts\")]\n /// Payouts retrieve flow.\n PayoutsRetrieve,\n #[cfg(feature = \"payouts\")]\n /// Payouts update flow.\n PayoutsUpdate,\n /// Payouts confirm flow.\n PayoutsConfirm,\n #[cfg(feature = \"payouts\")]\n /// Payouts cancel flow.\n PayoutsCancel,\n #[cfg(feature = \"payouts\")]\n /// Payouts fulfill flow.\n PayoutsFulfill,\n #[cfg(feature = \"payouts\")]\n /// Payouts list flow.\n PayoutsList,\n #[cfg(feature = \"payouts\")]\n /// Payouts filter flow.\n PayoutsFilter,\n /// Payouts accounts flow.\n PayoutsAccounts,\n /// Payout link initiate flow\n PayoutLinkInitiate,\n /// Payments Redirect flow\n PaymentsRedirect,\n /// Payemnts Complete Authorize Flow\n PaymentsCompleteAuthorize,\n /// Refunds create flow.\n RefundsCreate,\n /// Refunds retrieve flow.\n RefundsRetrieve,\n /// Refunds retrieve force sync flow.\n RefundsRetrieveForceSync,\n /// Refunds update flow.\n RefundsUpdate,\n /// Refunds list flow.\n RefundsList,\n /// Refunds filters flow\n RefundsFilters,\n /// Refunds aggregates flow\n RefundsAggregate,\n // Retrieve forex flow.\n RetrieveForexFlow,\n /// Toggles recon service for a merchant.\n ReconMerchantUpdate,\n /// Recon token request flow.\n ReconTokenRequest,\n /// Initial request for recon service.\n ReconServiceRequest,\n /// Recon token verification flow\n ReconVerifyToken,\n /// Routing create flow,\n RoutingCreateConfig,\n /// Routing link config\n RoutingLinkConfig,\n /// Routing link config\n RoutingUnlinkConfig,\n /// Routing retrieve config\n RoutingRetrieveConfig,\n /// Routing retrieve active config\n RoutingRetrieveActiveConfig,\n /// Routing retrieve default config\n RoutingRetrieveDefaultConfig,\n /// Routing retrieve dictionary\n RoutingRetrieveDictionary,\n /// Routing update config\n RoutingUpdateConfig,\n /// Routing update default config\n RoutingUpdateDefaultConfig,\n /// Routing delete config\n RoutingDeleteConfig,\n /// Toggle dynamic routing\n ToggleDynamicRouting,\n /// Update dynamic routing config\n UpdateDynamicRoutingConfigs,\n /// Add record to blocklist\n AddToBlocklist,\n /// Delete record from blocklist\n DeleteFromBlocklist,\n /// List entries from blocklist\n ListBlocklist,\n /// Toggle blocklist for merchant\n ToggleBlocklistGuard,\n /// Incoming Webhook Receive\n IncomingWebhookReceive,\n /// Validate payment method flow\n ValidatePaymentMethod,\n /// API Key create flow\n ApiKeyCreate,\n /// API Key retrieve flow\n ApiKeyRetrieve,\n /// API Key update flow\n ApiKeyUpdate,\n /// API Key revoke flow\n ApiKeyRevoke,\n /// API Key list flow\n ApiKeyList,\n /// Dispute Retrieve flow\n DisputesRetrieve,\n /// Dispute List flow\n DisputesList,\n /// Dispute Filters flow\n DisputesFilters,\n /// Cards Info flow\n CardsInfo,\n /// Create File flow\n CreateFile,\n /// Delete File flow\n DeleteFile,\n /// Retrieve File flow\n RetrieveFile,\n /// Dispute Evidence submission flow\n DisputesEvidenceSubmit,\n /// Create Config Key flow\n CreateConfigKey,\n /// Attach Dispute Evidence flow\n AttachDisputeEvidence,\n /// Delete Dispute Evidence flow\n DeleteDisputeEvidence,\n /// Disputes aggregate flow\n DisputesAggregate,\n /// Retrieve Dispute Evidence flow\n RetrieveDisputeEvidence,\n /// Invalidate cache flow\n CacheInvalidate,\n /// Payment Link Retrieve flow\n PaymentLinkRetrieve,\n /// payment Link Initiate flow\n PaymentLinkInitiate,\n /// payment Link Initiate flow\n PaymentSecureLinkInitiate,\n /// Payment Link List flow\n PaymentLinkList,\n /// Payment Link Status\n PaymentLinkStatus,\n /// Create a profile\n ProfileCreate,\n /// Update a profile\n ProfileUpdate,\n /// Retrieve a profile\n ProfileRetrieve,\n /// Delete a profile\n ProfileDelete,\n /// List all the profiles for a merchant\n ProfileList,\n /// Different verification flows\n Verification,\n /// Rust locker migration\n RustLockerMigration,\n /// Gsm Rule Creation flow\n GsmRuleCreate,\n /// Gsm Rule Retrieve flow\n GsmRuleRetrieve,\n /// Gsm Rule Update flow\n GsmRuleUpdate,\n /// Apple pay certificates migration\n ApplePayCertificatesMigration,\n /// Gsm Rule Delete flow\n GsmRuleDelete,\n /// User Sign Up\n UserSignUp,\n /// User Sign Up\n UserSignUpWithMerchantId,\n /// User Sign In\n UserSignIn,\n /// User transfer key\n UserTransferKey,\n /// User connect account\n UserConnectAccount,\n /// Upsert Decision Manager Config\n DecisionManagerUpsertConfig,\n /// Delete Decision Manager Config\n DecisionManagerDeleteConfig,\n /// Retrieve Decision Manager Config\n DecisionManagerRetrieveConfig,\n /// Manual payment fulfillment acknowledgement\n FrmFulfillment,\n /// Change password flow\n ChangePassword,\n /// Signout flow\n Signout,\n /// Set Dashboard Metadata flow\n SetDashboardMetadata,\n /// Get Multiple Dashboard Metadata flow\n GetMultipleDashboardMetadata,\n /// Payment Connector Verify\n VerifyPaymentConnector,\n /// Internal user signup\n InternalUserSignup,\n /// Create tenant level user\n TenantUserCreate,\n /// Switch org\n SwitchOrg,\n /// Switch merchant v2\n SwitchMerchantV2,\n /// Switch profile\n SwitchProfile,\n /// Get permission info\n GetAuthorizationInfo,\n /// Get Roles info\n GetRolesInfo,\n /// Get Parent Group Info\n GetParentGroupInfo,\n /// List roles v2\n ListRolesV2,\n /// List invitable roles at entity level\n ListInvitableRolesAtEntityLevel,\n /// List updatable roles at entity level\n ListUpdatableRolesAtEntityLevel,\n /// Get role\n GetRole,\n /// Get parent info for role\n GetRoleV2,\n /// Get role from token\n GetRoleFromToken,\n /// Get resources and groups for role from token\n GetRoleFromTokenV2,\n /// Update user role\n UpdateUserRole,\n /// Create merchant account for user in a org\n UserMerchantAccountCreate,\n /// Create Org in a given tenancy\n UserOrgCreate,\n /// Generate Sample Data\n GenerateSampleData,\n /// Delete Sample Data\n DeleteSampleData,\n /// Get details of a user\n GetUserDetails,\n /// Get details of a user role in a merchant account\n GetUserRoleDetails,\n /// PaymentMethodAuth Link token create\n PmAuthLinkTokenCreate,\n /// PaymentMethodAuth Exchange token create\n PmAuthExchangeToken,\n /// Get reset password link\n ForgotPassword,\n /// Reset password using link\n ResetPassword,\n /// Force set or force change password\n RotatePassword,\n /// Invite multiple users\n InviteMultipleUser,\n /// Reinvite user\n ReInviteUser,\n /// Accept invite from email\n AcceptInviteFromEmail,\n /// Delete user role\n DeleteUserRole,\n /// Incremental Authorization flow\n PaymentsIncrementalAuthorization,\n /// Get action URL for connector onboarding\n GetActionUrl,\n /// Sync connector onboarding status\n SyncOnboardingStatus,\n /// Reset tracking id\n ResetTrackingId,\n /// Verify email Token\n VerifyEmail,\n /// Send verify email\n VerifyEmailRequest,\n /// Update user account details\n UpdateUserAccountDetails,\n /// Accept user invitation using entities\n AcceptInvitationsV2,\n /// Accept user invitation using entities before user login\n AcceptInvitationsPreAuth,\n /// Initiate external authentication for a payment\n PaymentsExternalAuthentication,\n /// Authorize the payment after external 3ds authentication\n PaymentsAuthorize,\n /// Create Role\n CreateRole,\n /// Update Role\n UpdateRole,\n /// User email flow start\n UserFromEmail,\n /// Begin TOTP\n TotpBegin,\n /// Reset TOTP\n TotpReset,\n /// Verify TOTP\n TotpVerify,\n /// Update TOTP secret\n TotpUpdate,\n /// Verify Access Code\n RecoveryCodeVerify,\n /// Generate or Regenerate recovery codes\n RecoveryCodesGenerate,\n /// Terminate two factor authentication\n TerminateTwoFactorAuth,\n /// Check 2FA status\n TwoFactorAuthStatus,\n /// Create user authentication method\n CreateUserAuthenticationMethod,\n /// Update user authentication method\n UpdateUserAuthenticationMethod,\n /// List user authentication methods\n ListUserAuthenticationMethods,\n /// Get sso auth url\n GetSsoAuthUrl,\n /// Signin with SSO\n SignInWithSso,\n /// Auth Select\n AuthSelect,\n /// List Orgs for user\n ListOrgForUser,\n /// List Merchants for user in org\n ListMerchantsForUserInOrg,\n /// List Profile for user in org and merchant\n ListProfileForUserInOrgAndMerchant,\n /// List Users in Org\n ListUsersInLineage,\n /// List invitations for user\n ListInvitationsForUser,\n /// List initial webhook delivery attempts\n WebhookEventInitialDeliveryAttemptList,\n /// List delivery attempts for a webhook event\n WebhookEventDeliveryAttemptList,\n /// Manually retry the delivery for a webhook event\n WebhookEventDeliveryRetry,\n /// Retrieve status of the Poll\n RetrievePollStatus,\n /// Toggles the extended card info feature in profile level\n ToggleExtendedCardInfo,\n /// Toggles the extended card info feature in profile level\n ToggleConnectorAgnosticMit,\n /// Get the extended card info associated to a payment_id\n GetExtendedCardInfo,\n /// Manually update the refund details like status, error code, error message etc.\n RefundsManualUpdate,\n /// Manually update the payment details like status, error code, error message etc.\n PaymentsManualUpdate,\n /// Dynamic Tax Calcultion\n SessionUpdateTaxCalculation,\n /// Payments confirm intent\n PaymentsConfirmIntent,\n /// Payments post session tokens flow\n PaymentsPostSessionTokens,\n /// Payments start redirection flow\n PaymentStartRedirection,\n}", + "diff_span": { + "before": "", + "after": " /// Internal user signup\n InternalUserSignup,\n /// Create tenant level user\n TenantUserCreate,\n /// Switch org\n SwitchOrg,\n /// Switch merchant v2\n SwitchMerchantV2,\n /// Switch profile\n SwitchProfile,\n /// Get permission info\n GetAuthorizationInfo,\n /// Get Roles info\n GetRolesInfo,\n /// Get Parent Group Info\n GetParentGroupInfo,\n /// List roles v2\n ListRolesV2,\n /// List invitable roles at entity level\n ListInvitableRolesAtEntityLevel,\n /// List updatable roles at entity level\n ListUpdatableRolesAtEntityLevel,\n /// Get role\n GetRole,\n /// Get parent info for role\n GetRoleV2,\n /// Get role from token\n GetRoleFromToken,\n /// Get resources and groups for role from token\n GetRoleFromTokenV2,\n /// Update user role\n UpdateUserRole,\n /// Create merchant account for user in a org\n UserMerchantAccountCreate,\n /// Create Org in a given tenancy\n UserOrgCreate,\n /// Generate Sample Data\n GenerateSampleData," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::impl::NewUserOrganization", + "file": "crates/router/src/types/domain/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl From for NewUserOrganization {\n fn from(_value: InviteeUserRequestWithInvitedUserToken) -> Self {\n let new_organization = api_org::OrganizationNew::new(None);\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)\n }\n}", + "after_code": "impl From<(user_api::CreateTenantRequest, MerchantAccount)> for NewUserOrganization {\n fn from((_value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount)) -> Self {\n let new_organization = api_org::OrganizationNew {\n org_id: merchant_account.get_org_id().clone(),\n org_name: None,\n };\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)\n }\n}", + "diff_span": { + "before": "impl From for NewUserOrganization {\n fn from(_value: InviteeUserRequestWithInvitedUserToken) -> Self {\n let new_organization = api_org::OrganizationNew::new(None);\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)", + "after": "impl From<(user_api::CreateTenantRequest, MerchantAccount)> for NewUserOrganization {\n fn from((_value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount)) -> Self {\n let new_organization = api_org::OrganizationNew {\n org_id: merchant_account.get_org_id().clone(),\n org_name: None,\n };\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use hyperswitch_domain_models::merchant_account::MerchantAccount;" + ] + }, + { + "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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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_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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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 EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.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": "", + "after": " org_id: user_role.org_id.clone()?,\n }),\n EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.org_id.clone(),\n }),\n })\n })" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/transformers.rs::impl::diesel_models::organization::OrganizationNew", + "file": "crates/router/src/types/transformers.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details,\n metadata,\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }\n}", + "after_code": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }\n}", + "diff_span": { + "before": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details,", + "after": "impl ForeignFrom\n for diesel_models::organization::OrganizationNew\n{\n fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/core/user.rs::function::handle_existing_user_invitation", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn handle_existing_user_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n invitee_user_from_db: domain::UserFromStorage,\n role_info: roles::RoleInfo,\n auth_id: &Option,\n) -> UserResult {\n let now = common_utils::date_time::now();\n\n if state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n invitee_user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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 .is_err_and(|err| err.current_context().is_db_not_found())\n .not()\n {\n return Err(UserErrors::UserExists.into());\n }\n\n if state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n invitee_user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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 .is_err_and(|err| err.current_context().is_db_not_found())\n .not()\n {\n return Err(UserErrors::UserExists.into());\n }\n\n let (org_id, merchant_id, profile_id) = match role_info.get_entity_type() {\n EntityType::Organization => (Some(&user_from_token.org_id), None, None),\n EntityType::Merchant => (\n Some(&user_from_token.org_id),\n Some(&user_from_token.merchant_id),\n None,\n ),\n EntityType::Profile => (\n Some(&user_from_token.org_id),\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n ),\n };\n\n if state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: invitee_user_from_db.get_user_id(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id,\n merchant_id,\n profile_id,\n entity_id: None,\n version: None,\n status: None,\n limit: Some(1),\n })\n .await\n .is_ok_and(|data| data.is_empty().not())\n {\n return Err(UserErrors::UserExists.into());\n }\n\n let user_role = domain::NewUserRole {\n user_id: invitee_user_from_db.get_user_id().to_owned(),\n role_id: request.role_id.clone(),\n status: {\n if cfg!(feature = \"email\") {\n UserStatus::InvitationSent\n } else {\n UserStatus::Active\n }\n },\n created_by: user_from_token.user_id.clone(),\n last_modified_by: user_from_token.user_id.clone(),\n created_at: now,\n last_modified: now,\n entity: domain::NoLevel,\n };\n\n let _user_role = match role_info.get_entity_type() {\n EntityType::Organization => {\n user_role\n .add_entity(domain::OrganizationLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Merchant => {\n user_role\n .add_entity(domain::MerchantLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Profile => {\n user_role\n .add_entity(domain::ProfileLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n };\n\n let is_email_sent;\n #[cfg(feature = \"email\")]\n {\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let entity = match role_info.get_entity_type() {\n EntityType::Organization => email_types::Entity {\n entity_id: user_from_token.org_id.get_string_repr().to_owned(),\n entity_type: EntityType::Organization,\n },\n EntityType::Merchant => email_types::Entity {\n entity_id: user_from_token.merchant_id.get_string_repr().to_owned(),\n entity_type: EntityType::Merchant,\n },\n EntityType::Profile => email_types::Entity {\n entity_id: user_from_token.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n },\n };\n\n let email_contents = email_types::InviteUser {\n recipient_email: invitee_email,\n user_name: domain::UserName::new(invitee_user_from_db.get_name())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_INVITATION,\n entity,\n auth_id: auth_id.clone(),\n };\n\n is_email_sent = state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .map(|email_result| logger::info!(?email_result))\n .map_err(|email_result| logger::error!(?email_result))\n .is_ok();\n }\n #[cfg(not(feature = \"email\"))]\n {\n is_email_sent = false;\n }\n\n Ok(InviteMultipleUserResponse {\n email: request.email.clone(),\n is_email_sent,\n password: None,\n error: None,\n })\n}", + "after_code": "async fn handle_existing_user_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n invitee_user_from_db: domain::UserFromStorage,\n role_info: roles::RoleInfo,\n auth_id: &Option,\n) -> UserResult {\n let now = common_utils::date_time::now();\n\n if state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n invitee_user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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 .is_err_and(|err| err.current_context().is_db_not_found())\n .not()\n {\n return Err(UserErrors::UserExists.into());\n }\n\n if state\n .global_store\n .find_user_role_by_user_id_and_lineage(\n invitee_user_from_db.get_user_id(),\n user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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 .is_err_and(|err| err.current_context().is_db_not_found())\n .not()\n {\n return Err(UserErrors::UserExists.into());\n }\n\n let (org_id, merchant_id, profile_id) = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => (Some(&user_from_token.org_id), None, None),\n EntityType::Merchant => (\n Some(&user_from_token.org_id),\n Some(&user_from_token.merchant_id),\n None,\n ),\n EntityType::Profile => (\n Some(&user_from_token.org_id),\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n ),\n };\n\n if state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: invitee_user_from_db.get_user_id(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id,\n merchant_id,\n profile_id,\n entity_id: None,\n version: None,\n status: None,\n limit: Some(1),\n })\n .await\n .is_ok_and(|data| data.is_empty().not())\n {\n return Err(UserErrors::UserExists.into());\n }\n\n let user_role = domain::NewUserRole {\n user_id: invitee_user_from_db.get_user_id().to_owned(),\n role_id: request.role_id.clone(),\n status: {\n if cfg!(feature = \"email\") {\n UserStatus::InvitationSent\n } else {\n UserStatus::Active\n }\n },\n created_by: user_from_token.user_id.clone(),\n last_modified_by: user_from_token.user_id.clone(),\n created_at: now,\n last_modified: now,\n entity: domain::NoLevel,\n };\n\n let _user_role = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => {\n user_role\n .add_entity(domain::OrganizationLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Merchant => {\n user_role\n .add_entity(domain::MerchantLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Profile => {\n user_role\n .add_entity(domain::ProfileLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n };\n\n let is_email_sent;\n #[cfg(feature = \"email\")]\n {\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let entity = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => email_types::Entity {\n entity_id: user_from_token.org_id.get_string_repr().to_owned(),\n entity_type: EntityType::Organization,\n },\n EntityType::Merchant => email_types::Entity {\n entity_id: user_from_token.merchant_id.get_string_repr().to_owned(),\n entity_type: EntityType::Merchant,\n },\n EntityType::Profile => email_types::Entity {\n entity_id: user_from_token.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n },\n };\n\n let email_contents = email_types::InviteUser {\n recipient_email: invitee_email,\n user_name: domain::UserName::new(invitee_user_from_db.get_name())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_INVITATION,\n entity,\n auth_id: auth_id.clone(),\n };\n\n is_email_sent = state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await\n .map(|email_result| logger::info!(?email_result))\n .map_err(|email_result| logger::error!(?email_result))\n .is_ok();\n }\n #[cfg(not(feature = \"email\"))]\n {\n is_email_sent = false;\n }\n\n Ok(InviteMultipleUserResponse {\n email: request.email.clone(),\n is_email_sent,\n password: None,\n error: None,\n })\n}", + "diff_span": { + "before": "", + "after": "\n let (org_id, merchant_id, profile_id) = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => (Some(&user_from_token.org_id), None, None),\n EntityType::Merchant => (\n Some(&user_from_token.org_id),\n Some(&user_from_token.merchant_id),\n None,\n ),\n EntityType::Profile => (\n Some(&user_from_token.org_id),\n Some(&user_from_token.merchant_id),\n Some(&user_from_token.profile_id),\n ),\n };\n\n if state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: invitee_user_from_db.get_user_id(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id,\n merchant_id,\n profile_id,\n entity_id: None,\n version: None,\n status: None,\n limit: Some(1),\n })\n .await\n .is_ok_and(|data| data.is_empty().not())\n {\n return Err(UserErrors::UserExists.into());\n }\n\n let user_role = domain::NewUserRole {\n user_id: invitee_user_from_db.get_user_id().to_owned(),\n role_id: request.role_id.clone(),\n status: {\n if cfg!(feature = \"email\") {\n UserStatus::InvitationSent\n } else {\n UserStatus::Active\n }\n },\n created_by: user_from_token.user_id.clone(),\n last_modified_by: user_from_token.user_id.clone(),\n created_at: now,\n last_modified: now,\n entity: domain::NoLevel,\n };\n\n let _user_role = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => {\n user_role\n .add_entity(domain::OrganizationLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Merchant => {\n user_role\n .add_entity(domain::MerchantLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Profile => {\n user_role\n .add_entity(domain::ProfileLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n };\n\n let is_email_sent;\n #[cfg(feature = \"email\")]\n {\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let entity = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => email_types::Entity {\n entity_id: user_from_token.org_id.get_string_repr().to_owned()," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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_in_org_scope(\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_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::Tenant | EntityType::Organization => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,\n ListUserRolesByOrgIdPayload {\n user_id: None,\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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_in_org_scope(\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.entity_type,\n )? {\n EntityType::Organization => {\n utils::user_role::fetch_user_roles_by_payload(\n &state,", + "after": " request.entity_type,\n )? {\n EntityType::Tenant | EntityType::Organization => {\n utils::user_role::fetch_user_roles_by_payload(\n &state," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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_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::Tenant | 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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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}", + "diff_span": { + "before": "\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", + "after": "\n let (profile_id, role_id) = match role_info.get_entity_type() {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => {\n let merchant_key_store = state\n .store" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/db/merchant_account.rs::impl::MockDb", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "impl MerchantAccountInterface for MockDb {\n #[allow(clippy::panic)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n let account = Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?;\n accounts.push(account.clone());\n\n account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[allow(clippy::panic)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let accounts = self.merchant_accounts.lock().await;\n accounts\n .iter()\n .find(|account| account.get_id() == merchant_id)\n .cloned()\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n )))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let merchant_id = merchant_account.get_id().to_owned();\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_account.get_id())\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(\n Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?,\n );\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_id)\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(account.clone());\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let accounts = self.merchant_accounts.lock().await;\n let account = accounts\n .iter()\n .find(|account| {\n account\n .publishable_key\n .as_ref()\n .is_some_and(|key| key == publishable_key)\n })\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Publishable Key: {} not found\",\n publishable_key\n )))?;\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let merchant_account = account\n .clone()\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((merchant_account, key_store))\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account_update: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n Ok(accounts.iter_mut().fold(0, |acc, account| {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update.clone())\n .apply_changeset(account.clone());\n *account = update;\n acc + 1\n }))\n }\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts.retain(|x| x.get_id() != merchant_id);\n Ok(true)\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| account.organization_id == *organization_id)\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| merchant_ids.contains(account.get_id()))\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n}", + "after_code": "impl MerchantAccountInterface for MockDb {\n #[allow(clippy::panic)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n let account = Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?;\n accounts.push(account.clone());\n\n account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[allow(clippy::panic)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let accounts = self.merchant_accounts.lock().await;\n accounts\n .iter()\n .find(|account| account.get_id() == merchant_id)\n .cloned()\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n )))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let merchant_id = merchant_account.get_id().to_owned();\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_account.get_id())\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(\n Conversion::convert(merchant_account)\n .await\n .change_context(errors::StorageError::EncryptionError)?,\n );\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account_update: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts\n .iter_mut()\n .find(|account| account.get_id() == merchant_id)\n .async_map(|account| async {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update)\n .apply_changeset(account.clone());\n *account = update.clone();\n update\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n })\n .await\n .transpose()?\n .ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"Merchant ID: {:?} not found\",\n merchant_id\n ))\n .into(),\n )\n }\n\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let accounts = self.merchant_accounts.lock().await;\n let account = accounts\n .iter()\n .find(|account| {\n account\n .publishable_key\n .as_ref()\n .is_some_and(|key| key == publishable_key)\n })\n .ok_or(errors::StorageError::ValueNotFound(format!(\n \"Publishable Key: {} not found\",\n publishable_key\n )))?;\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let merchant_account = account\n .clone()\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((merchant_account, key_store))\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account_update: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n Ok(accounts.iter_mut().fold(0, |acc, account| {\n let update = MerchantAccountUpdateInternal::from(merchant_account_update.clone())\n .apply_changeset(account.clone());\n *account = update;\n acc + 1\n }))\n }\n\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let mut accounts = self.merchant_accounts.lock().await;\n accounts.retain(|x| x.get_id() != merchant_id);\n Ok(true)\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| account.organization_id == *organization_id)\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let futures = accounts\n .iter()\n .filter(|account| merchant_ids.contains(account.get_id()))\n .map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .clone()\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n futures::future::join_all(futures)\n .await\n .into_iter()\n .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.unwrap_or(0).try_into().unwrap_or(0);\n let limit = limit.map_or(accounts.len(), |l| l.try_into().unwrap_or(accounts.len()));\n\n let filtered_accounts = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .cloned()\n .collect::>();\n\n let futures = filtered_accounts.into_iter().map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n\n futures::future::try_join_all(futures).await\n }\n}", + "diff_span": { + "before": "", + "after": " .collect()\n }\n\n #[cfg(feature = \"olap\")]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.unwrap_or(0).try_into().unwrap_or(0);\n let limit = limit.map_or(accounts.len(), |l| l.try_into().unwrap_or(accounts.len()));\n\n let filtered_accounts = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .cloned()\n .collect::>();\n\n let futures = filtered_accounts.into_iter().map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n\n futures::future::try_join_all(futures).await\n }\n}" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use storage_impl::redis::cache::{self, CacheKind, ACCOUNTS_CACHE};", + "use diesel_models::MerchantAccountUpdateInternal;", + "use super::{MasterKeyInterface, MockDb, Store};", + "use crate::{\n connection,\n core::errors::{self, CustomResult},\n db::merchant_key_store::MerchantKeyStoreInterface,\n types::{\n domain::{\n self,\n behaviour::{Conversion, ReverseConversion},\n },\n storage,\n },\n};" + ], + "after_imports": [ + "use crate::{\n connection,\n core::errors::{self, CustomResult},\n db::merchant_key_store::MerchantKeyStoreInterface,\n types::{\n domain::{\n self,\n behaviour::{Conversion, ReverseConversion},\n },\n storage,\n },\n};", + "use diesel_models::MerchantAccountUpdateInternal;", + "use super::{MasterKeyInterface, MockDb, Store};", + "use futures::future::try_join_all;", + "use storage_impl::redis::cache::{self, CacheKind, ACCOUNTS_CACHE};" + ] + }, + { + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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_in_org_scope(\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_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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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::Tenant | 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_in_org_scope(\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::Tenant | 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": " 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_in_org_scope(\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", + "after": " merchant_profile.push((merchant_id, profile_id))\n }\n EntityType::Tenant | 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_in_org_scope(\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::Tenant | EntityType::Organization => (None, None),\n EntityType::Merchant => {\n let merchant_id = &user_role" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::impl::NewUserRole", + "file": "crates/router/src/types/domain/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl NewUserRole\nwhere\n E: Clone + Into,\n{\n fn convert_to_new_v2_role(self, entity: EntityInfo) -> UserRoleNew {\n UserRoleNew {\n user_id: self.user_id,\n role_id: self.role_id,\n status: self.status,\n created_by: self.created_by,\n last_modified_by: self.last_modified_by,\n created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: Some(entity.org_id),\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id,\n entity_id: Some(entity.entity_id),\n entity_type: Some(entity.entity_type),\n version: UserRoleVersion::V2,\n tenant_id: entity.tenant_id,\n }\n }\n\n pub async fn insert_in_v2(self, state: &SessionState) -> UserResult {\n let entity = self.entity.clone();\n\n let new_v2_role = self.convert_to_new_v2_role(entity.into());\n\n state\n .global_store\n .insert_user_role(new_v2_role)\n .await\n .change_context(UserErrors::InternalServerError)\n }\n}", + "after_code": "impl NewUserRole\nwhere\n E: Clone + Into,\n{\n fn convert_to_new_v2_role(self, entity: EntityInfo) -> UserRoleNew {\n UserRoleNew {\n user_id: self.user_id,\n role_id: self.role_id,\n status: self.status,\n created_by: self.created_by,\n last_modified_by: self.last_modified_by,\n created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: entity.org_id,\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id,\n entity_id: Some(entity.entity_id),\n entity_type: Some(entity.entity_type),\n version: UserRoleVersion::V2,\n tenant_id: entity.tenant_id,\n }\n }\n\n pub async fn insert_in_v2(self, state: &SessionState) -> UserResult {\n let entity = self.entity.clone();\n\n let new_v2_role = self.convert_to_new_v2_role(entity.into());\n\n state\n .global_store\n .insert_user_role(new_v2_role)\n .await\n .change_context(UserErrors::InternalServerError)\n }\n}", + "diff_span": { + "before": " created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: Some(entity.org_id),\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id,", + "after": " created_at: self.created_at,\n last_modified: self.last_modified,\n org_id: entity.org_id,\n merchant_id: entity.merchant_id,\n profile_id: entity.profile_id," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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": true, + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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_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 (merchant_id, profile_id) = match role_info.get_entity_type() {\n EntityType::Tenant => {\n let merchant_id = state\n .store\n .list_merchant_accounts_by_organization_id(&(&state).into(), &request.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchant list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org id\")?\n .get_id()\n .clone();\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &(&state).into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(&(&state).into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned();\n\n (merchant_id, profile_id)\n }\n EntityType::Organization | 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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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 (merchant_id, profile_id)\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 request.org_id.clone(),\n user_from_token.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_from_token.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}", + "diff_span": { + "before": " }\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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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,", + "after": " }\n\n let (merchant_id, profile_id) = match role_info.get_entity_type() {\n EntityType::Tenant => {\n let merchant_id = state\n .store\n .list_merchant_accounts_by_organization_id(&(&state).into(), &request.org_id)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchant list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for org id\")?\n .get_id()\n .clone();\n\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &(&state).into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let profile_id = state\n .store\n .list_profile_by_merchant_id(&(&state).into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned();\n\n (merchant_id, profile_id)\n }\n EntityType::Organization | 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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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 (merchant_id, profile_id)\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 request.org_id.clone(),\n user_from_token.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_from_token.role_id,\n &merchant_id,\n &request.org_id," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use super::errors::{StorageErrorExt, UserErrors, UserResponse, UserResult};", + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::OrganizationBridge,\n user as storage_user,\n user_authentication_method::{UserAuthenticationMethodNew, UserAuthenticationMethodUpdate},\n};", + "use api_models::{\n payments::RedirectionResponse,\n user::{self as user_api, InviteMultipleUserResponse, NameIdUnit},\n};" + ], + "after_imports": [ + "use common_enums::EntityType;", + "use super::errors::{StorageErrorExt, UserErrors, UserResponse, UserResult};", + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::OrganizationBridge,\n user as storage_user,\n user_authentication_method::{UserAuthenticationMethodNew, UserAuthenticationMethodUpdate},\n};", + "use api_models::{\n payments::RedirectionResponse,\n user::{self as user_api, InviteMultipleUserResponse, NameIdUnit},\n};" + ] + }, + { + "id": "crates/router/src/core/user_role/role.rs::function::list_roles_at_entity_level", + "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 list_roles_at_entity_level(\n state: SessionState,\n user_from_token: UserFromToken,\n req: role_api::ListRolesAtEntityLevelRequest,\n check_type: role_api::RoleCheckType,\n) -> UserResponse> {\n let user_entity_type = user_from_token\n .get_role_info_from_db(&state)\n .await\n .attach_printable(\"Invalid role_id in JWT\")?\n .get_entity_type();\n\n if req.entity_type > user_entity_type {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User is attempting to request list roles above the current entity level\".to_string(),\n )\n .into());\n }\n let mut role_info_vec = PREDEFINED_ROLES\n .iter()\n .map(|(_, role_info)| role_info.clone())\n .collect::>();\n\n let custom_roles = match req.entity_type {\n EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n None,\n Some(req.entity_type),\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n\n EntityType::Merchant => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(req.entity_type),\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n // TODO: Populate this from Db function when support for profile id and profile level custom roles is added\n EntityType::Profile => Vec::new(),\n };\n\n role_info_vec.extend(custom_roles.into_iter().map(roles::RoleInfo::from));\n\n let list_minimal_role_info = role_info_vec\n .into_iter()\n .filter_map(|role_info| {\n let check_type = match check_type {\n role_api::RoleCheckType::Invite => role_info.is_invitable(),\n role_api::RoleCheckType::Update => role_info.is_updatable(),\n };\n if check_type && role_info.get_entity_type() == req.entity_type {\n Some(role_api::MinimalRoleInfo {\n role_id: role_info.get_role_id().to_string(),\n role_name: role_info.get_role_name().to_string(),\n })\n } else {\n None\n }\n })\n .collect::>();\n\n Ok(ApplicationResponse::Json(list_minimal_role_info))\n}", + "after_code": "pub async fn list_roles_at_entity_level(\n state: SessionState,\n user_from_token: UserFromToken,\n req: role_api::ListRolesAtEntityLevelRequest,\n check_type: role_api::RoleCheckType,\n) -> UserResponse> {\n let user_entity_type = user_from_token\n .get_role_info_from_db(&state)\n .await\n .attach_printable(\"Invalid role_id in JWT\")?\n .get_entity_type();\n\n if req.entity_type > user_entity_type {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"User is attempting to request list roles above the current entity level\".to_string(),\n )\n .into());\n }\n let mut role_info_vec = PREDEFINED_ROLES\n .iter()\n .map(|(_, role_info)| role_info.clone())\n .collect::>();\n\n let custom_roles = match req.entity_type {\n EntityType::Tenant | EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n None,\n Some(req.entity_type),\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n\n EntityType::Merchant => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n Some(req.entity_type),\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n // TODO: Populate this from Db function when support for profile id and profile level custom roles is added\n EntityType::Profile => Vec::new(),\n };\n\n role_info_vec.extend(custom_roles.into_iter().map(roles::RoleInfo::from));\n\n let list_minimal_role_info = role_info_vec\n .into_iter()\n .filter_map(|role_info| {\n let check_type = match check_type {\n role_api::RoleCheckType::Invite => role_info.is_invitable(),\n role_api::RoleCheckType::Update => role_info.is_updatable(),\n };\n if check_type && role_info.get_entity_type() == req.entity_type {\n Some(role_api::MinimalRoleInfo {\n role_id: role_info.get_role_id().to_string(),\n role_name: role_info.get_role_name().to_string(),\n })\n } else {\n None\n }\n })\n .collect::>();\n\n Ok(ApplicationResponse::Json(list_minimal_role_info))\n}", + "diff_span": { + "before": "\n let custom_roles = match req.entity_type {\n EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(", + "after": "\n let custom_roles = match req.entity_type {\n EntityType::Tenant | EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/diesel_models/src/query/merchant_account.rs::impl::MerchantAccount", + "file": "crates/diesel_models/src/query/merchant_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl MerchantAccount {\n pub async fn update(\n self,\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n match generics::generic_update_by_id::<::Table, _, _, _>(\n conn,\n self.get_id().to_owned(),\n merchant_account,\n )\n .await\n {\n Err(error) => match error.current_context() {\n errors::DatabaseError::NoFieldsToUpdate => Ok(self),\n _ => Err(error),\n },\n result => result,\n }\n }\n\n pub async fn update_with_specific_fields(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n generics::generic_update_with_unique_predicate_get_result::<\n ::Table,\n _,\n _,\n _,\n >(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n merchant_account,\n )\n .await\n }\n\n pub async fn delete_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_delete::<::Table, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_publishable_key(\n conn: &PgPooledConn,\n publishable_key: &str,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::publishable_key.eq(publishable_key.to_owned()),\n )\n .await\n }\n\n pub async fn list_by_organization_id(\n conn: &PgPooledConn,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl::organization_id.eq(organization_id.to_owned()),\n None,\n None,\n None,\n )\n .await\n }\n\n pub async fn list_multiple_merchant_accounts(\n conn: &PgPooledConn,\n merchant_ids: Vec,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(conn, dsl_identifier.eq_any(merchant_ids), None, None, None)\n .await\n }\n\n pub async fn update_all_merchant_accounts(\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult> {\n generics::generic_update_with_results::<::Table, _, _, _>(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n merchant_account,\n )\n .await\n }\n}", + "after_code": "impl MerchantAccount {\n pub async fn update(\n self,\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n match generics::generic_update_by_id::<::Table, _, _, _>(\n conn,\n self.get_id().to_owned(),\n merchant_account,\n )\n .await\n {\n Err(error) => match error.current_context() {\n errors::DatabaseError::NoFieldsToUpdate => Ok(self),\n _ => Err(error),\n },\n result => result,\n }\n }\n\n pub async fn update_with_specific_fields(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult {\n generics::generic_update_with_unique_predicate_get_result::<\n ::Table,\n _,\n _,\n _,\n >(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n merchant_account,\n )\n .await\n }\n\n pub async fn delete_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_delete::<::Table, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_merchant_id(\n conn: &PgPooledConn,\n identifier: &common_utils::id_type::MerchantId,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl_identifier.eq(identifier.to_owned()),\n )\n .await\n }\n\n pub async fn find_by_publishable_key(\n conn: &PgPooledConn,\n publishable_key: &str,\n ) -> StorageResult {\n generics::generic_find_one::<::Table, _, _>(\n conn,\n dsl::publishable_key.eq(publishable_key.to_owned()),\n )\n .await\n }\n\n pub async fn list_by_organization_id(\n conn: &PgPooledConn,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl::organization_id.eq(organization_id.to_owned()),\n None,\n None,\n None,\n )\n .await\n }\n\n pub async fn list_multiple_merchant_accounts(\n conn: &PgPooledConn,\n merchant_ids: Vec,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(conn, dsl_identifier.eq_any(merchant_ids), None, None, None)\n .await\n }\n\n pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )\n .await\n }\n\n pub async fn update_all_merchant_accounts(\n conn: &PgPooledConn,\n merchant_account: MerchantAccountUpdateInternal,\n ) -> StorageResult> {\n generics::generic_update_with_results::<::Table, _, _, _>(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n merchant_account,\n )\n .await\n }\n}", + "diff_span": { + "before": "", + "after": " }\n\n pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )\n .await\n }\n\n pub async fn update_all_merchant_accounts(\n conn: &PgPooledConn," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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": true, + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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_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 = if matches!(role_info.get_entity_type(), EntityType::Tenant) {\n let key_manager_state = &(&state).into();\n state\n .store\n .list_all_merchant_accounts(key_manager_state, None, None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|merchant_account| Some(merchant_account.get_org_id().to_owned()))\n .collect::>()\n } else {\n state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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\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": " }\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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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(", + "after": " }\n\n let orgs = if matches!(role_info.get_entity_type(), EntityType::Tenant) {\n let key_manager_state = &(&state).into();\n state\n .store\n .list_all_merchant_accounts(key_manager_state, None, None)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .filter_map(|merchant_account| Some(merchant_account.get_org_id().to_owned()))\n .collect::>()\n } else {\n state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: user_from_token.user_id.as_str(),\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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\n let resp = futures::future::try_join_all(" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use super::errors::{StorageErrorExt, UserErrors, UserResponse, UserResult};", + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::OrganizationBridge,\n user as storage_user,\n user_authentication_method::{UserAuthenticationMethodNew, UserAuthenticationMethodUpdate},\n};", + "use api_models::{\n payments::RedirectionResponse,\n user::{self as user_api, InviteMultipleUserResponse, NameIdUnit},\n};" + ], + "after_imports": [ + "use common_enums::EntityType;", + "use super::errors::{StorageErrorExt, UserErrors, UserResponse, UserResult};", + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::OrganizationBridge,\n user as storage_user,\n user_authentication_method::{UserAuthenticationMethodNew, UserAuthenticationMethodUpdate},\n};", + "use api_models::{\n payments::RedirectionResponse,\n user::{self as user_api, InviteMultipleUserResponse, NameIdUnit},\n};" + ] + }, + { + "id": "crates/router/src/core/user.rs::function::handle_new_user_invitation", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "async fn handle_new_user_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n role_info: roles::RoleInfo,\n req_state: ReqState,\n auth_id: &Option,\n) -> UserResult {\n let new_user = domain::NewUser::try_from((request.clone(), user_from_token.clone()))?;\n\n new_user\n .insert_user_in_db(state.global_store.as_ref())\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let invitation_status = if cfg!(feature = \"email\") {\n UserStatus::InvitationSent\n } else {\n UserStatus::Active\n };\n\n let now = common_utils::date_time::now();\n\n let user_role = domain::NewUserRole {\n user_id: new_user.get_user_id().to_owned(),\n role_id: request.role_id.clone(),\n status: invitation_status,\n created_by: user_from_token.user_id.clone(),\n last_modified_by: user_from_token.user_id.clone(),\n created_at: now,\n last_modified: now,\n entity: domain::NoLevel,\n };\n\n let _user_role = match role_info.get_entity_type() {\n EntityType::Organization => {\n user_role\n .add_entity(domain::OrganizationLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Merchant => {\n user_role\n .add_entity(domain::MerchantLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Profile => {\n user_role\n .add_entity(domain::ProfileLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n };\n\n let is_email_sent;\n\n #[cfg(feature = \"email\")]\n {\n // TODO: Adding this to avoid clippy lints\n // Will be adding actual usage for this variable later\n let _ = req_state.clone();\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let entity = match role_info.get_entity_type() {\n EntityType::Organization => email_types::Entity {\n entity_id: user_from_token.org_id.get_string_repr().to_owned(),\n entity_type: EntityType::Organization,\n },\n EntityType::Merchant => email_types::Entity {\n entity_id: user_from_token.merchant_id.get_string_repr().to_owned(),\n entity_type: EntityType::Merchant,\n },\n EntityType::Profile => email_types::Entity {\n entity_id: user_from_token.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n },\n };\n\n let email_contents = email_types::InviteUser {\n recipient_email: invitee_email,\n user_name: domain::UserName::new(new_user.get_name())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_INVITATION,\n entity,\n auth_id: auth_id.clone(),\n };\n let send_email_result = state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n logger::info!(?send_email_result);\n is_email_sent = send_email_result.is_ok();\n }\n #[cfg(not(feature = \"email\"))]\n {\n is_email_sent = false;\n\n let invited_user_token = auth::UserFromToken {\n user_id: new_user.get_user_id(),\n merchant_id: user_from_token.merchant_id.clone(),\n org_id: user_from_token.org_id.clone(),\n role_id: request.role_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n tenant_id: user_from_token.tenant_id.clone(),\n };\n\n let set_metadata_request = SetMetaDataRequest::IsChangePasswordRequired;\n dashboard_metadata::set_metadata(\n state.clone(),\n invited_user_token,\n set_metadata_request,\n req_state,\n )\n .await?;\n }\n\n Ok(InviteMultipleUserResponse {\n is_email_sent,\n password: new_user\n .get_password()\n .map(|password| password.get_secret()),\n email: request.email.clone(),\n error: None,\n })\n}", + "after_code": "async fn handle_new_user_invitation(\n state: &SessionState,\n user_from_token: &auth::UserFromToken,\n request: &user_api::InviteUserRequest,\n role_info: roles::RoleInfo,\n req_state: ReqState,\n auth_id: &Option,\n) -> UserResult {\n let new_user = domain::NewUser::try_from((request.clone(), user_from_token.clone()))?;\n\n new_user\n .insert_user_in_db(state.global_store.as_ref())\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let invitation_status = if cfg!(feature = \"email\") {\n UserStatus::InvitationSent\n } else {\n UserStatus::Active\n };\n\n let now = common_utils::date_time::now();\n\n let user_role = domain::NewUserRole {\n user_id: new_user.get_user_id().to_owned(),\n role_id: request.role_id.clone(),\n status: invitation_status,\n created_by: user_from_token.user_id.clone(),\n last_modified_by: user_from_token.user_id.clone(),\n created_at: now,\n last_modified: now,\n entity: domain::NoLevel,\n };\n\n let _user_role = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => {\n user_role\n .add_entity(domain::OrganizationLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Merchant => {\n user_role\n .add_entity(domain::MerchantLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Profile => {\n user_role\n .add_entity(domain::ProfileLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n };\n\n let is_email_sent;\n\n #[cfg(feature = \"email\")]\n {\n // TODO: Adding this to avoid clippy lints\n // Will be adding actual usage for this variable later\n let _ = req_state.clone();\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let entity = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => email_types::Entity {\n entity_id: user_from_token.org_id.get_string_repr().to_owned(),\n entity_type: EntityType::Organization,\n },\n EntityType::Merchant => email_types::Entity {\n entity_id: user_from_token.merchant_id.get_string_repr().to_owned(),\n entity_type: EntityType::Merchant,\n },\n EntityType::Profile => email_types::Entity {\n entity_id: user_from_token.profile_id.get_string_repr().to_owned(),\n entity_type: EntityType::Profile,\n },\n };\n\n let email_contents = email_types::InviteUser {\n recipient_email: invitee_email,\n user_name: domain::UserName::new(new_user.get_name())?,\n settings: state.conf.clone(),\n subject: consts::user::EMAIL_SUBJECT_INVITATION,\n entity,\n auth_id: auth_id.clone(),\n };\n let send_email_result = state\n .email_client\n .compose_and_send_email(\n Box::new(email_contents),\n state.conf.proxy.https_url.as_ref(),\n )\n .await;\n logger::info!(?send_email_result);\n is_email_sent = send_email_result.is_ok();\n }\n #[cfg(not(feature = \"email\"))]\n {\n is_email_sent = false;\n\n let invited_user_token = auth::UserFromToken {\n user_id: new_user.get_user_id(),\n merchant_id: user_from_token.merchant_id.clone(),\n org_id: user_from_token.org_id.clone(),\n role_id: request.role_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n tenant_id: user_from_token.tenant_id.clone(),\n };\n\n let set_metadata_request = SetMetaDataRequest::IsChangePasswordRequired;\n dashboard_metadata::set_metadata(\n state.clone(),\n invited_user_token,\n set_metadata_request,\n req_state,\n )\n .await?;\n }\n\n Ok(InviteMultipleUserResponse {\n is_email_sent,\n password: new_user\n .get_password()\n .map(|password| password.get_secret()),\n email: request.email.clone(),\n error: None,\n })\n}", + "diff_span": { + "before": "", + "after": "\n let _user_role = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => {\n user_role\n .add_entity(domain::OrganizationLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Merchant => {\n user_role\n .add_entity(domain::MerchantLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n EntityType::Profile => {\n user_role\n .add_entity(domain::ProfileLevel {\n tenant_id: user_from_token\n .tenant_id\n .clone()\n .unwrap_or(state.tenant.tenant_id.clone()),\n org_id: user_from_token.org_id.clone(),\n merchant_id: user_from_token.merchant_id.clone(),\n profile_id: user_from_token.profile_id.clone(),\n })\n .insert_in_v2(state)\n .await?\n }\n };\n\n let is_email_sent;\n\n #[cfg(feature = \"email\")]\n {\n // TODO: Adding this to avoid clippy lints\n // Will be adding actual usage for this variable later\n let _ = req_state.clone();\n let invitee_email = domain::UserEmail::from_pii_email(request.email.clone())?;\n let entity = match role_info.get_entity_type() {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => email_types::Entity {\n entity_id: user_from_token.org_id.get_string_repr().to_owned()," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/db/merchant_account.rs::impl::Store", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl MerchantAccountInterface for Store {\n #[instrument(skip_all)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n merchant_account\n .construct_new()\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let fetch_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n fetch_func()\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_id.to_owned().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n cache::get_or_populate_in_memory(\n self,\n merchant_id.get_string_repr(),\n fetch_func,\n &ACCOUNTS_CACHE,\n )\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n }\n\n #[instrument(skip_all)]\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let updated_merchant_account = Conversion::convert(this)\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .update(&conn, merchant_account.into())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n let updated_merchant_account = storage::MerchantAccount::update_with_specific_fields(\n &conn,\n merchant_id,\n merchant_account.into(),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let fetch_by_pub_key_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n\n storage::MerchantAccount::find_by_publishable_key(&conn, publishable_key)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let merchant_account;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n merchant_account = fetch_by_pub_key_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n merchant_account = cache::get_or_populate_in_memory(\n self,\n publishable_key,\n fetch_by_pub_key_func,\n &ACCOUNTS_CACHE,\n )\n .await?;\n }\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let domain_merchant_account = merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((domain_merchant_account, key_store))\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n use futures::future::try_join_all;\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_by_organization_id(&conn, organization_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores =\n try_join_all(encrypted_merchant_accounts.iter().map(|merchant_account| {\n self.get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &db_master_key,\n )\n }))\n .await?;\n\n let merchant_accounts = try_join_all(\n encrypted_merchant_accounts\n .into_iter()\n .zip(merchant_key_stores.iter())\n .map(|(merchant_account, key_store)| async {\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }),\n )\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[instrument(skip_all)]\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let is_deleted_func = || async {\n storage::MerchantAccount::delete_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let is_deleted;\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n is_deleted = is_deleted_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let merchant_account =\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n is_deleted = is_deleted_func().await?;\n\n publish_and_redact_merchant_account_cache(self, &merchant_account).await?;\n }\n\n Ok(is_deleted)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_multiple_merchant_accounts(&conn, merchant_ids)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n\n Ok(merchant_accounts)\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n\n let db_func = || async {\n storage::MerchantAccount::update_all_merchant_accounts(\n &conn,\n MerchantAccountUpdateInternal::from(merchant_account),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let total;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n let ma = db_func().await?;\n total = ma.len();\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let ma = db_func().await?;\n publish_and_redact_all_merchant_account_cache(self, &ma).await?;\n total = ma.len();\n }\n\n Ok(total)\n }\n}", + "after_code": "impl MerchantAccountInterface for Store {\n #[instrument(skip_all)]\n async fn insert_merchant(\n &self,\n state: &KeyManagerState,\n merchant_account: domain::MerchantAccount,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n merchant_account\n .construct_new()\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .insert(&conn)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_merchant_id(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let fetch_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n fetch_func()\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_id.to_owned().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n cache::get_or_populate_in_memory(\n self,\n merchant_id.get_string_repr(),\n fetch_func,\n &ACCOUNTS_CACHE,\n )\n .await?\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n }\n\n #[instrument(skip_all)]\n async fn update_merchant(\n &self,\n state: &KeyManagerState,\n this: domain::MerchantAccount,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let updated_merchant_account = Conversion::convert(this)\n .await\n .change_context(errors::StorageError::EncryptionError)?\n .update(&conn, merchant_account.into())\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn update_specific_fields_in_merchant(\n &self,\n state: &KeyManagerState,\n merchant_id: &common_utils::id_type::MerchantId,\n merchant_account: storage::MerchantAccountUpdate,\n merchant_key_store: &domain::MerchantKeyStore,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n let updated_merchant_account = storage::MerchantAccount::update_with_specific_fields(\n &conn,\n merchant_id,\n merchant_account.into(),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n #[cfg(feature = \"accounts_cache\")]\n {\n publish_and_redact_merchant_account_cache(self, &updated_merchant_account).await?;\n }\n updated_merchant_account\n .convert(\n state,\n merchant_key_store.key.get_inner(),\n merchant_key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }\n\n #[instrument(skip_all)]\n async fn find_merchant_account_by_publishable_key(\n &self,\n state: &KeyManagerState,\n publishable_key: &str,\n ) -> CustomResult<(domain::MerchantAccount, domain::MerchantKeyStore), errors::StorageError>\n {\n let fetch_by_pub_key_func = || async {\n let conn = connection::pg_connection_read(self).await?;\n\n storage::MerchantAccount::find_by_publishable_key(&conn, publishable_key)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let merchant_account;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n merchant_account = fetch_by_pub_key_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n merchant_account = cache::get_or_populate_in_memory(\n self,\n publishable_key,\n fetch_by_pub_key_func,\n &ACCOUNTS_CACHE,\n )\n .await?;\n }\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await?;\n let domain_merchant_account = merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)?;\n Ok((domain_merchant_account, key_store))\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_merchant_accounts_by_organization_id(\n &self,\n state: &KeyManagerState,\n organization_id: &common_utils::id_type::OrganizationId,\n ) -> CustomResult, errors::StorageError> {\n use futures::future::try_join_all;\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_by_organization_id(&conn, organization_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores =\n try_join_all(encrypted_merchant_accounts.iter().map(|merchant_account| {\n self.get_merchant_key_store_by_merchant_id(\n state,\n merchant_account.get_id(),\n &db_master_key,\n )\n }))\n .await?;\n\n let merchant_accounts = try_join_all(\n encrypted_merchant_accounts\n .into_iter()\n .zip(merchant_key_stores.iter())\n .map(|(merchant_account, key_store)| async {\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n }),\n )\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[instrument(skip_all)]\n async fn delete_merchant_account_by_merchant_id(\n &self,\n merchant_id: &common_utils::id_type::MerchantId,\n ) -> CustomResult {\n let conn = connection::pg_connection_write(self).await?;\n\n let is_deleted_func = || async {\n storage::MerchantAccount::delete_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let is_deleted;\n\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n is_deleted = is_deleted_func().await?;\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let merchant_account =\n storage::MerchantAccount::find_by_merchant_id(&conn, merchant_id)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n is_deleted = is_deleted_func().await?;\n\n publish_and_redact_merchant_account_cache(self, &merchant_account).await?;\n }\n\n Ok(is_deleted)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_multiple_merchant_accounts(\n &self,\n state: &KeyManagerState,\n merchant_ids: Vec,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_multiple_merchant_accounts(&conn, merchant_ids)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n\n let db_master_key = self.get_master_key().to_vec().into();\n\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n\n Ok(merchant_accounts)\n }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n let db_master_key = self.get_master_key().to_vec().into();\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n Ok(merchant_accounts)\n }\n\n async fn update_all_merchant_account(\n &self,\n merchant_account: storage::MerchantAccountUpdate,\n ) -> CustomResult {\n let conn = connection::pg_connection_read(self).await?;\n\n let db_func = || async {\n storage::MerchantAccount::update_all_merchant_accounts(\n &conn,\n MerchantAccountUpdateInternal::from(merchant_account),\n )\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))\n };\n\n let total;\n #[cfg(not(feature = \"accounts_cache\"))]\n {\n let ma = db_func().await?;\n total = ma.len();\n }\n\n #[cfg(feature = \"accounts_cache\")]\n {\n let ma = db_func().await?;\n publish_and_redact_all_merchant_account_cache(self, &ma).await?;\n total = ma.len();\n }\n\n Ok(total)\n }\n}", + "diff_span": { + "before": "", + "after": " }\n\n #[cfg(feature = \"olap\")]\n #[instrument(skip_all)]\n async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n let db_master_key = self.get_master_key().to_vec().into();\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n Ok(merchant_accounts)\n }\n\n async fn update_all_merchant_account(\n &self," + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/core/user_role/role.rs::function::list_roles_with_info", + "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 list_roles_with_info(\n state: SessionState,\n user_from_token: UserFromToken,\n request: role_api::ListRolesRequest,\n) -> UserResponse> {\n let user_role_info = user_from_token\n .get_role_info_from_db(&state)\n .await\n .attach_printable(\"Invalid role_id in JWT\")?;\n\n if user_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 mut role_info_vec = PREDEFINED_ROLES\n .iter()\n .map(|(_, role_info)| role_info.clone())\n .collect::>();\n\n let user_role_entity = user_role_info.get_entity_type();\n let custom_roles =\n match utils::user_role::get_min_entity(user_role_entity, request.entity_type)? {\n EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n None,\n request.entity_type,\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n EntityType::Merchant => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n request.entity_type,\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n // TODO: Populate this from Db function when support for profile id and profile level custom roles is added\n EntityType::Profile => Vec::new(),\n };\n\n role_info_vec.extend(custom_roles.into_iter().map(roles::RoleInfo::from));\n\n let list_role_info_response = role_info_vec\n .into_iter()\n .filter_map(|role_info| {\n let is_lower_entity = user_role_entity >= role_info.get_entity_type();\n let request_filter = request.entity_type.map_or(true, |entity_type| {\n entity_type == role_info.get_entity_type()\n });\n\n (is_lower_entity && request_filter).then_some(role_api::RoleInfoResponseNew {\n role_id: role_info.get_role_id().to_string(),\n role_name: role_info.get_role_name().to_string(),\n groups: role_info.get_permission_groups().to_vec(),\n entity_type: role_info.get_entity_type(),\n scope: role_info.get_scope(),\n })\n })\n .collect::>();\n\n Ok(ApplicationResponse::Json(list_role_info_response))\n}", + "after_code": "pub async fn list_roles_with_info(\n state: SessionState,\n user_from_token: UserFromToken,\n request: role_api::ListRolesRequest,\n) -> UserResponse> {\n let user_role_info = user_from_token\n .get_role_info_from_db(&state)\n .await\n .attach_printable(\"Invalid role_id in JWT\")?;\n\n if user_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 mut role_info_vec = PREDEFINED_ROLES\n .iter()\n .map(|(_, role_info)| role_info.clone())\n .collect::>();\n\n let user_role_entity = user_role_info.get_entity_type();\n let custom_roles =\n match utils::user_role::get_min_entity(user_role_entity, request.entity_type)? {\n EntityType::Tenant | EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n None,\n request.entity_type,\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n EntityType::Merchant => state\n .store\n .list_roles_for_org_by_parameters(\n &user_from_token.org_id,\n Some(&user_from_token.merchant_id),\n request.entity_type,\n None,\n )\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get roles\")?,\n // TODO: Populate this from Db function when support for profile id and profile level custom roles is added\n EntityType::Profile => Vec::new(),\n };\n\n role_info_vec.extend(custom_roles.into_iter().map(roles::RoleInfo::from));\n\n let list_role_info_response = role_info_vec\n .into_iter()\n .filter_map(|role_info| {\n let is_lower_entity = user_role_entity >= role_info.get_entity_type();\n let request_filter = request.entity_type.map_or(true, |entity_type| {\n entity_type == role_info.get_entity_type()\n });\n\n (is_lower_entity && request_filter).then_some(role_api::RoleInfoResponseNew {\n role_id: role_info.get_role_id().to_string(),\n role_name: role_info.get_role_name().to_string(),\n groups: role_info.get_permission_groups().to_vec(),\n entity_type: role_info.get_entity_type(),\n scope: role_info.get_scope(),\n })\n })\n .collect::>();\n\n Ok(ApplicationResponse::Json(list_role_info_response))\n}", + "diff_span": { + "before": " let custom_roles =\n match utils::user_role::get_min_entity(user_role_entity, request.entity_type)? {\n EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(", + "after": " let custom_roles =\n match utils::user_role::get_min_entity(user_role_entity, request.entity_type)? {\n EntityType::Tenant | EntityType::Organization => state\n .store\n .list_roles_for_org_by_parameters(" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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_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::Tenant | 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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_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}", + "diff_span": { + "before": " // 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", + "after": " // Match based on the other entity types\n match role_info.get_entity_type() {\n EntityType::Tenant | EntityType::Organization => {\n let merchant_key_store = state\n .store" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/transformers.rs::diesel_models::organization::OrganizationNew::function::foreign_from", + "file": "crates/router/src/types/transformers.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details,\n metadata,\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }", + "after_code": "fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));\n org_new_db.organization_details = organization_details;\n org_new_db.metadata = metadata;\n org_new_db\n }", + "diff_span": { + "before": "fn foreign_from(item: api_models::organization::OrganizationCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::organization::OrganizationCreateRequest {\n organization_name,\n organization_details,", + "after": "fn foreign_from(item: api_models::user::UserOrgCreateRequest) -> Self {\n let org_new = api_models::organization::OrganizationNew::new(None);\n let api_models::user::UserOrgCreateRequest {\n organization_name,\n organization_details,\n metadata,\n ..\n } = item;\n let mut org_new_db = Self::new(org_new.org_id, Some(organization_name));" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::NewUserOrganization::function::from", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": true, + "before_code": "fn from(_value: InviteeUserRequestWithInvitedUserToken) -> Self {\n let new_organization = api_org::OrganizationNew::new(None);\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)\n }", + "after_code": "fn from((_value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount)) -> Self {\n let new_organization = api_org::OrganizationNew {\n org_id: merchant_account.get_org_id().clone(),\n org_name: None,\n };\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)\n }", + "diff_span": { + "before": "fn from(_value: InviteeUserRequestWithInvitedUserToken) -> Self {\n let new_organization = api_org::OrganizationNew::new(None);\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)", + "after": "fn from((_value, merchant_account): (user_api::CreateTenantRequest, MerchantAccount)) -> Self {\n let new_organization = api_org::OrganizationNew {\n org_id: merchant_account.get_org_id().clone(),\n org_name: None,\n };\n let db_organization = ForeignFrom::foreign_from(new_organization);\n Self(db_organization)" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use hyperswitch_domain_models::merchant_account::MerchantAccount;" + ] + }, + { + "id": "crates/router/src/core/user_role.rs::function::list_invitations_for_user", + "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_invitations_for_user(\n state: SessionState,\n user_from_token: auth::UserIdFromAuth,\n) -> UserResponse> {\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles by user id and invitation sent\")?\n .into_iter()\n .collect::>();\n\n let (org_ids, merchant_ids, profile_ids_with_merchant_ids) = user_roles.iter().try_fold(\n (Vec::new(), Vec::new(), Vec::new()),\n |(mut org_ids, mut merchant_ids, mut profile_ids_with_merchant_ids), 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::Organization => org_ids.push(\n user_role\n .org_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n ),\n EntityType::Merchant => merchant_ids.push(\n user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n ),\n EntityType::Profile => profile_ids_with_merchant_ids.push((\n user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n )),\n }\n\n Ok::<_, error_stack::Report>((\n org_ids,\n merchant_ids,\n profile_ids_with_merchant_ids,\n ))\n },\n )?;\n\n let org_name_map = futures::future::try_join_all(org_ids.into_iter().map(|org_id| async {\n let org_name = state\n .store\n .find_organization_by_org_id(&org_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .get_organization_name()\n .map(Secret::new);\n\n Ok::<_, error_stack::Report>((org_id, org_name))\n }))\n .await?\n .into_iter()\n .collect::>();\n\n let key_manager_state = &(&state).into();\n\n let merchant_name_map = state\n .store\n .list_multiple_merchant_accounts(key_manager_state, merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|merchant| {\n (\n merchant.get_id().clone(),\n merchant\n .merchant_name\n .map(|encryptable_name| encryptable_name.into_inner()),\n )\n })\n .collect::>();\n\n let master_key = &state.store.get_master_key().to_vec().into();\n\n let profile_name_map = futures::future::try_join_all(profile_ids_with_merchant_ids.iter().map(\n |(profile_id, merchant_id)| async {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(key_manager_state, merchant_id, master_key)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n &merchant_key_store,\n profile_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok::<_, error_stack::Report>((\n profile_id.clone(),\n Secret::new(business_profile.profile_name),\n ))\n },\n ))\n .await?\n .into_iter()\n .collect::>();\n\n user_roles\n .into_iter()\n .map(|user_role| {\n let (entity_id, 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 let entity_name = match entity_type {\n EntityType::Organization => user_role\n .org_id\n .as_ref()\n .and_then(|org_id| org_name_map.get(org_id).cloned())\n .ok_or(UserErrors::InternalServerError)?,\n EntityType::Merchant => user_role\n .merchant_id\n .as_ref()\n .and_then(|merchant_id| merchant_name_map.get(merchant_id).cloned())\n .ok_or(UserErrors::InternalServerError)?,\n EntityType::Profile => user_role\n .profile_id\n .as_ref()\n .map(|profile_id| profile_name_map.get(profile_id).cloned())\n .ok_or(UserErrors::InternalServerError)?,\n };\n\n Ok(user_role_api::ListInvitationForUserResponse {\n entity_id,\n entity_type,\n entity_name,\n role_id: user_role.role_id,\n })\n })\n .collect::, _>>()\n .map(ApplicationResponse::Json)\n}", + "after_code": "pub async fn list_invitations_for_user(\n state: SessionState,\n user_from_token: auth::UserIdFromAuth,\n) -> UserResponse> {\n let user_roles = state\n .global_store\n .list_user_roles_by_user_id(ListUserRolesByUserIdPayload {\n user_id: &user_from_token.user_id,\n tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\n org_id: None,\n merchant_id: None,\n profile_id: None,\n entity_id: None,\n version: None,\n status: Some(UserStatus::InvitationSent),\n limit: None,\n })\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to list user roles by user id and invitation sent\")?\n .into_iter()\n .collect::>();\n\n let (org_ids, merchant_ids, profile_ids_with_merchant_ids) = user_roles.iter().try_fold(\n (Vec::new(), Vec::new(), Vec::new()),\n |(mut org_ids, mut merchant_ids, mut profile_ids_with_merchant_ids), 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::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => org_ids.push(\n user_role\n .org_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n ),\n EntityType::Merchant => merchant_ids.push(\n user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n ),\n EntityType::Profile => profile_ids_with_merchant_ids.push((\n user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n )),\n }\n\n Ok::<_, error_stack::Report>((\n org_ids,\n merchant_ids,\n profile_ids_with_merchant_ids,\n ))\n },\n )?;\n\n let org_name_map = futures::future::try_join_all(org_ids.into_iter().map(|org_id| async {\n let org_name = state\n .store\n .find_organization_by_org_id(&org_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .get_organization_name()\n .map(Secret::new);\n\n Ok::<_, error_stack::Report>((org_id, org_name))\n }))\n .await?\n .into_iter()\n .collect::>();\n\n let key_manager_state = &(&state).into();\n\n let merchant_name_map = state\n .store\n .list_multiple_merchant_accounts(key_manager_state, merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|merchant| {\n (\n merchant.get_id().clone(),\n merchant\n .merchant_name\n .map(|encryptable_name| encryptable_name.into_inner()),\n )\n })\n .collect::>();\n\n let master_key = &state.store.get_master_key().to_vec().into();\n\n let profile_name_map = futures::future::try_join_all(profile_ids_with_merchant_ids.iter().map(\n |(profile_id, merchant_id)| async {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(key_manager_state, merchant_id, master_key)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n &merchant_key_store,\n profile_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok::<_, error_stack::Report>((\n profile_id.clone(),\n Secret::new(business_profile.profile_name),\n ))\n },\n ))\n .await?\n .into_iter()\n .collect::>();\n\n user_roles\n .into_iter()\n .map(|user_role| {\n let (entity_id, 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 let entity_name = match entity_type {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => user_role\n .org_id\n .as_ref()\n .and_then(|org_id| org_name_map.get(org_id).cloned())\n .ok_or(UserErrors::InternalServerError)?,\n EntityType::Merchant => user_role\n .merchant_id\n .as_ref()\n .and_then(|merchant_id| merchant_name_map.get(merchant_id).cloned())\n .ok_or(UserErrors::InternalServerError)?,\n EntityType::Profile => user_role\n .profile_id\n .as_ref()\n .map(|profile_id| profile_name_map.get(profile_id).cloned())\n .ok_or(UserErrors::InternalServerError)?,\n };\n\n Ok(user_role_api::ListInvitationForUserResponse {\n entity_id,\n entity_type,\n entity_name,\n role_id: user_role.role_id,\n })\n })\n .collect::, _>>()\n .map(ApplicationResponse::Json)\n}", + "diff_span": { + "before": "", + "after": "\n match entity_type {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => org_ids.push(\n user_role\n .org_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n ),\n EntityType::Merchant => merchant_ids.push(\n user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n ),\n EntityType::Profile => profile_ids_with_merchant_ids.push((\n user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n user_role\n .merchant_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n )),\n }\n\n Ok::<_, error_stack::Report>((\n org_ids,\n merchant_ids,\n profile_ids_with_merchant_ids,\n ))\n },\n )?;\n\n let org_name_map = futures::future::try_join_all(org_ids.into_iter().map(|org_id| async {\n let org_name = state\n .store\n .find_organization_by_org_id(&org_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .get_organization_name()\n .map(Secret::new);\n\n Ok::<_, error_stack::Report>((org_id, org_name))\n }))\n .await?\n .into_iter()\n .collect::>();\n\n let key_manager_state = &(&state).into();\n\n let merchant_name_map = state\n .store\n .list_multiple_merchant_accounts(key_manager_state, merchant_ids)\n .await\n .change_context(UserErrors::InternalServerError)?\n .into_iter()\n .map(|merchant| {\n (\n merchant.get_id().clone(),\n merchant\n .merchant_name\n .map(|encryptable_name| encryptable_name.into_inner()),\n )\n })\n .collect::>();\n\n let master_key = &state.store.get_master_key().to_vec().into();\n\n let profile_name_map = futures::future::try_join_all(profile_ids_with_merchant_ids.iter().map(\n |(profile_id, merchant_id)| async {\n let merchant_key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(key_manager_state, merchant_id, master_key)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let business_profile = state\n .store\n .find_business_profile_by_profile_id(\n key_manager_state,\n &merchant_key_store,\n profile_id,\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok::<_, error_stack::Report>((\n profile_id.clone(),\n Secret::new(business_profile.profile_name),\n ))\n },\n ))\n .await?\n .into_iter()\n .collect::>();\n\n user_roles\n .into_iter()\n .map(|user_role| {\n let (entity_id, 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 let entity_name = match entity_type {\n EntityType::Tenant => {\n return Err(UserErrors::InvalidRoleOperationWithMessage(\n \"Tenant roles are not allowed for this operation\".to_string(),\n )\n .into());\n }\n EntityType::Organization => user_role\n .org_id" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_merchant_id_and_profile_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "pub async fn get_single_merchant_id_and_profile_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult<(id_type::MerchantId, id_type::ProfileId)> {\n let merchant_id = get_single_merchant_id(state, user_role).await?;\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n let profile_id = match entity_type {\n EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned()\n }\n EntityType::Profile => user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n };\n\n Ok((merchant_id, profile_id))\n}", + "after_code": "pub async fn get_single_merchant_id_and_profile_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult<(id_type::MerchantId, id_type::ProfileId)> {\n let merchant_id = get_single_merchant_id(state, user_role).await?;\n let (_, entity_type) = user_role\n .get_entity_id_and_type()\n .ok_or(UserErrors::InternalServerError)?;\n let profile_id = match entity_type {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store\n .get_merchant_key_store_by_merchant_id(\n &state.into(),\n &merchant_id,\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n state\n .store\n .list_profile_by_merchant_id(&state.into(), &key_store, &merchant_id)\n .await\n .change_context(UserErrors::InternalServerError)?\n .pop()\n .ok_or(UserErrors::InternalServerError)?\n .get_id()\n .to_owned()\n }\n EntityType::Profile => user_role\n .profile_id\n .clone()\n .ok_or(UserErrors::InternalServerError)?,\n };\n\n Ok((merchant_id, profile_id))\n}", + "diff_span": { + "before": " .ok_or(UserErrors::InternalServerError)?;\n let profile_id = match entity_type {\n EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store", + "after": " .ok_or(UserErrors::InternalServerError)?;\n let profile_id = match entity_type {\n EntityType::Tenant | EntityType::Organization | EntityType::Merchant => {\n let key_store = state\n .store" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/api_models/src/events/user.rs::impl::VerifyTokenResponse", + "file": "crates/api_models/src/events/user.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "impl ApiEventMetric for VerifyTokenResponse {\n fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }\n}", + "after_code": "impl ApiEventMetric for VerifyTokenResponse {\n fn get_api_event_type(&self) -> Option {\n Some(ApiEventsType::User {\n user_id: self.user_email.peek().to_string(),\n })\n }\n}", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::VerifyTokenResponse;", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, VerifyEmailRequest, VerifyRecoveryCodeRequest,\n VerifyTotpRequest,\n};" + ], + "after_imports": [ + "use common_utils::events::{ApiEventMetric, ApiEventsType};", + "use crate::user::VerifyTokenResponse;", + "use crate::user::{\n dashboard_metadata::{\n GetMetaDataRequest, GetMetaDataResponse, GetMultipleMetaDataPayload, SetMetaDataRequest,\n },\n AcceptInviteFromEmailRequest, AuthSelectRequest, AuthorizeResponse, BeginTotpResponse,\n ChangePasswordRequest, ConnectAccountRequest, CreateInternalUserRequest, CreateTenantRequest,\n CreateUserAuthenticationMethodRequest, ForgotPasswordRequest, GetSsoAuthUrlRequest,\n GetUserAuthenticationMethodsRequest, GetUserDetailsResponse, GetUserRoleDetailsRequest,\n GetUserRoleDetailsResponseV2, InviteUserRequest, ReInviteUserRequest, RecoveryCodes,\n ResetPasswordRequest, RotatePasswordRequest, SendVerifyEmailRequest, SignUpRequest,\n SignUpWithMerchantIdRequest, SsoSignInRequest, SwitchMerchantRequest,\n SwitchOrganizationRequest, SwitchProfileRequest, TokenResponse, TwoFactorAuthStatusResponse,\n TwoFactorStatus, UpdateUserAccountDetailsRequest, UpdateUserAuthenticationMethodRequest,\n UserFromEmailRequest, UserMerchantCreate, UserOrgCreateRequest, VerifyEmailRequest,\n VerifyRecoveryCodeRequest, VerifyTotpRequest,\n};" + ] + }, + { + "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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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_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 tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_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_in_org_scope(&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 EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.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": "", + "after": " org_id: user_role.org_id.clone()?,\n }),\n EntityType::Tenant => Some(AuthInfo::OrgLevel {\n org_id: auth.org_id.clone(),\n }),\n })\n })" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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_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::Tenant | 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 tenant_id: user_from_token\n .tenant_id\n .as_ref()\n .unwrap_or(&state.tenant.tenant_id),\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": "\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)", + "after": "\n let merchant_accounts = match role_info.get_entity_type() {\n EntityType::Tenant | EntityType::Organization => state\n .store\n .list_merchant_accounts_by_organization_id(&(&state).into(), &user_from_token.org_id)" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/routes/app.rs::impl::User", + "file": "crates/router/src/routes/app.rs", + "kind": "impl_item", + "status": "modified", + "code_changed": true, + "imports_changed": false, + "before_code": "impl User {\n pub fn server(state: AppState) -> Scope {\n let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n route = route\n .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n // signin/signup with sso using openidconnect\n .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n .service(\n web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n )\n .service(\n web::resource(\"/create_merchant\")\n .route(web::post().to(user::user_merchant_account_create)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/permission_info\")\n .route(web::get().to(user_role::get_authorization_info)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n )\n .service(\n web::resource(\"/parent/list\")\n .route(web::get().to(user_role::get_parent_group_info)),\n )\n .service(\n web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n )\n .service(\n web::resource(\"/data\")\n .route(web::get().to(user::get_multiple_dashboard_metadata))\n .route(web::post().to(user::set_dashboard_metadata)),\n );\n\n route = route\n .service(web::scope(\"/key\").service(\n web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n ));\n\n route = route.service(\n web::scope(\"/list\")\n .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::get().to(user::list_merchants_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n )\n .service(\n web::resource(\"/invitation\")\n .route(web::get().to(user_role::list_invitations_for_user)),\n ),\n );\n\n route = route.service(\n web::scope(\"/switch\")\n .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::post().to(user::switch_merchant_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n ),\n );\n\n // Two factor auth routes\n route = route.service(\n web::scope(\"/2fa\")\n // TODO: to be deprecated\n .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n .service(\n web::resource(\"/v2\")\n .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n )\n .service(\n web::scope(\"/totp\")\n .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::totp_verify))\n .route(web::put().to(user::totp_update)),\n ),\n )\n .service(\n web::scope(\"/recovery_code\")\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::verify_recovery_code)),\n )\n .service(\n web::resource(\"/generate\")\n .route(web::get().to(user::generate_recovery_codes)),\n ),\n )\n .service(\n web::resource(\"/terminate\")\n .route(web::get().to(user::terminate_two_factor_auth)),\n ),\n );\n\n route = route.service(\n web::scope(\"/auth\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user::create_user_authentication_method))\n .route(web::put().to(user::update_user_authentication_method)),\n )\n .service(\n web::resource(\"/list\")\n .route(web::get().to(user::list_user_authentication_methods)),\n )\n .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n .service(\n web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n ),\n );\n\n #[cfg(feature = \"email\")]\n {\n route = route\n .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n .service(\n web::resource(\"/connect_account\")\n .route(web::post().to(user::user_connect_account)),\n )\n .service(\n web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n )\n .service(\n web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n )\n .service(\n web::resource(\"/signup_with_merchant_id\")\n .route(web::post().to(user::user_signup_with_merchant_id)),\n )\n .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n .service(\n web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n )\n .service(\n web::resource(\"/verify_email_request\")\n .route(web::post().to(user::verify_email_request)),\n )\n .service(\n web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n )\n .service(\n web::resource(\"/accept_invite_from_email\")\n .route(web::post().to(user::accept_invite_from_email)),\n );\n }\n #[cfg(not(feature = \"email\"))]\n {\n route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n }\n\n // User management\n route = route.service(\n web::scope(\"/user\")\n .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n // TODO: To be deprecated\n .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n .service(\n web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_users_in_lineage)),\n )\n .service(\n web::resource(\"/invite_multiple\")\n .route(web::post().to(user::invite_multiple_user)),\n )\n .service(\n web::scope(\"/invite/accept\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre_auth\")\n .route(web::post().to(user_role::accept_invitations_pre_auth)),\n )\n .service(\n web::scope(\"/v2\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre-auth\").route(\n web::post().to(user_role::accept_invitations_pre_auth),\n ),\n ),\n ),\n )\n .service(\n web::resource(\"/update_role\")\n .route(web::post().to(user_role::update_user_role)),\n )\n .service(\n web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n ),\n );\n\n // Role information\n route =\n route.service(\n web::scope(\"/role\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::get_role_from_token))\n .route(web::post().to(user_role::create_role)),\n )\n .service(web::resource(\"/v2\").route(\n web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n ))\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(\n web::scope(\"/list\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(web::resource(\"/invite\").route(\n web::get().to(user_role::list_invitable_roles_at_entity_level),\n ))\n .service(web::resource(\"/update\").route(\n web::get().to(user_role::list_updatable_roles_at_entity_level),\n )),\n )\n .service(\n web::resource(\"/{role_id}\")\n .route(web::get().to(user_role::get_role))\n .route(web::put().to(user_role::update_role)),\n )\n .service(\n web::resource(\"/{role_id}/v2\")\n .route(web::get().to(user_role::get_parent_info_for_role)),\n ),\n );\n\n #[cfg(feature = \"dummy_connector\")]\n {\n route = route.service(\n web::resource(\"/sample_data\")\n .route(web::post().to(user::generate_sample_data))\n .route(web::delete().to(user::delete_sample_data)),\n )\n }\n route\n }\n}", + "after_code": "impl User {\n pub fn server(state: AppState) -> Scope {\n let mut route = web::scope(\"/user\").app_data(web::Data::new(state));\n\n route = route\n .service(web::resource(\"\").route(web::get().to(user::get_user_details)))\n .service(web::resource(\"/signin\").route(web::post().to(user::user_signin)))\n .service(web::resource(\"/v2/signin\").route(web::post().to(user::user_signin)))\n // signin/signup with sso using openidconnect\n .service(web::resource(\"/oidc\").route(web::post().to(user::sso_sign)))\n .service(web::resource(\"/signout\").route(web::post().to(user::signout)))\n .service(web::resource(\"/rotate_password\").route(web::post().to(user::rotate_password)))\n .service(web::resource(\"/change_password\").route(web::post().to(user::change_password)))\n .service(\n web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n )\n .service(\n web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n )\n .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n .service(\n web::resource(\"/create_merchant\")\n .route(web::post().to(user::user_merchant_account_create)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/permission_info\")\n .route(web::get().to(user_role::get_authorization_info)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/module/list\").route(web::get().to(user_role::get_role_information)),\n )\n .service(\n web::resource(\"/parent/list\")\n .route(web::get().to(user_role::get_parent_group_info)),\n )\n .service(\n web::resource(\"/update\").route(web::post().to(user::update_user_account_details)),\n )\n .service(\n web::resource(\"/data\")\n .route(web::get().to(user::get_multiple_dashboard_metadata))\n .route(web::post().to(user::set_dashboard_metadata)),\n );\n\n route = route\n .service(web::scope(\"/key\").service(\n web::resource(\"/transfer\").route(web::post().to(user::transfer_user_key)),\n ));\n\n route = route.service(\n web::scope(\"/list\")\n .service(web::resource(\"/org\").route(web::get().to(user::list_orgs_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::get().to(user::list_merchants_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::get().to(user::list_profiles_for_user_in_org_and_merchant)),\n )\n .service(\n web::resource(\"/invitation\")\n .route(web::get().to(user_role::list_invitations_for_user)),\n ),\n );\n\n route = route.service(\n web::scope(\"/switch\")\n .service(web::resource(\"/org\").route(web::post().to(user::switch_org_for_user)))\n .service(\n web::resource(\"/merchant\")\n .route(web::post().to(user::switch_merchant_for_user_in_org)),\n )\n .service(\n web::resource(\"/profile\")\n .route(web::post().to(user::switch_profile_for_user_in_org_and_merchant)),\n ),\n );\n\n // Two factor auth routes\n route = route.service(\n web::scope(\"/2fa\")\n // TODO: to be deprecated\n .service(web::resource(\"\").route(web::get().to(user::check_two_factor_auth_status)))\n .service(\n web::resource(\"/v2\")\n .route(web::get().to(user::check_two_factor_auth_status_with_attempts)),\n )\n .service(\n web::scope(\"/totp\")\n .service(web::resource(\"/begin\").route(web::get().to(user::totp_begin)))\n .service(web::resource(\"/reset\").route(web::get().to(user::totp_reset)))\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::totp_verify))\n .route(web::put().to(user::totp_update)),\n ),\n )\n .service(\n web::scope(\"/recovery_code\")\n .service(\n web::resource(\"/verify\")\n .route(web::post().to(user::verify_recovery_code)),\n )\n .service(\n web::resource(\"/generate\")\n .route(web::get().to(user::generate_recovery_codes)),\n ),\n )\n .service(\n web::resource(\"/terminate\")\n .route(web::get().to(user::terminate_two_factor_auth)),\n ),\n );\n\n route = route.service(\n web::scope(\"/auth\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user::create_user_authentication_method))\n .route(web::put().to(user::update_user_authentication_method)),\n )\n .service(\n web::resource(\"/list\")\n .route(web::get().to(user::list_user_authentication_methods)),\n )\n .service(web::resource(\"/url\").route(web::get().to(user::get_sso_auth_url)))\n .service(\n web::resource(\"/select\").route(web::post().to(user::terminate_auth_select)),\n ),\n );\n\n #[cfg(feature = \"email\")]\n {\n route = route\n .service(web::resource(\"/from_email\").route(web::post().to(user::user_from_email)))\n .service(\n web::resource(\"/connect_account\")\n .route(web::post().to(user::user_connect_account)),\n )\n .service(\n web::resource(\"/forgot_password\").route(web::post().to(user::forgot_password)),\n )\n .service(\n web::resource(\"/reset_password\").route(web::post().to(user::reset_password)),\n )\n .service(\n web::resource(\"/signup_with_merchant_id\")\n .route(web::post().to(user::user_signup_with_merchant_id)),\n )\n .service(web::resource(\"/verify_email\").route(web::post().to(user::verify_email)))\n .service(\n web::resource(\"/v2/verify-email\").route(web::post().to(user::verify_email)),\n )\n .service(\n web::resource(\"/verify_email_request\")\n .route(web::post().to(user::verify_email_request)),\n )\n .service(\n web::resource(\"/user/resend_invite\").route(web::post().to(user::resend_invite)),\n )\n .service(\n web::resource(\"/accept_invite_from_email\")\n .route(web::post().to(user::accept_invite_from_email)),\n );\n }\n #[cfg(not(feature = \"email\"))]\n {\n route = route.service(web::resource(\"/signup\").route(web::post().to(user::user_signup)))\n }\n\n // User management\n route = route.service(\n web::scope(\"/user\")\n .service(web::resource(\"\").route(web::post().to(user::list_user_roles_details)))\n // TODO: To be deprecated\n .service(web::resource(\"/v2\").route(web::post().to(user::list_user_roles_details)))\n .service(\n web::resource(\"/list\").route(web::get().to(user_role::list_users_in_lineage)),\n )\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_users_in_lineage)),\n )\n .service(\n web::resource(\"/invite_multiple\")\n .route(web::post().to(user::invite_multiple_user)),\n )\n .service(\n web::scope(\"/invite/accept\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre_auth\")\n .route(web::post().to(user_role::accept_invitations_pre_auth)),\n )\n .service(\n web::scope(\"/v2\")\n .service(\n web::resource(\"\")\n .route(web::post().to(user_role::accept_invitations_v2)),\n )\n .service(\n web::resource(\"/pre-auth\").route(\n web::post().to(user_role::accept_invitations_pre_auth),\n ),\n ),\n ),\n )\n .service(\n web::resource(\"/update_role\")\n .route(web::post().to(user_role::update_user_role)),\n )\n .service(\n web::resource(\"/delete\").route(web::delete().to(user_role::delete_user_role)),\n ),\n );\n\n // Role information\n route =\n route.service(\n web::scope(\"/role\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::get_role_from_token))\n .route(web::post().to(user_role::create_role)),\n )\n .service(web::resource(\"/v2\").route(\n web::get().to(user_role::get_groups_and_resources_for_role_from_token),\n ))\n // TODO: To be deprecated\n .service(\n web::resource(\"/v2/list\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(\n web::scope(\"/list\")\n .service(\n web::resource(\"\")\n .route(web::get().to(user_role::list_roles_with_info)),\n )\n .service(web::resource(\"/invite\").route(\n web::get().to(user_role::list_invitable_roles_at_entity_level),\n ))\n .service(web::resource(\"/update\").route(\n web::get().to(user_role::list_updatable_roles_at_entity_level),\n )),\n )\n .service(\n web::resource(\"/{role_id}\")\n .route(web::get().to(user_role::get_role))\n .route(web::put().to(user_role::update_role)),\n )\n .service(\n web::resource(\"/{role_id}/v2\")\n .route(web::get().to(user_role::get_parent_info_for_role)),\n ),\n );\n\n #[cfg(feature = \"dummy_connector\")]\n {\n route = route.service(\n web::resource(\"/sample_data\")\n .route(web::post().to(user::generate_sample_data))\n .route(web::delete().to(user::delete_sample_data)),\n )\n }\n route\n }\n}", + "diff_span": { + "before": "", + "after": " web::resource(\"/internal_signup\").route(web::post().to(user::internal_user_signup)),\n )\n .service(\n web::resource(\"/create_tenant\").route(web::post().to(user::create_tenant_user)),\n )\n .service(web::resource(\"/create_org\").route(web::post().to(user::user_org_create)))\n .service(\n web::resource(\"/create_merchant\")" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::NewUserMerchant::function::check_if_already_exists_in_db", + "file": "crates/router/src/types/domain/user.rs", + "kind": "function_item", + "status": "modified", + "code_changed": false, + "imports_changed": true, + "before_code": "pub async fn check_if_already_exists_in_db(&self, state: SessionState) -> UserResult<()> {\n if state\n .store\n .get_merchant_key_store_by_merchant_id(\n &(&state).into(),\n &self.get_merchant_id(),\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .is_ok()\n {\n return Err(UserErrors::MerchantAccountCreationError(format!(\n \"Merchant with {:?} already exists\",\n self.get_merchant_id()\n ))\n .into());\n }\n Ok(())\n }", + "after_code": "pub async fn check_if_already_exists_in_db(&self, state: SessionState) -> UserResult<()> {\n if state\n .store\n .get_merchant_key_store_by_merchant_id(\n &(&state).into(),\n &self.get_merchant_id(),\n &state.store.get_master_key().to_vec().into(),\n )\n .await\n .is_ok()\n {\n return Err(UserErrors::MerchantAccountCreationError(format!(\n \"Merchant with {:?} already exists\",\n self.get_merchant_id()\n ))\n .into());\n }\n Ok(())\n }", + "diff_span": { + "before": "", + "after": "" + }, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e", + "before_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};" + ], + "after_imports": [ + "use diesel_models::{\n enums::{TotpStatus, UserRoleVersion, UserStatus},\n organization::{self as diesel_org, Organization, OrganizationBridge},\n user as storage_user,\n user_role::{UserRole, UserRoleNew},\n};", + "use api_models::{\n admin as admin_api, organization as api_org, user as user_api, user_role as user_role_api,\n};", + "use hyperswitch_domain_models::merchant_account::MerchantAccount;" + ] + }, + { + "id": "crates/router/src/routes/user.rs::function::create_tenant_user", + "file": "crates/router/src/routes/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn create_tenant_user(\n state: web::Data,\n http_req: HttpRequest,\n json_payload: web::Json,\n) -> HttpResponse {\n let flow = Flow::TenantUserCreate;\n Box::pin(api::server_wrap(\n flow,\n state.clone(),\n &http_req,\n json_payload.into_inner(),\n |state, _, req, _| user_core::create_tenant_user(state, req),\n &auth::AdminApiAuth,\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/core/user.rs::function::create_org_for_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn create_org_for_user(\n state: SessionState,\n req: user_api::UserOrgCreateRequest,\n) -> UserResponse<()> {\n let db_organization = crate::types::transformers::ForeignFrom::foreign_from(req.clone());\n let org: diesel_models::organization::Organization = state\n .store\n .insert_organization(db_organization)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n let merchant_account_create_request =\n utils::user::create_merchant_account_request_for_org(req, org)?;\n\n super::admin::create_merchant_account(state.clone(), merchant_account_create_request)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Error while creating a merchant\")?;\n \n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/db/merchant_account.rs::Store::function::list_all_merchant_accounts", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let conn = connection::pg_connection_read(self).await?;\n let encrypted_merchant_accounts =\n storage::MerchantAccount::list_all_merchant_accounts(&conn, limit, offset)\n .await\n .map_err(|error| report!(errors::StorageError::from(error)))?;\n let db_master_key = self.get_master_key().to_vec().into();\n let merchant_key_stores = self\n .list_multiple_key_stores(\n state,\n encrypted_merchant_accounts\n .iter()\n .map(|merchant_account| merchant_account.get_id())\n .cloned()\n .collect(),\n &db_master_key,\n )\n .await?;\n let key_stores_by_id: HashMap<_, _> = merchant_key_stores\n .iter()\n .map(|key_store| (key_store.merchant_id.to_owned(), key_store))\n .collect();\n let merchant_accounts =\n futures::future::try_join_all(encrypted_merchant_accounts.into_iter().map(\n |merchant_account| async {\n let key_store = key_stores_by_id.get(merchant_account.get_id()).ok_or(\n errors::StorageError::ValueNotFound(format!(\n \"merchant_key_store with merchant_id = {:?}\",\n merchant_account.get_id()\n )),\n )?;\n merchant_account\n .convert(\n state,\n key_store.key.get_inner(),\n key_store.merchant_id.clone().into(),\n )\n .await\n .change_context(errors::StorageError::DecryptionError)\n },\n ))\n .await?;\n Ok(merchant_accounts)\n }", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/types/domain/user.rs::struct::TenantLevel", + "file": "crates/router/src/types/domain/user.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct TenantLevel {\n pub tenant_id: id_type::TenantId,\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/api_models/src/user.rs::struct::UserOrgCreateRequest", + "file": "crates/api_models/src/user.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct UserOrgCreateRequest {\n pub organization_name: String,\n pub organization_details: Option,\n pub metadata: Option,\n pub merchant_name: Option,\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/core/user.rs::function::create_tenant_user", + "file": "crates/router/src/core/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn create_tenant_user(\n state: SessionState,\n request: user_api::CreateTenantRequest,\n) -> UserResponse<()> {\n let key_manager_state = &(&state).into();\n\n let existing_merchant = state\n .store\n .list_all_merchant_accounts(key_manager_state, Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants found for the tenancy\")?\n .clone();\n\n let new_user = domain::NewUser::try_from((request, existing_merchant))?;\n let mut store_user: storage_user::UserNew = new_user.clone().try_into()?;\n store_user.set_is_verified(true);\n\n state\n .global_store\n .insert_user(store_user)\n .await\n .map_err(|e| {\n if e.current_context().is_db_unique_violation() {\n e.change_context(UserErrors::UserExists)\n } else {\n e.change_context(UserErrors::InternalServerError)\n }\n })\n .map(domain::user::UserFromStorage::from)?;\n\n new_user\n .get_no_level_user_role(\n common_utils::consts::ROLE_ID_TENANT_ADMIN.to_string(),\n UserStatus::Active,\n )\n .add_entity(domain::TenantLevel {\n tenant_id: state.tenant.tenant_id.clone(),\n })\n .insert_in_v2(&state)\n .await\n .change_context(UserErrors::InternalServerError)?;\n\n Ok(ApplicationResponse::StatusOk)\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/diesel_models/src/query/merchant_account.rs::MerchantAccount::function::list_all_merchant_accounts", + "file": "crates/diesel_models/src/query/merchant_account.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn list_all_merchant_accounts(\n conn: &PgPooledConn,\n limit: Option,\n offset: Option,\n ) -> StorageResult> {\n generics::generic_filter::<\n ::Table,\n _,\n <::Table as Table>::PrimaryKey,\n _,\n >(\n conn,\n dsl_identifier.ne_all(vec![\"\"]),\n limit.map(i64::from),\n offset.map(i64::from),\n None,\n )\n .await\n }", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/db/kafka_store.rs::KafkaStore::function::list_all_merchant_accounts", + "file": "crates/router/src/db/kafka_store.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n self.diesel_store\n .list_all_merchant_accounts(state, limit, offset)\n .await\n }", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/common_utils/src/consts.rs::const::ROLE_ID_TENANT_ADMIN", + "file": "crates/common_utils/src/consts.rs", + "kind": "const_item", + "status": "added", + "before_code": null, + "after_code": "pub const ROLE_ID_TENANT_ADMIN: &str = \"tenant_admin\";", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/routes/user.rs::function::user_org_create", + "file": "crates/router/src/routes/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn user_org_create(\n state: web::Data,\n req: HttpRequest,\n json_payload: web::Json,\n) -> HttpResponse {\n let flow = Flow::UserOrgCreate;\n Box::pin(api::server_wrap(\n flow,\n state,\n &req,\n json_payload.into_inner(),\n |state, _auth: auth::UserFromToken, json_payload, _| {\n user_core::create_org_for_user(state, json_payload)\n },\n &auth::JWTAuth {\n permission: Permission::TenantAccountWrite,\n },\n api_locking::LockAction::NotApplicable,\n ))\n .await\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/db/merchant_account.rs::MockDb::function::list_all_merchant_accounts", + "file": "crates/router/src/db/merchant_account.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "async fn list_all_merchant_accounts(\n &self,\n state: &KeyManagerState,\n limit: Option,\n offset: Option,\n ) -> CustomResult, errors::StorageError> {\n let accounts = self.merchant_accounts.lock().await;\n let offset = offset.unwrap_or(0).try_into().unwrap_or(0);\n let limit = limit.map_or(accounts.len(), |l| l.try_into().unwrap_or(accounts.len()));\n\n let filtered_accounts = accounts\n .iter()\n .skip(offset)\n .take(limit)\n .cloned()\n .collect::>();\n\n let futures = filtered_accounts.into_iter().map(|account| async {\n let key_store = self\n .get_merchant_key_store_by_merchant_id(\n state,\n account.get_id(),\n &self.get_master_key().to_vec().into(),\n )\n .await;\n match key_store {\n Ok(key) => account\n .convert(state, key.key.get_inner(), key.merchant_id.clone().into())\n .await\n .change_context(errors::StorageError::DecryptionError),\n Err(err) => Err(err),\n }\n });\n\n futures::future::try_join_all(futures).await\n }", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/utils/user_role.rs::function::get_single_org_id", + "file": "crates/router/src/utils/user_role.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub async fn get_single_org_id(\n state: &SessionState,\n user_role: &UserRole,\n) -> UserResult {\n match user_role.entity_type {\n Some(EntityType::Tenant) => Ok(state\n .store\n .list_all_merchant_accounts(&state.into(), Some(1), None)\n .await\n .change_context(UserErrors::InternalServerError)\n .attach_printable(\"Failed to get merchants list for org\")?\n .first()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"No merchants to get the org id\")?\n .get_org_id()\n .clone()),\n Some(EntityType::Organization)\n | Some(EntityType::Merchant)\n | Some(EntityType::Profile)\n | None => user_role\n .org_id\n .clone()\n .ok_or(UserErrors::InternalServerError)\n .attach_printable(\"Org_id not found\"),\n }\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/router/src/utils/user.rs::function::create_merchant_account_request_for_org", + "file": "crates/router/src/utils/user.rs", + "kind": "function_item", + "status": "added", + "before_code": null, + "after_code": "pub fn create_merchant_account_request_for_org(\n req: user_api::UserOrgCreateRequest,\n org: organization::Organization,\n) -> UserResult {\n let merchant_id = if matches!(env::which(), env::Env::Production) {\n id_type::MerchantId::try_from(domain::MerchantId::new(req.merchant_name.clone().ok_or(\n UserErrors::InvalidRoleOperationWithMessage(\"Merchant name required\".to_string()),\n )?)?)?\n } else {\n id_type::MerchantId::new_from_unix_timestamp()\n };\n Ok(api_models::admin::MerchantAccountCreate {\n merchant_id,\n metadata: None,\n locker_id: None,\n return_url: None,\n merchant_name: None,\n webhook_details: None,\n publishable_key: None,\n organization_id: Some(org.get_organization_id()),\n merchant_details: None,\n routing_algorithm: None,\n parent_merchant_id: None,\n sub_merchants_enabled: None,\n frm_routing_algorithm: None,\n #[cfg(feature = \"payouts\")]\n payout_routing_algorithm: None,\n primary_business_details: None,\n payment_response_hash_key: None,\n enable_payment_response_hash: None,\n redirect_to_merchant_with_http_post: None,\n pm_collect_link_config: None,\n })\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + }, + { + "id": "crates/api_models/src/user.rs::struct::CreateTenantRequest", + "file": "crates/api_models/src/user.rs", + "kind": "struct_item", + "status": "added", + "before_code": null, + "after_code": "pub struct CreateTenantRequest {\n pub name: Secret,\n pub email: pii::Email,\n pub password: Secret,\n}", + "diff_span": null, + "commit_sha": "d539dbd699ede2f4b5ce925fa1fb9b20d298f69e" + } + ] +} \ No newline at end of file