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

refactor(role): determine level of role entity (#5488)

Browse Source
This commit is contained in:
Apoorv Dixit
2024-08-01 15:26:47 +05:30
committed by GitHub
parent c0f45771b0
commit c036fd7f41
12 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/api_models/src/user_role/role.rs
View File

@ -1,4 +1,4 @@
use common_enums::{PermissionGroup, RoleScope};
use common_enums::{EntityType, PermissionGroup, RoleScope};
use super::Permission;
@ -7,6 +7,7 @@ pub struct CreateRoleRequest {
pub role_name: String,
pub groups: Vec<PermissionGroup>,
pub role_scope: RoleScope,
pub entity_type: Option<EntityType>,
}
#[derive(Debug, serde::Deserialize, serde::Serialize)]

21
crates/common_enums/src/enums.rs
View File

@ -3027,6 +3027,27 @@ pub enum Owner {
Internal,
}
#[derive(
Clone,
Copy,
Debug,
Eq,
PartialEq,
serde::Deserialize,
serde::Serialize,
strum::Display,
strum::EnumString,
)]
#[router_derive::diesel_enum(storage_type = "text")]
#[strum(serialize_all = "snake_case")]
#[serde(rename_all = "snake_case")]
pub enum EntityType {
Internal,
Organization,
Merchant,
Profile,
}
#[derive(Clone, Debug, serde::Serialize)]
#[serde(rename_all = "snake_case")]
pub enum PayoutRetryType {

2
crates/diesel_models/src/role.rs
View File

@ -18,6 +18,7 @@ pub struct Role {
pub created_by: String,
pub last_modified_at: PrimitiveDateTime,
pub last_modified_by: String,
pub entity_type: Option<enums::EntityType>,
}
#[derive(router_derive::Setter, Clone, Debug, Insertable, router_derive::DebugAsDisplay)]
@ -34,6 +35,7 @@ pub struct RoleNew {
pub created_by: String,
pub last_modified_at: PrimitiveDateTime,
pub last_modified_by: String,
pub entity_type: Option<enums::EntityType>,
}
#[derive(Clone, Debug, AsChangeset, router_derive::DebugAsDisplay)]

2
crates/diesel_models/src/schema.rs
View File

@ -1183,6 +1183,8 @@ diesel::table! {
last_modified_at -> Timestamp,
#[max_length = 64]
last_modified_by -> Varchar,
#[max_length = 64]
entity_type -> Nullable<Varchar>,
}
}

2
crates/diesel_models/src/schema_v2.rs
View File

@ -1189,6 +1189,8 @@ diesel::table! {
last_modified_at -> Timestamp,
#[max_length = 64]
last_modified_by -> Varchar,
#[max_length = 64]
entity_type -> Nullable<Varchar>,
}
}

5
crates/diesel_models/src/user_role.rs
View File

@ -1,3 +1,4 @@
use common_enums::EntityType;
use common_utils::id_type;
use diesel::{AsChangeset, Identifiable, Insertable, Queryable, Selectable};
use time::PrimitiveDateTime;
@ -19,7 +20,7 @@ pub struct UserRole {
pub last_modified: PrimitiveDateTime,
pub profile_id: Option<String>,
pub entity_id: Option<String>,
pub entity_type: Option<String>,
pub entity_type: Option<EntityType>,
pub version: enums::UserRoleVersion,
}
@ -37,7 +38,7 @@ pub struct UserRoleNew {
pub last_modified: PrimitiveDateTime,
pub profile_id: Option<String>,
pub entity_id: Option<String>,
pub entity_type: Option<String>,
pub entity_type: Option<EntityType>,
pub version: enums::UserRoleVersion,
}

1
crates/router/src/core/user_role/role.rs
View File

