A platform for community discussion. Free, open, simple.
FIX: Ensure moderators do not clear group email domain (#39631)
Natalie Tay8980779ae5aa
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rbindex dfc086117c0..167f8021452 100644--- a/app/controllers/admin/groups_controller.rb+++ b/app/controllers/admin/groups_controller.rb@@ -69,6 +69,7 @@ class Admin::GroupsController < Admin::StaffControllerenddef automatic_membership_count+ guardian.ensure_can_create_group!domains = Group.get_valid_email_domains(params.require(:automatic_membership_email_domains))group_id = params[:id]user_count = 0diff --git a/app/serializers/group_show_serializer.rb b/app/serializers/group_show_serializer.rbindex 315bd16635c..9f846df8f10 100644--- a/app/serializers/group_show_serializer.rb+++ b/app/serializers/group_show_serializer.rb@@ -20,8 +20,13 @@ class GroupShowSerializer < BasicGroupSerializerhas_one :smtp_updated_by, embed: :object, serializer: BasicUserSerializer- admin_attributes :automatic_membership_email_domains,- :smtp_server,+ attributes :automatic_membership_email_domains++ def include_automatic_membership_email_domains?+ scope.can_admin_group?(object)+ end++ admin_attributes :smtp_server,:smtp_port,:smtp_ssl_mode,:smtp_enabled,diff --git a/config/routes.rb b/config/routes.rbindex d8e4d26563c..1090aff81ab 100644--- a/config/routes.rb+++ b/config/routes.rb@@ -128,10 +128,9 @@ Discourse::Application.routes.draw dodelete "owners" => "groups#remove_owner"put "primary" => "groups#set_primary"end- end- resources :groups, only: [:destroy], constraints: AdminConstraint.new docollection { put "automatic_membership_count" => "groups#automatic_membership_count" }end+ resources :groups, only: [:destroy], constraints: AdminConstraint.newresources :users, id: RouteFormat.username, only: %i[index destroy] docollection dodiff --git a/spec/requests/admin/groups_controller_spec.rb b/spec/requests/admin/groups_controller_spec.rbindex 78ddc595574..311a4705d4a 100644--- a/spec/requests/admin/groups_controller_spec.rb+++ b/spec/requests/admin/groups_controller_spec.rb@@ -495,13 +495,32 @@ RSpec.describe Admin::GroupsController docontext "with moderators_manage_groups enabled" dobefore { SiteSetting.moderators_manage_groups = true }- include_examples "automatic membership count inaccessible"+ it "returns count of users whose emails match the domain" do+ Fabricate(:user, email: "[email protected]")++ put "/admin/groups/automatic_membership_count.json",+ params: {+ automatic_membership_email_domains: "somedomain.org",+ id: group.id,+ }++ expect(response.status).to eq(200)+ expect(response.parsed_body["user_count"]).to eq(1)+ endendcontext "with moderators_manage_groups disabled" dobefore { SiteSetting.moderators_manage_groups = false }- include_examples "automatic membership count inaccessible"+ it "denies access with a 403 response" do+ put "/admin/groups/automatic_membership_count.json",+ params: {+ automatic_membership_email_domains: "somedomain.org",+ id: group.id,+ }++ expect(response.status).to eq(403)+ endendenddiff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex 32a1bfc58fa..206e6e10dad 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -535,6 +535,22 @@ RSpec.describe GroupsController dodescribe "when accessing by id" doinclude_examples "group show behavior", "/groups/by-id", :idend++ context "as a moderator with moderators_manage_groups enabled" do+ before { SiteSetting.moderators_manage_groups = true }++ it "includes automatic_membership_email_domains in the response" do+ group.update!(automatic_membership_email_domains: "test.org")+ sign_in(moderator)++ get "/groups/#{group.name}.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["group"]["automatic_membership_email_domains"]).to eq(+ "test.org",+ )+ end+ endenddescribe "#mentions" dodiff --git a/spec/serializers/group_show_serializer_spec.rb b/spec/serializers/group_show_serializer_spec.rbindex ce670176366..8646fce580d 100644--- a/spec/serializers/group_show_serializer_spec.rb+++ b/spec/serializers/group_show_serializer_spec.rb@@ -56,6 +56,19 @@ RSpec.describe GroupShowSerializer dodescribed_class.new(group, scope: Guardian.new, root: false, owner_group_ids: [group.id])expect(subject.as_json[:automatic_membership_email_domains]).to eq(nil)end++ it "should include email domains for moderator when moderators_manage_groups is enabled" do+ SiteSetting.moderators_manage_groups = true+ moderator_guardian = Fabricate(:moderator).guardian+ subject =+ described_class.new(+ group,+ scope: moderator_guardian,+ root: false,+ owner_group_ids: [group.id],+ )+ expect(subject.as_json[:automatic_membership_email_domains]).to eq("ilovediscourse.com")+ endenddescribe "admin only fields" do