feat(users): handle edge features for users in tenancy #6990

apoorvdixit88 · 2025-01-05T20:12:09Z

Type of Change

Description

This PR

add tenant_id in roles table
add support for genenric query to serach user across all tenancies
Fixes custom roles creates by tenant_level user
List view for tenant level user
Fix bug to search across envs for tenant admin

Additional Changes

This PR modifies the API contract
This PR modifies the database schema
This PR modifies application configuration/environment variables

Motivation and Context

Closes #6999

How did you test it?

Tenant admin able to create custom org level role

curl --location 'http://localhost:8080/user/role' \
--header 'Content-Type: application/json' \
--header 'Authorization: Bearer JWT' \
--data '{
  "role_name": "custom_role_7",
  "groups": ["users_view"],
  "role_scope": "organization"
}'

Response

{
    "role_id": "role_KQxGGeCs6usRwxubnU2Y",
    "groups": [
        "users_view"
    ],
    "role_name": "custom_role_7",
    "role_scope": "organization"
}

For tenant level user, list api is showing that user in list, if we don't pass query, its coming with remaning org users

curl --location 'http://localhost:8080/user/user/list?entity_type=tenant' \
--header 'x-tenant-id: test' \
--header 'Authorization: Bearer JWT' \

Response

[
    {
        "email": "cd1@juspay.in",
        "roles": [
            {
                "role_id": "tenant_admin",
                "role_name": "tenant_admin"
            }
        ]
    }
]

For global search now, we are getting org_id in the query

Checklist

I formatted the code cargo +nightly fmt --all
I addressed lints thrown by cargo clippy
I reviewed the submitted code
I added unit tests for my changes where possible

semanticdiff-com · 2025-01-05T20:12:12Z

Review changes with

Changed Files

File	Status
crates/router/src/utils/user.rs	87% smaller
crates/router/src/utils/user_role.rs	82% smaller
crates/router/src/analytics.rs	73% smaller
crates/diesel_models/src/query/role.rs	72% smaller
crates/router/src/services/authorization.rs	56% smaller
crates/router/src/db/role.rs	45% smaller
crates/router/src/core/user_role/role.rs	38% smaller
crates/router/src/services/authorization/roles.rs	31% smaller
crates/router/src/core/user.rs	15% smaller
crates/router/src/db/kafka_store.rs	13% smaller
crates/router/src/core/user_role.rs	1% smaller
crates/diesel_models/src/query/user_role.rs	0% smaller
crates/diesel_models/src/role.rs	0% smaller
crates/diesel_models/src/schema.rs	0% smaller
crates/diesel_models/src/schema_v2.rs	0% smaller
crates/router/src/db/user_role.rs	0% smaller
migrations/2024-12-28-121104_add_column_tenant_id_to_roles/down.sql	Unsupported file format
migrations/2024-12-28-121104_add_column_tenant_id_to_roles/up.sql	Unsupported file format

ThisIsMani · 2025-01-07T07:50:39Z

crates/router/src/core/errors/user.rs

+    #[error("User role not found")]
+    UserRoleNotFound,


Can we remove this if this is not being used.

racnan · 2025-01-07T07:18:31Z

crates/diesel_models/src/query/user_role.rs

@@ -294,4 +294,34 @@ impl UserRole {
            },
        }
    }
