Skip to content

A platform for community discussion. Free, open, simple.

DEV: Add descriptive error message when creating requestable group with no owner (#40391)

Ted Johansson66d5bfb309fd
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index 167f8021452..eb98530872b 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -16,6 +16,13 @@ class Admin::GroupsController < Admin::StaffController
) do |result|
on_success { |group:| render_serialized(group, BasicGroupSerializer) }
on_failed_policy(:can_create_group) { |policy| raise Discourse::InvalidAccess }
+ on_failed_policy(:can_request_access) do
+ render json:
+ failed_json.merge(
+ errors: [I18n.t("groups.errors.cant_allow_membership_requests")],
+ ),
+ status: :unprocessable_entity
+ end
on_failure { render(json: failed_json, status: :unprocessable_entity) }
end
end
diff --git a/app/services/groups/create.rb b/app/services/groups/create.rb
index db5d2cf65e7..0bc025f94e3 100644
--- a/app/services/groups/create.rb
+++ b/app/services/groups/create.rb
@@ -108,6 +108,7 @@ class Groups::Create
end
policy :can_create_group
+ policy :can_request_access
model :user_attributes, :build_user_attributes, optional: true
model :group, :instantiate_group
only_if(:should_associate_groups) { step :associate_groups }
@@ -123,6 +124,10 @@ class Groups::Create
guardian.can_create_group?
end
+ def can_request_access(params:)
+ params.owner_ids.present? || !params.allow_membership_requests
+ end
+
def build_user_attributes(params:)
params.owner_ids.map { { user_id: it, owner: true } } + params.user_ids.map { { user_id: it } }
end
diff --git a/spec/services/groups/create_spec.rb b/spec/services/groups/create_spec.rb
index ed4900f6dd6..b3db3473bd7 100644
--- a/spec/services/groups/create_spec.rb
+++ b/spec/services/groups/create_spec.rb
@@ -137,6 +137,12 @@ RSpec.describe Groups::Create do
it { is_expected.to fail_a_policy(:can_create_group) }
end
+ context "when creating a group with access requests and no owner" do
+ let(:params) { { name: "requestable", allow_membership_requests: true, owner_usernames: [] } }
+
+ it { is_expected.to fail_a_policy(:can_request_access) }
+ end
+
context "when data is invalid" do
let(:params) { { name: nil } }