A platform for community discussion. Free, open, simple.
FIX: Enable email settings for automatic groups
Jake Goldsborougha11cd8f23e80
diff --git a/app/models/group.rb b/app/models/group.rbindex c894e20e8ef..55a1469067f 100644--- a/app/models/group.rb+++ b/app/models/group.rb@@ -419,7 +419,7 @@ class Group < ActiveRecord::Baseenddef incoming_email_validator- return if automatic || incoming_email.blank?+ return if incoming_email.blank?incoming_email.split("|")diff --git a/app/serializers/basic_group_history_serializer.rb b/app/serializers/basic_group_history_serializer.rbindex 19aef46a952..96a3535a4be 100644--- a/app/serializers/basic_group_history_serializer.rb+++ b/app/serializers/basic_group_history_serializer.rb@@ -26,7 +26,7 @@ class BasicGroupHistorySerializer < ApplicationSerializerdef redact_email_setting_value(value)return value if value.blank?return value if !EMAIL_SETTING_SUBJECTS.include?(object.subject)- return value if scope&.can_admin_group?(object.group)+ return value if scope&.is_admin?I18n.t("staff_action_logs.redacted")enddiff --git a/frontend/discourse/app/components/groups-form-interaction-fields.gjs b/frontend/discourse/app/components/groups-form-interaction-fields.gjsindex d2cf11b0731..cebe0a66375 100644--- a/frontend/discourse/app/components/groups-form-interaction-fields.gjs+++ b/frontend/discourse/app/components/groups-form-interaction-fields.gjs@@ -47,11 +47,7 @@ export default class GroupsFormInteractionFields extends Component {}get showEmailSettings() {- return (- this.siteSettings.email_in &&- this.currentUser?.admin &&- !this.args.model?.automatic- );+ return this.siteSettings.email_in && this.currentUser?.admin;}get canAdminGroup() {diff --git a/frontend/discourse/app/controllers/group/manage.js b/frontend/discourse/app/controllers/group/manage.jsindex 22bbf1e0334..6ddbf6f0aed 100644--- a/frontend/discourse/app/controllers/group/manage.js+++ b/frontend/discourse/app/controllers/group/manage.js@@ -28,14 +28,14 @@ export default class GroupManageController extends Controller {title: "groups.manage.logs.title",});- if (!this.model?.automatic) {- if (this.siteSettings.enable_smtp) {- defaultTabs.splice(2, 0, {- route: "group.manage.email",- title: "groups.manage.email.title",- });- }+ if (this.siteSettings.enable_smtp) {+ defaultTabs.splice(2, 0, {+ route: "group.manage.email",+ title: "groups.manage.email.title",+ });+ }+ if (!this.model?.automatic) {defaultTabs.splice(1, 0, {route: "group.manage.membership",title: "groups.manage.membership.title",diff --git a/frontend/discourse/tests/acceptance/group-manage-email-settings-test.js b/frontend/discourse/tests/acceptance/group-manage-email-settings-test.jsindex b0f121461e9..d4735507d1e 100644--- a/frontend/discourse/tests/acceptance/group-manage-email-settings-test.js+++ b/frontend/discourse/tests/acceptance/group-manage-email-settings-test.js@@ -1,6 +1,8 @@import { click, currentRouteName, visit } from "@ember/test-helpers";import { test } from "qunit";import { GROUP_SMTP_SSL_MODES } from "discourse/lib/constants";+import { cloneJSON } from "discourse/lib/object";+import groupFixtures from "discourse/tests/fixtures/group-fixtures";import formKit from "discourse/tests/helpers/form-kit-helper";import { acceptance } from "discourse/tests/helpers/qunit-helpers";import { i18n } from "discourse-i18n";@@ -21,6 +23,59 @@ acceptance("Managing Group Email Settings - SMTP Disabled", function (needs) {});});+acceptance("Managing Automatic Group Email Settings", function (needs) {+ needs.user({ admin: true });+ needs.settings({ enable_smtp: true });++ needs.pretender((server, helper) => {+ server.get("/groups/moderators.json", () => {+ const fixture = cloneJSON(groupFixtures["/groups/moderators.json"]);+ fixture.group.can_admin_group = true;+ return helper.response(fixture);+ });+ server.post("/groups/50/test_email_settings", () => {+ return helper.response({ success: "OK" });+ });+ server.put("/groups/50", (request) => {+ const { group } = helper.parsePostData(request.requestBody);+ if (+ group.smtp_server === "smtp.gmail.com" &&+ group.email_username === "[email protected]" &&+ group.email_password === "password"+ ) {+ return helper.response({ success: "OK" });+ }+ return helper.response(422, { errors: ["Unexpected email settings"] });+ });+ });++ test("admins can configure SMTP for an automatic group", async function (assert) {+ await visit("/g/moderators/manage");++ assert.dom("a[href='/g/moderators/manage/email']").exists();+ assert.dom("a[href='/g/moderators/manage/membership']").doesNotExist();++ await click("a[href='/g/moderators/manage/email']");+ await click("#enable_smtp");+ await click("#prefill_smtp_gmail");+ await formKit().field("email_username").fillIn("[email protected]");+ await formKit().field("email_password").fillIn("password");+ await formKit().submit();+ await click(".group-manage-save");++ assert.dom(".group-manage-save-button > span").hasText("Saved!");+ });++ test("SMTP settings remain unavailable when SMTP is disabled", async function (assert) {+ this.siteSettings.enable_smtp = false;++ await visit("/g/moderators/manage/email");++ assert.dom("a[href='/g/moderators/manage/email']").doesNotExist();+ assert.strictEqual(currentRouteName(), "group.manage.profile");+ });+});+acceptance("Managing Group Email Settings - SMTP Enabled", function (needs) {needs.user();needs.settings({ enable_smtp: true });diff --git a/frontend/discourse/tests/acceptance/group-manage-interaction-test.js b/frontend/discourse/tests/acceptance/group-manage-interaction-test.jsindex b5d95229262..c6aa279219b 100644--- a/frontend/discourse/tests/acceptance/group-manage-interaction-test.js+++ b/frontend/discourse/tests/acceptance/group-manage-interaction-test.js@@ -1,5 +1,7 @@-import { visit } from "@ember/test-helpers";+import { click, fillIn, visit } from "@ember/test-helpers";import { test } from "qunit";+import { cloneJSON } from "discourse/lib/object";+import groupFixtures from "discourse/tests/fixtures/group-fixtures";import {acceptance,updateCurrentUser,@@ -63,6 +65,36 @@ acceptance("Managing Group Interaction Settings", function (needs) {});});+acceptance("Managing Automatic Group Incoming Email", function (needs) {+ needs.user({ admin: true });+ needs.settings({ email_in: true });++ needs.pretender((server, helper) => {+ server.get("/groups/moderators.json", () => {+ const fixture = cloneJSON(groupFixtures["/groups/moderators.json"]);+ fixture.group.can_admin_group = true;+ return helper.response(fixture);+ });+ server.put("/groups/50", (request) => {+ const { group } = helper.parsePostData(request.requestBody);+ return helper.response(+ group.incoming_email === "[email protected]" ? 200 : 422,+ { success: "OK" }+ );+ });+ });++ test("admins can set an automatic group's incoming email", async function (assert) {+ await visit("/g/moderators/manage/interaction");++ assert.dom(".groups-form-incoming-email").exists();+ await fillIn("input[name='incoming_email']", "[email protected]");+ await click(".group-manage-save");++ assert.dom(".group-manage-save-button > span").hasText("Saved!");+ });+});+acceptance("Managing Group Interaction Settings - Notification Levels",function (needs) {diff --git a/lib/group_updater.rb b/lib/group_updater.rbindex c2c8a936da3..af066bffefa 100644--- a/lib/group_updater.rb+++ b/lib/group_updater.rb@@ -59,22 +59,16 @@ class GroupUpdaterendattributes.push(:visibility_level, :members_visibility_level) if guardian.is_staff?+ attributes.push(:incoming_email) if guardian.is_staff?if !group.automatic && guardian.is_staff?- attributes.push(- :incoming_email,- :title,- :primary_group,- :name,- :grant_trust_level,- :publish_read_state,- )+ attributes.push(:title, :primary_group, :name, :grant_trust_level, :publish_read_state)custom_fields = DiscoursePluginRegistry.editable_group_custom_fieldsattributes << { custom_fields: custom_fields } if custom_fields.present?end- if !group.automatic && guardian.is_admin?+ if guardian.is_admin?attributes.push(:smtp_server,:smtp_port,diff --git a/spec/lib/email/receiver_spec.rb b/spec/lib/email/receiver_spec.rbindex 1add045cfa1..64ecf9affb8 100644--- a/spec/lib/email/receiver_spec.rb+++ b/spec/lib/email/receiver_spec.rb@@ -15,6 +15,20 @@ RSpec.describe Email::Receiver doEmail::Receiver.new(email(email_name), opts).process!end+ context "when email is addressed to an automatic group" do+ let(:group) { Group.find(Group::AUTO_GROUPS[:moderators]) }++ before { group.update!(incoming_email: "[email protected]") }++ it "creates a private message in the group inbox" do+ expect { process(:encoded_display_name) }.to change(Topic, :count).by(1)++ topic = Topic.last+ expect(topic).to be_private_message+ expect(topic.allowed_groups).to contain_exactly(group)+ end+ end+it "raises an EmptyEmailError when 'mail_string' is blank" doexpect { Email::Receiver.new(nil) }.to raise_error(Email::Receiver::EmptyEmailError)expect { Email::Receiver.new("") }.to raise_error(Email::Receiver::EmptyEmailError)diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rbindex aed82727656..df711f837e0 100644--- a/spec/models/group_spec.rb+++ b/spec/models/group_spec.rb@@ -226,6 +226,50 @@ RSpec.describe Group doexpect(group.valid?).to eq(true)end+ context "when an automatic group has an incoming email" do+ let(:group) { Group.find(Group::AUTO_GROUPS[:moderators]) }++ it "accepts valid incoming addresses" do+ group.incoming_email = "[email protected]|[email protected]"++ expect(group).to be_valid+ end++ it "rejects an invalid incoming address" do+ group.incoming_email = "invalid"++ expect(group).not_to be_valid+ end++ it "rejects an incoming address used by another group" do+ Fabricate(:group, incoming_email: "[email protected]")+ group.incoming_email = "[email protected]"++ expect(group).not_to be_valid+ expect(group.errors[:base]).to include(+ I18n.t(+ "groups.errors.email_already_used_in_group",+ email: "[email protected]",+ group_name: Group.find_by_email("[email protected]").name,+ ),+ )+ end++ it "rejects an incoming address used by a category" do+ category = Fabricate(:category, email_in: "[email protected]")+ group.incoming_email = "[email protected]"++ expect(group).not_to be_valid+ expect(group.errors[:base]).to include(+ I18n.t(+ "groups.errors.email_already_used_in_category",+ email: "[email protected]",+ category_name: category.name,+ ),+ )+ end+ end+context "when a group has no owners" dodescribe "group has not been persisted" doit "does not allow membership requests" dodiff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex ef3680a676f..44f91ba78ff 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -1598,6 +1598,73 @@ RSpec.describe GroupsController docontext "when user is group admin" dobefore { sign_in(admin) }+ context "with an automatic group" do+ let(:group) { Group.find(Group::AUTO_GROUPS[:moderators]) }++ it "updates incoming email and SMTP settings" do+ SiteSetting.enable_smtp = true++ put "/groups/#{group.id}.json",+ params: {+ group: {+ incoming_email: "[email protected]",+ smtp_server: "smtp.example.com",+ smtp_port: 587,+ smtp_ssl_mode: Group.smtp_ssl_modes[:starttls],+ smtp_enabled: true,+ email_username: "[email protected]",+ email_password: "password",+ email_from_alias: "[email protected]",+ allow_unknown_sender_topic_replies: true,+ name: "renamed",+ public_admission: true,+ },+ }++ expect(response.status).to eq(200)+ group.reload+ expect(group.incoming_email).to eq("[email protected]")+ expect(group.smtp_server).to eq("smtp.example.com")+ expect(group.smtp_port).to eq(587)+ expect(group.smtp_ssl_mode).to eq(Group.smtp_ssl_modes[:starttls])+ expect(group.smtp_enabled).to eq(true)+ expect(group.email_username).to eq("[email protected]")+ expect(group.email_password).to eq("password")+ expect(group.email_from_alias).to eq("[email protected]")+ expect(group.allow_unknown_sender_topic_replies).to eq(true)+ expect(group.smtp_updated_by).to eq(admin)+ expect(group.name).to eq("moderators")+ expect(group.public_admission).to eq(false)+ end++ it "rejects an invalid incoming email" do+ put "/groups/#{group.id}.json", params: { group: { incoming_email: "invalid" } }++ expect(response.status).to eq(422)+ expect(group.reload.incoming_email).to be_nil+ end++ it "clears SMTP settings when SMTP is disabled" do+ group.update!(+ smtp_enabled: true,+ smtp_server: "smtp.example.com",+ smtp_port: 587,+ email_username: "[email protected]",+ email_password: "password",+ )++ put "/groups/#{group.id}.json", params: { group: { smtp_enabled: false } }++ expect(response.status).to eq(200)+ group.reload+ expect(group.smtp_enabled).to eq(false)+ expect(group.smtp_server).to be_nil+ expect(group.smtp_port).to be_nil+ expect(group.email_username).to be_nil+ expect(group.email_password).to be_nil+ end+ end+it "updates the group" dogroup.update!(visibility_level: 2, members_visibility_level: 2, grant_trust_level: 0)@@ -1839,6 +1906,31 @@ RSpec.describe GroupsController dosign_in(moderator)end+ it "can update an automatic group's incoming email but not its SMTP credentials" do+ group = Group.find(Group::AUTO_GROUPS[:moderators])++ put "/groups/#{group.id}.json",+ params: {+ group: {+ incoming_email: "[email protected]",+ smtp_server: "smtp.example.com",+ smtp_port: 587,+ email_username: "[email protected]",+ email_password: "password",+ allow_unknown_sender_topic_replies: true,+ },+ }++ expect(response.status).to eq(200)+ group.reload+ expect(group.incoming_email).to eq("[email protected]")+ expect(group.smtp_server).to be_nil+ expect(group.email_username).to be_nil+ expect(group.email_password).to be_nil+ expect(group.smtp_enabled).to eq(false)+ expect(group.allow_unknown_sender_topic_replies).to eq(false)+ end+it "does not update the group when the site setting is disabled" doSiteSetting.moderators_manage_groups = false@@ -3126,6 +3218,50 @@ RSpec.describe GroupsController doenddescribe "#histories" do+ it "only exposes automatic group email history values to admins" do+ SiteSetting.enable_smtp = true+ SiteSetting.moderators_manage_groups = true+ group = Group.find(moderator_group_id)+ old_settings = {+ email_password: "old-password",+ email_username: "[email protected]",+ smtp_server: "old.example.com",+ smtp_port: 465,+ smtp_ssl_mode: Group.smtp_ssl_modes[:ssl_tls],+ }+ new_settings = {+ email_password: "new-password",+ email_username: "[email protected]",+ smtp_server: "new.example.com",+ smtp_port: 587,+ smtp_ssl_mode: Group.smtp_ssl_modes[:starttls],+ }+ group.update!(old_settings)+ sign_in(admin)++ put "/groups/#{group.id}.json", params: { group: new_settings }+ expect(response.status).to eq(200)++ get "/groups/#{group.name}/logs.json"+ expect(response.status).to eq(200)+ logs = response.parsed_body["logs"].index_by { |entry| entry["subject"] }+ new_settings.each do |subject, value|+ expect(logs.fetch(subject.to_s).values_at("prev_value", "new_value")).to eq(+ [old_settings.fetch(subject).to_s, value.to_s],+ )+ end++ sign_in(moderator)+ get "/groups/#{group.name}/logs.json"+ expect(response.status).to eq(200)+ logs = response.parsed_body["logs"].index_by { |entry| entry["subject"] }+ new_settings.each_key do |subject|+ expect(logs.fetch(subject.to_s).values_at("prev_value", "new_value")).to eq(+ [I18n.t("staff_action_logs.redacted")] * 2,+ )+ end+ end+context "when user is not signed in" doit "raises the expected error" doget "/groups/#{group.name}/logs.json"