+
+    pub async fn list_user_roles_by_user_id_across_tenants(


why is this required ?

Will be using this query in future, to search for a user across tenancies.

racnan · 2025-01-07T07:25:23Z

crates/router/src/core/errors/user.rs

@@ -110,6 +110,8 @@ pub enum UserErrors {
    MissingEmailConfig,
    #[error("Invalid Auth Method Operation: {0}")]
    InvalidAuthMethodOperationWithMessage(String),
+    #[error("User role not found")]
+    UserRoleNotFound,


racnan · 2025-01-07T07:26:29Z

crates/router/src/core/user.rs

+        user_from_token
+            .tenant_id
+            .as_ref()
+            .unwrap_or(&state.tenant.tenant_id),


this could be a util, seeing this code everywhere.

We will be removing option from tenant_id,

crates/router/src/analytics.rs

…d-memory-cache * 'main' of github.com:juspay/hyperswitch: chore(version): 2025.01.09.0 fix(cypress): backup and restore sessions when using user apis (#6978) feat(users): handle edge features for users in tenancy (#6990) chore(dynamic-fields): [Worldpay] update dynamic fields for payments (#7002) chore(version): 2025.01.08.0 fix: consider status of payment method before filtering wallets in list pm (#7004) feat(core): add columns unified error code and error message in refund table (#6933) feat(connector): [Fiuu] Consume transaction id for error cases for Fiuu (#6998) docs(cypress): update cypress documentation (#6956)

…r-verifyurl-in-redirection-handler * 'main' of github.com:juspay/hyperswitch: (30 commits) test(cypress): add test for In Memory Cache (juspay#6961) chore(version): 2025.01.09.1 fix(dummyconnector): add tenant id in dummyconnector requests (juspay#7008) chore(version): 2025.01.09.0 fix(cypress): backup and restore sessions when using user apis (juspay#6978) feat(users): handle edge features for users in tenancy (juspay#6990) chore(dynamic-fields): [Worldpay] update dynamic fields for payments (juspay#7002) chore(version): 2025.01.08.0 fix: consider status of payment method before filtering wallets in list pm (juspay#7004) feat(core): add columns unified error code and error message in refund table (juspay#6933) feat(connector): [Fiuu] Consume transaction id for error cases for Fiuu (juspay#6998) docs(cypress): update cypress documentation (juspay#6956) chore(version): 2025.01.07.0 chore(keymanager): add tenant-id to keymanager requests (juspay#6968) ci(cypress): Add Session Token Testcases (juspay#6683) Ci(Cypress): Add PML test and Dynamic Fields Test for Novalnet (juspay#6544) chore(version): 2025.01.06.0 ci(cypress): fix adyen sofort in cypress (juspay#6984) chore: add migrations for Currency type in DB (juspay#6980) chore(version): 2025.01.03.0 ...

…d-memory-cache * 'main' of github.com:juspay/hyperswitch: test(cypress): add test for In Memory Cache (#6961) chore(version): 2025.01.09.1 fix(dummyconnector): add tenant id in dummyconnector requests (#7008) chore(version): 2025.01.09.0 fix(cypress): backup and restore sessions when using user apis (#6978) feat(users): handle edge features for users in tenancy (#6990) chore(dynamic-fields): [Worldpay] update dynamic fields for payments (#7002) chore(version): 2025.01.08.0 fix: consider status of payment method before filtering wallets in list pm (#7004) feat(core): add columns unified error code and error message in refund table (#6933) feat(connector): [Fiuu] Consume transaction id for error cases for Fiuu (#6998) docs(cypress): update cypress documentation (#6956)

feat(users): handle edge cases for users in tenancy

6c41e8f

apoorvdixit88 added C-bug Category: Bug C-feature Category: Feature request or enhancement A-users Area: Users labels Jan 5, 2025

apoorvdixit88 self-assigned this Jan 5, 2025

apoorvdixit88 requested review from a team as code owners January 5, 2025 20:12

hyperswitch-bot bot added the M-database-changes Metadata: This PR involves database schema changes label Jan 5, 2025

apoorvdixit88 added 5 commits January 6, 2025 23:08

Merge branch 'main' into add-tenant-id-for-custom-roles

9f1ea7b

fix: show tenant in list

d999795

fix: spell check

279c517

fix: v2 schema check

f26e87c

fix: clippy checks

7ec920b

ThisIsMani reviewed Jan 7, 2025

View reviewed changes

racnan previously approved these changes Jan 7, 2025

View reviewed changes

apoorvdixit88 added 2 commits January 7, 2025 15:46

fix(users): correct global serach for tenant user

024df37

fix(users): remove error for user

a6f3758

apoorvdixit88 dismissed racnan’s stale review via a6f3758 January 7, 2025 10:20

dracarys18 previously approved these changes Jan 7, 2025

View reviewed changes

ThisIsMani previously approved these changes Jan 7, 2025

View reviewed changes

tsdk02 reviewed Jan 7, 2025

View reviewed changes

crates/router/src/analytics.rs Show resolved Hide resolved

fix: analytics variable declaration

68bff43

apoorvdixit88 dismissed stale reviews from ThisIsMani and dracarys18 via 68bff43 January 7, 2025 13:08

ThisIsMani approved these changes Jan 7, 2025

View reviewed changes

tsdk02 approved these changes Jan 7, 2025

View reviewed changes

Chethan-rao approved these changes Jan 8, 2025

View reviewed changes

dracarys18 approved these changes Jan 8, 2025

View reviewed changes

likhinbopanna added this pull request to the merge queue Jan 8, 2025

Merged via the queue into main with commit d04e840 Jan 8, 2025
17 of 19 checks passed

likhinbopanna deleted the add-tenant-id-for-custom-roles branch January 8, 2025 09:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(users): handle edge features for users in tenancy #6990

feat(users): handle edge features for users in tenancy #6990

apoorvdixit88 commented Jan 5, 2025 •

edited

Loading

semanticdiff-com bot commented Jan 5, 2025 •

edited

Loading

ThisIsMani Jan 7, 2025

racnan Jan 7, 2025

apoorvdixit88 Jan 7, 2025

racnan Jan 7, 2025

racnan Jan 7, 2025

apoorvdixit88 Jan 7, 2025

feat(users): handle edge features for users in tenancy #6990

feat(users): handle edge features for users in tenancy #6990

Conversation

apoorvdixit88 commented Jan 5, 2025 • edited Loading

Type of Change

Description

Additional Changes

Motivation and Context

How did you test it?

Checklist

semanticdiff-com bot commented Jan 5, 2025 • edited Loading

ThisIsMani Jan 7, 2025

Choose a reason for hiding this comment

racnan Jan 7, 2025

Choose a reason for hiding this comment

apoorvdixit88 Jan 7, 2025

Choose a reason for hiding this comment

racnan Jan 7, 2025

Choose a reason for hiding this comment

racnan Jan 7, 2025

Choose a reason for hiding this comment

apoorvdixit88 Jan 7, 2025

Choose a reason for hiding this comment

apoorvdixit88 commented Jan 5, 2025 •

edited

Loading

semanticdiff-com bot commented Jan 5, 2025 •

edited

Loading