Browse Source

CLDC-1800 Update provider relationships permissions (#1729)

* Do not allow adding stock owners as data providers

* Do not allow removing stock owners as data providers

* Do not allow adding managing agents as data providers

* Do not allow removing managing agents as data providers and fix remove_stock_owner

* Authorise add managing agent/stock owner pages

* Refactor organisation_relationship_policy

* Update test names

* Refactor policy and remove headers from tests
pull/1749/head
kosiakkatrina 2 years ago committed by GitHub
parent
commit
0b55fd93d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      app/controllers/organisation_relationships_controller.rb
  2. 21
      app/policies/organisation_relationship_policy.rb
  3. 98
      spec/requests/organisation_relationships_controller_spec.rb

20
app/controllers/organisation_relationships_controller.rb

@ -33,14 +33,17 @@ class OrganisationRelationshipsController < ApplicationController
def add_stock_owner def add_stock_owner
@organisation_relationship = organisation.parent_organisation_relationships.new @organisation_relationship = organisation.parent_organisation_relationships.new
authorize @organisation_relationship
end end
def add_managing_agent def add_managing_agent
@organisation_relationship = organisation.child_organisation_relationships.new @organisation_relationship = organisation.child_organisation_relationships.new
authorize @organisation_relationship
end end
def create_stock_owner def create_stock_owner
@organisation_relationship = organisation.parent_organisation_relationships.new(organisation_relationship_params) @organisation_relationship = organisation.parent_organisation_relationships.new(organisation_relationship_params)
authorize @organisation_relationship
if @organisation_relationship.save(context: :stock_owner) if @organisation_relationship.save(context: :stock_owner)
flash[:notice] = "#{@organisation_relationship.parent_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} stock owners" flash[:notice] = "#{@organisation_relationship.parent_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} stock owners"
redirect_to stock_owners_organisation_path redirect_to stock_owners_organisation_path
@ -52,6 +55,7 @@ class OrganisationRelationshipsController < ApplicationController
def create_managing_agent def create_managing_agent
@organisation_relationship = organisation.child_organisation_relationships.new(organisation_relationship_params) @organisation_relationship = organisation.child_organisation_relationships.new(organisation_relationship_params)
authorize @organisation_relationship
if @organisation_relationship.save if @organisation_relationship.save
flash[:notice] = "#{@organisation_relationship.child_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} managing agents" flash[:notice] = "#{@organisation_relationship.child_organisation.name} is now one of #{current_user.data_coordinator? ? 'your' : "this organisation's"} managing agents"
redirect_to managing_agents_organisation_path redirect_to managing_agents_organisation_path
@ -61,7 +65,13 @@ class OrganisationRelationshipsController < ApplicationController
end end
end end
def remove_stock_owner; end def remove_stock_owner
organisation_relationship = OrganisationRelationship.find_by!(
parent_organisation: @target_organisation,
child_organisation: organisation,
)
authorize organisation_relationship
end
def delete_stock_owner def delete_stock_owner
OrganisationRelationship.find_by!( OrganisationRelationship.find_by!(
@ -72,7 +82,13 @@ class OrganisationRelationshipsController < ApplicationController
redirect_to stock_owners_organisation_path redirect_to stock_owners_organisation_path
end end
def remove_managing_agent; end def remove_managing_agent
organisation_relationship = OrganisationRelationship.find_by!(
parent_organisation: organisation,
child_organisation: @target_organisation,
)
authorize organisation_relationship
end
def delete_managing_agent def delete_managing_agent
OrganisationRelationship.find_by!( OrganisationRelationship.find_by!(

21
app/policies/organisation_relationship_policy.rb

@ -0,0 +1,21 @@
class OrganisationRelationshipPolicy
attr_reader :user, :organisation_relationship
def initialize(user, organisation_relationship)
@user = user
@organisation_relationship = organisation_relationship
end
%w[
add_stock_owner?
create_stock_owner?
remove_stock_owner?
add_managing_agent?
create_managing_agent?
remove_managing_agent?
].each do |method_name|
define_method method_name do
!user.data_provider?
end
end
end

98
spec/requests/organisation_relationships_controller_spec.rb

@ -296,6 +296,94 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
end end
end end
context "when directly accessing the page to add a stock owner" do
let(:request) { get "/organisations/#{organisation.id}/stock-owners/add" }
it "returns 401" do
request
expect(response).to have_http_status(:unauthorized)
end
end
context "when directly adding a stock owner" do
let!(:stock_owner) { FactoryBot.create(:organisation) }
let(:params) do
{
"organisation_relationship": {
"parent_organisation_id": stock_owner.id,
},
}
end
let(:request) { post "/organisations/#{organisation.id}/stock-owners", params: }
it "returns 401" do
request
expect(response).to have_http_status(:unauthorized)
end
it "does not create a new organisation relationship" do
expect { request }.not_to change(OrganisationRelationship, :count)
end
end
context "when directly removing a stock owner" do
let(:stock_owner) { FactoryBot.create(:organisation) }
let(:request) { get "/organisations/#{organisation.id}/stock-owners/remove?target_organisation_id=#{stock_owner.id}" }
before do
FactoryBot.create(:organisation_relationship, parent_organisation: stock_owner, child_organisation: organisation)
end
it "returns 401" do
request
expect(response).to have_http_status(:unauthorized)
end
end
context "when directly accessing the page to add a managing agent" do
let(:request) { get "/organisations/#{organisation.id}/managing-agents/add" }
it "returns 401" do
request
expect(response).to have_http_status(:unauthorized)
end
end
context "when directly adding a managing agent" do
let!(:managing_agent) { FactoryBot.create(:organisation) }
let(:params) do
{
"organisation_relationship": {
"child_organisation_id": managing_agent.id,
},
}
end
let(:request) { post "/organisations/#{organisation.id}/managing-agents", params: }
it "returns 401" do
request
expect(response).to have_http_status(:unauthorized)
end
it "does not create a new organisation relationship" do
expect { request }.not_to change(OrganisationRelationship, :count)
end
end
context "when directly removing a managing agent" do
let(:managing_agent) { FactoryBot.create(:organisation) }
let(:request) { get "/organisations/#{organisation.id}/managing-agents/remove?target_organisation_id=#{managing_agent.id}" }
before do
FactoryBot.create(:organisation_relationship, parent_organisation: organisation, child_organisation: managing_agent)
end
it "returns 401" do
request
expect(response).to have_http_status(:unauthorized)
end
end
context "when accessing the managing agents tab" do context "when accessing the managing agents tab" do
context "with an organisation that the user belongs to" do context "with an organisation that the user belongs to" do
let!(:managing_agent) { FactoryBot.create(:organisation) } let!(:managing_agent) { FactoryBot.create(:organisation) }
@ -333,16 +421,6 @@ RSpec.describe OrganisationRelationshipsController, type: :request do
end end
end end
context "when adding a managing agent" do
before do
get "/organisations/#{organisation.id}/managing-agents/add", headers:, params: {}
end
it "has the correct header" do
expect(response.body).to include("What is the name of your managing agent?")
end
end
context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do
before do before do
get "/organisations/#{unauthorised_organisation.id}/managing-agents", headers:, params: {} get "/organisations/#{unauthorised_organisation.id}/managing-agents", headers:, params: {}

Loading…
Cancel
Save