feat(users): add tenant id reads in user roles #6661
+336
−126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
apoorvdixit88
added
C-feature
apoorvdixit88
requested review from
jagan-jaya,
dracarys18,
racnan and
ThisIsMani
|
Review changes with Changed Files
|
ThisIsMani
reviewed
Nov 26, 2024
racnan
reviewed
Nov 26, 2024
| @@ -1864,6 +1864,7 @@ pub mod routes { | |||
| .global_store | |||
| .list_user_roles_by_user_id(ListUserRolesByUserIdPayload { | |||
| user_id: &auth.user_id, | |||
| tenant_id: auth.tenant_id.as_ref().unwrap_or(&state.tenant.tenant_id), | |||
There was a problem hiding this comment.
If default value if taken for tenant id not being present in auth token, then won't a user be able to access any tenancy if user gets access to a token with tenant_id: None.
Are we ensuring tenant_id will never be null ?
There was a problem hiding this comment.
Tenant_id will always be present in token, i kept it option just for backward compatibility. We will be making it non option after one two deployments.
Also token tenant's id and state tenant id should be same, so we can use any. We are checking for this only in authentication part.
Moreover currently the feature is disabled, so we won't be having different tenancy support.
ThisIsMani
previously approved these changes
Nov 26, 2024
tsdk02
previously approved these changes
Nov 26, 2024
dracarys18
approved these changes
Nov 27, 2024
tsdk02
approved these changes
Nov 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of Change
Description
Support tenant id in user roles queries.
Additional Changes
Motivation and Context
Closes #6660
How did you test it?
With tenancy feature flag enabled these changes will be tested when upcoming tenant related PRs from dashboard gets merged.
The current behaviour of user apis should not change. Since hyperswitch has its own tenant id and we don't have tenant_id feature flag enabled for now.
Tested the sanity flows for users. Working as expected.
Checklist
cargo +nightly fmt --allcargo clippy