@ -87,6 +87,7 @@ pub async fn create_role(
org_id: user_from_token.org_id,
groups: req.groups,
scope: req.role_scope,
entity_type: req.entity_type,
created_by: user_from_token.user_id.clone(),
last_modified_by: user_from_token.user_id,
created_at: now,

1
crates/router/src/db/role.rs
View File

@ -144,6 +144,7 @@ impl RoleInterface for MockDb {
org_id: role.org_id,
groups: role.groups,
scope: role.scope,
entity_type: role.entity_type,
created_by: role.created_by,
created_at: role.created_at,
last_modified_at: role.last_modified_at,

8
crates/router/src/services/authorization/roles.rs
View File

@ -1,6 +1,6 @@
use std::collections::HashSet;
use common_enums::{PermissionGroup, RoleScope};
use common_enums::{EntityType, PermissionGroup, RoleScope};
use common_utils::{errors::CustomResult, id_type};
use super::{permission_groups::get_permissions_vec, permissions::Permission};
@ -14,6 +14,7 @@ pub struct RoleInfo {
role_name: String,
groups: Vec<PermissionGroup>,
scope: RoleScope,
entity_type: EntityType,
is_invitable: bool,
is_deletable: bool,
is_updatable: bool,
@ -37,6 +38,10 @@ impl RoleInfo {
self.scope
}
pub fn get_entity_type(&self) -> EntityType {
self.entity_type
}
pub fn is_invitable(&self) -> bool {
self.is_invitable
}
@ -91,6 +96,7 @@ impl From<diesel_models::role::Role> for RoleInfo {
role_name: role.role_name,
groups: role.groups.into_iter().map(Into::into).collect(),
scope: role.scope,
entity_type: role.entity_type.unwrap_or(EntityType::Merchant),
is_invitable: true,
is_deletable: true,
is_updatable: true,

11
crates/router/src/services/authorization/roles/predefined_roles.rs
View File

@ -1,6 +1,6 @@
use std::collections::HashMap;
use common_enums::{PermissionGroup, RoleScope};
use common_enums::{EntityType, PermissionGroup, RoleScope};
use once_cell::sync::Lazy;
use super::RoleInfo;
@ -28,6 +28,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_INTERNAL_ADMIN.to_string(),
role_name: "internal_admin".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Internal,
is_invitable: false,
is_deletable: false,
is_updatable: false,
@ -48,6 +49,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_INTERNAL_VIEW_ONLY_USER.to_string(),
role_name: "internal_view_only".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Internal,
is_invitable: false,
is_deletable: false,
is_updatable: false,
@ -75,6 +77,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_ORGANIZATION_ADMIN.to_string(),
role_name: "organization_admin".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Organization,
is_invitable: false,
is_deletable: false,
is_updatable: false,
@ -102,6 +105,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_MERCHANT_ADMIN.to_string(),
role_name: "admin".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Merchant,
is_invitable: true,
is_deletable: true,
is_updatable: true,
@ -122,6 +126,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_MERCHANT_VIEW_ONLY.to_string(),
role_name: "view_only".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Merchant,
is_invitable: true,
is_deletable: true,
is_updatable: true,
@ -141,6 +146,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_MERCHANT_IAM_ADMIN.to_string(),
role_name: "iam".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Merchant,
is_invitable: true,
is_deletable: true,
is_updatable: true,
@ -161,6 +167,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_MERCHANT_DEVELOPER.to_string(),
role_name: "developer".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Merchant,
is_invitable: true,
is_deletable: true,
is_updatable: true,
@ -182,6 +189,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_MERCHANT_OPERATOR.to_string(),
role_name: "operator".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Merchant,
is_invitable: true,
is_deletable: true,
is_updatable: true,
@ -200,6 +208,7 @@ pub static PREDEFINED_ROLES: Lazy<HashMap<&'static str, RoleInfo>> = Lazy::new(|
role_id: consts::user_role::ROLE_ID_MERCHANT_CUSTOMER_SUPPORT.to_string(),
role_name: "customer_support".to_string(),
scope: RoleScope::Organization,
entity_type: EntityType::Merchant,
is_invitable: true,
is_deletable: true,
is_updatable: true,

2
migrations/2024-07-30-124102_add_entity_type_to_roles/down.sql Normal file
View File

@ -0,0 +1,2 @@
-- This file should undo anything in `up.sql`
ALTER TABLE roles DROP COLUMN entity_type;

2
migrations/2024-07-30-124102_add_entity_type_to_roles/up.sql Normal file
View File

@ -0,0 +1,2 @@
-- Your SQL goes here
ALTER TABLE roles ADD COLUMN entity_type VARCHAR(64);