Prevent '%{org_title} Plans' Section From Displaying Plans Created by Users From Other Organisations #3413
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
`render_respond_to_format_with_error_message` is called both when rescuing from Pundit::NotAuthorizedError and ActiveRecord::RecordNotFound. The method works properly with .html format, but prior to this change, ActionController::UnknownFormat was thrown for .pdf format.
- This commit changes the Plan.organisationally_or_publicly_visible(user) scope - Prior to this commit, we used `Org.org_admin_plans`. This would return any plan where plan.org_id = Org.id. In addition, it would return any plan where a user with user.org_id = Org.id had Administrator access on the plan. - This commit instead uses Org.owned_plans. This only returns plans where Creator access belongs to a user with user.org_id = Org.id.
Here, instead of first assigning to the `plan_ids` variable, we are directly referencing `user.org.owned_plans`. This change should not affect the query result of `scope :organisationally_or_publicly_visible`
Generated by 🚫 Danger |
Removing `rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized` from line 25, because the exact statement also exists on line 20 of this same file.
|
Closing this for now. More discussion is needed on how to resolve issue #3345. |
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.
Fixes #3345
Fixes #3414
Changes proposed in this PR:
app/controllers/application_controller.rbrender_respond_to_format_with_error_messagerender_respond_to_format_with_error_messageis called both when rescuing from Pundit::NotAuthorizedError and ActiveRecord::RecordNotFound. The method works properly with .html format, but prior to this change, ActionController::UnknownFormat was thrown for .pdf format.Edit
scope :organisationally_or_publicly_visibleOrg.org_admin_planswith newly createdOrg.owned_plans.Org.org_admin_planswould return any plan whereplan.org_id = Org.id. In addition, it would return any plan where a user with user.org_id = Org.id had Administrator access on the plan.Org.owned_plansonly returns plans where the Creator access for the plan belongs to a user with user.org_id = Org.id