refactor(users): change list roles api to also send inactive merchants (#3583)

This commit is contained in:
Mani Chandra
2024-02-07 19:24:57 +05:30
committed by GitHub
parent fbe84b2a33
commit cef1643af5
2 changed files with 6 additions and 20 deletions

View File

@ -1,11 +1,8 @@
use api_models::user_role as user_role_api;
use diesel_models::{enums::UserStatus, user_role::UserRole};
use error_stack::ResultExt;
use crate::{
consts,
core::errors::{UserErrors, UserResult},
routes::AppState,
services::authorization::{
permissions::Permission,
predefined_permissions::{self, RoleInfo},
@ -17,20 +14,6 @@ pub fn is_internal_role(role_id: &str) -> bool {
|| role_id == consts::user_role::ROLE_ID_INTERNAL_VIEW_ONLY_USER
}
pub async fn get_active_user_roles_for_user(
state: &AppState,
user_id: &str,
) -> UserResult<Vec<UserRole>> {
Ok(state
.store
.list_user_roles_by_user_id(user_id)
.await
.change_context(UserErrors::InternalServerError)?
.into_iter()
.filter(|ele| ele.status == UserStatus::Active)
.collect())
}
pub fn validate_role_id(role_id: &str) -> UserResult<()> {
if predefined_permissions::is_role_invitable(role_id) {
return Ok(());