rust/hyperswitch
1
0
Fork 0
mirror of https://github.com/juspay/hyperswitch.git synced 2025-10-29 00:49:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(users): Add role specific fields for list merchants API (#4326)

Browse Source 
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
This commit is contained in:
Mani Chandra
2024-04-10 15:40:55 +05:30
committed by GitHub
parent ce1e165cec
commit 018c5b1064
7 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/router/src/core/user.rs
View File

@ -1173,7 +1173,7 @@ pub async fn create_merchant_account(
Ok(ApplicationResponse::StatusOk)
}
pub async fn list_merchant_ids_for_user(
pub async fn list_merchants_for_user(
state: AppState,
user_from_token: auth::UserFromToken,
) -> UserResponse<Vec<user_api::UserMerchantAccount>> {
@ -1194,8 +1194,15 @@ pub async fn list_merchant_ids_for_user(
.await
.change_context(UserErrors::InternalServerError)?;
let roles =
utils::user_role::get_multiple_role_info_for_user_roles(&state, &user_roles).await?;
Ok(ApplicationResponse::Json(
utils::user::get_multiple_merchant_details_with_status(user_roles, merchant_accounts)?,
utils::user::get_multiple_merchant_details_with_status(
user_roles,
merchant_accounts,
roles,
)?,
))
}

4
crates/router/src/routes/app.rs
View File

@ -1135,7 +1135,9 @@ impl User {
web::resource("/create_merchant")
.route(web::post().to(user_merchant_account_create)),
)
.service(web::resource("/switch/list").route(web::get().to(list_merchant_ids_for_user)))
// TODO: Remove this endpoint once migration to /merchants/list is done
.service(web::resource("/switch/list").route(web::get().to(list_merchants_for_user)))
.service(web::resource("/merchants/list").route(web::get().to(list_merchants_for_user)))
.service(web::resource("/permission_info").route(web::get().to(get_authorization_info)))
.service(web::resource("/update").route(web::post().to(update_user_account_details)))
.service(

7
crates/router/src/routes/user.rs
View File

@ -297,17 +297,14 @@ pub async fn delete_sample_data(
.await
}
pub async fn list_merchant_ids_for_user(
state: web::Data<AppState>,
req: HttpRequest,
) -> HttpResponse {
pub async fn list_merchants_for_user(state: web::Data<AppState>, req: HttpRequest) -> HttpResponse {
let flow = Flow::UserMerchantAccountList;
Box::pin(api::server_wrap(
flow,
state,
&req,
(),
|state, user, _| user_core::list_merchant_ids_for_user(state, user),
|state, user, _| user_core::list_merchants_for_user(state, user),
&auth::DashboardNoPermissionAuth,
api_locking::LockAction::NotApplicable,
))

5
crates/router/src/types/domain/user.rs
View File

@ -896,9 +896,14 @@ impl SignInWithMultipleRolesStrategy {
.await
.change_context(UserErrors::InternalServerError)?;
let roles =
utils::user_role::get_multiple_role_info_for_user_roles(state, &self.user_roles)
.await?;
let merchant_details = utils::user::get_multiple_merchant_details_with_status(
self.user_roles,
merchant_accounts,
roles,
)?;
Ok(user_api::SignInResponse::MerchantSelect(

40
crates/router/src/utils/user.rs
View File

@ -3,7 +3,7 @@ use std::collections::HashMap;
use api_models::user as user_api;
use common_utils::errors::CustomResult;
use diesel_models::{enums::UserStatus, user_role::UserRole};
use error_stack::{report, ResultExt};
use error_stack::ResultExt;
use masking::{ExposeInterface, Secret};
use crate::{
@ -137,24 +137,38 @@ pub fn get_verification_days_left(
pub fn get_multiple_merchant_details_with_status(
user_roles: Vec<UserRole>,
merchant_accounts: Vec<MerchantAccount>,
roles: Vec<RoleInfo>,
) -> UserResult<Vec<user_api::UserMerchantAccount>> {
let roles: HashMap<_, _> = user_roles
let merchant_account_map = merchant_accounts
.into_iter()
.map(|user_role| (user_role.merchant_id.clone(), user_role))
.collect();
.map(|merchant_account| (merchant_account.merchant_id.clone(), merchant_account))
.collect::<HashMap<_, _>>();
merchant_accounts
let role_map = roles
.into_iter()
.map(|merchant| {
let role = roles
.get(merchant.merchant_id.as_str())
.ok_or(report!(UserErrors::InternalServerError))
.attach_printable("Merchant exists but user role doesn't")?;
.map(|role_info| (role_info.get_role_id().to_string(), role_info))
.collect::<HashMap<_, _>>();
user_roles
.into_iter()
.map(|user_role| {
let merchant_account = merchant_account_map
.get(&user_role.merchant_id)
.ok_or(UserErrors::InternalServerError)
.attach_printable("Merchant account for user role doesn't exist")?;
let role_info = role_map
.get(&user_role.role_id)
.ok_or(UserErrors::InternalServerError)
.attach_printable("Role info for user role doesn't exist")?;
Ok(user_api::UserMerchantAccount {
merchant_id: merchant.merchant_id.clone(),
merchant_name: merchant.merchant_name.clone(),
is_active: role.status == UserStatus::Active,
merchant_id: user_role.merchant_id,
merchant_name: merchant_account.merchant_name.clone(),
is_active: user_role.status == UserStatus::Active,
role_id: user_role.role_id,
role_name: role_info.get_role_name().to_string(),
org_id: user_role.org_id,
})
})
.collect()

21
crates/router/src/utils/user_role.rs
View File

@ -8,7 +8,7 @@ use router_env::logger;
use crate::{
consts,
core::errors::{UserErrors, UserResult},
core::errors::{StorageErrorExt, UserErrors, UserResult},
routes::AppState,
services::authorization::{self as authz, permissions::Permission, roles},
types::domain,
@ -141,3 +141,22 @@ pub async fn set_role_permissions_in_cache_if_required(
.change_context(UserErrors::InternalServerError)
.attach_printable("Error setting permissions in redis")
}
pub async fn get_multiple_role_info_for_user_roles(
state: &AppState,
user_roles: &[UserRole],
) -> UserResult<Vec<roles::RoleInfo>> {
futures::future::try_join_all(user_roles.iter().map(|user_role| async {
let role = roles::RoleInfo::from_role_id(
state,
&user_role.role_id,
&user_role.merchant_id,
&user_role.org_id,
)
.await
.to_not_found_response(UserErrors::InternalServerError)
.attach_printable("Role for user role doesn't exist")?;
Ok::<_, error_stack::Report<UserErrors>>(role)
}))
.await
}