A platform for community discussion. Free, open, simple.
DEV: Minor fixes for granular_anonymous_and_logged_in_groups_permissions upcoming change (#43063)
Martin Brennan5f72eb0203fc
diff --git a/app/models/site.rb b/app/models/site.rbindex b37d81f41b5..c6bfa2fefa8 100644--- a/app/models/site.rb+++ b/app/models/site.rb@@ -219,7 +219,7 @@ class Site@guardian.user,"groups.name ASC",include_everyone: !SiteSetting.granular_anonymous_and_logged_in_groups_permissions,- include_pseudogroups: SiteSetting.granular_anonymous_and_logged_in_groups_permissions,+ include_pseudogroups: true,).includes(:flair_upload)query = DiscoursePluginRegistry.apply_modifier(:site_groups_query, query, self)diff --git a/app/models/theme.rb b/app/models/theme.rbindex a5f06572ff4..1d69e98df7d 100644--- a/app/models/theme.rb+++ b/app/models/theme.rb@@ -795,15 +795,15 @@ class Theme < ActiveRecord::Baseenddef cached_settings- Theme.get_set_cache "settings_for_theme_#{id}" do+ Theme.get_set_cache "settings_for_theme_#{id}_#{group_setting_alias_enabled?}" dobuild_settings_hashendenddef cached_default_settings- Theme.get_set_cache "default_settings_for_theme_#{id}" do+ Theme.get_set_cache "default_settings_for_theme_#{id}_#{group_setting_alias_enabled?}" dosettings_hash = {}- settings.each { |name, setting| settings_hash[name] = setting.default }+ settings.each { |name, setting| settings_hash[name] = setting.default_value }theme_uploads = build_theme_uploads_hashsettings_hash["theme_uploads"] = theme_uploads if theme_uploads.present?@@ -1140,6 +1140,10 @@ class Theme < ActiveRecord::Baseattr_accessor :theme_setting_requests_refresh+ def group_setting_alias_enabled?+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions+ end+def theme_fields_to_tree(theme_fields_scope)theme_fields_scope.reduce({}) do |tree, theme_field|tree[theme_field.file_path] = theme_field.valuediff --git a/app/serializers/theme_settings_serializer.rb b/app/serializers/theme_settings_serializer.rbindex 7e4154b7535..0fed1d3b858 100644--- a/app/serializers/theme_settings_serializer.rb+++ b/app/serializers/theme_settings_serializer.rb@@ -32,7 +32,7 @@ class ThemeSettingsSerializer < ApplicationSerializerenddef value- object.value+ object.value_for_editingenddef descriptiondiff --git a/frontend/discourse/admin/components/site-settings/group-list.gjs b/frontend/discourse/admin/components/site-settings/group-list.gjsindex 900c1a224ed..5edeae434b2 100644--- a/frontend/discourse/admin/components/site-settings/group-list.gjs+++ b/frontend/discourse/admin/components/site-settings/group-list.gjs@@ -40,7 +40,9 @@ export default class GroupList extends Component {return choiceIds.map((id) => {const group = groupsById[id];- return group ? { name: group.name, id } : null;+ const name =+ group.name === "everyone" ? "everyone (legacy)" : group.name;+ return group ? { name, id } : null;}).filter(Boolean);}diff --git a/frontend/discourse/admin/components/site-settings/group.gjs b/frontend/discourse/admin/components/site-settings/group.gjsindex 0b3404293d6..d4c7c059418 100644--- a/frontend/discourse/admin/components/site-settings/group.gjs+++ b/frontend/discourse/admin/components/site-settings/group.gjs@@ -15,7 +15,10 @@ export default class Group extends Component {return (this.site.groups || []).filter((g) => !disallowed.includes(g.id.toString()))- .map((g) => ({ name: g.name, id: g.id.toString() }));+ .map((g) => {+ const name = g.name === "everyone" ? "everyone (legacy)" : g.name;+ return { name, id: g.id.toString() };+ });}@actiondiff --git a/frontend/discourse/app/components/setting-field/group-list.gjs b/frontend/discourse/app/components/setting-field/group-list.gjsindex 0830f5ca926..30a28ca5342 100644--- a/frontend/discourse/app/components/setting-field/group-list.gjs+++ b/frontend/discourse/app/components/setting-field/group-list.gjs@@ -37,7 +37,9 @@ export default class SettingFieldGroupList extends Component {).map((id) => {const group = groupsById[id];- return group ? { name: group.name, id } : null;+ const name =+ group.name === "everyone" ? "everyone (legacy)" : group.name;+ return group ? { name, id } : null;}).filter(Boolean);}diff --git a/frontend/discourse/app/components/setting-field/group.gjs b/frontend/discourse/app/components/setting-field/group.gjsindex 0f656651e41..b4b0e4c5609 100644--- a/frontend/discourse/app/components/setting-field/group.gjs+++ b/frontend/discourse/app/components/setting-field/group.gjs@@ -13,7 +13,10 @@ export default class SettingFieldGroup extends Component {return (this.site.groups || []).filter((group) => !disallowed.includes(group.id.toString()))- .map((group) => ({ name: group.name, id: group.id.toString() }));+ .map((g) => {+ const name = g.name === "everyone" ? "everyone (legacy)" : g.name;+ return { name, id: g.id.toString() };+ });}get groupId() {diff --git a/lib/guardian.rb b/lib/guardian.rbindex 7210f20d62a..1fef68f6828 100644--- a/lib/guardian.rb+++ b/lib/guardian.rb@@ -103,7 +103,10 @@ class Guardiandef in_any_groups?(group_ids)if !SiteSetting.granular_anonymous_and_logged_in_groups_permissions- return group_ids.include?(Group::AUTO_GROUPS[:everyone])+ return(+ group_ids.include?(Group::AUTO_GROUPS[:everyone]) ||+ group_ids.include?(Group::AUTO_GROUPS[:anonymous_users])+ )endgroup_ids.include?(Group::AUTO_GROUPS[:anonymous_users])diff --git a/lib/theme_settings_manager.rb b/lib/theme_settings_manager.rbindex 56b25d9ca02..db67d063b13 100644--- a/lib/theme_settings_manager.rb+++ b/lib/theme_settings_manager.rb@@ -36,7 +36,15 @@ class ThemeSettingsManagerenddef value- has_record? ? db_record.value : default+ configured_value+ end++ def default_value+ default+ end++ def value_for_editing+ valueenddef type_name@@ -106,4 +114,10 @@ class ThemeSettingsManagermax = @opts[:max](max.is_a?(::Integer) || max.is_a?(::Float)) && max != ::Float::INFINITYend++ protected++ def configured_value+ has_record? ? db_record.value : default+ endenddiff --git a/lib/theme_settings_manager/list.rb b/lib/theme_settings_manager/list.rbindex 202710e1ff4..ee6b304b421 100644--- a/lib/theme_settings_manager/list.rb+++ b/lib/theme_settings_manager/list.rb@@ -1,6 +1,20 @@# frozen_string_literal: trueclass ThemeSettingsManager::List < ThemeSettingsManager+ def value+ alias_everyone_to_logged_in_users(super)+ end++ def default_value+ alias_everyone_to_logged_in_users(super)+ end++ def value_for_editing+ return super if list_type != "group"++ configured_value+ end+def list_type@opts[:list_type]end@@ -17,4 +31,17 @@ class ThemeSettingsManager::List < ThemeSettingsManagersuperend++ private++ def alias_everyone_to_logged_in_users(value)+ if list_type != "group" || !SiteSetting.granular_anonymous_and_logged_in_groups_permissions+ return value+ end++ everyone_id = Group::AUTO_GROUPS[:everyone].to_s+ logged_in_users_id = Group::AUTO_GROUPS[:logged_in_users].to_s++ value.to_s.split("|").map { |id| id == everyone_id ? logged_in_users_id : id }.uniq.join("|")+ endenddiff --git a/spec/lib/theme_settings_manager_spec.rb b/spec/lib/theme_settings_manager_spec.rbindex 254eac23ea5..4808c63e3c0 100644--- a/spec/lib/theme_settings_manager_spec.rb+++ b/spec/lib/theme_settings_manager_spec.rb@@ -159,6 +159,44 @@ RSpec.describe ThemeSettingsManager doexpect(theme.reload.settings[:groups_setting].value).to eq("2|3")end+ it "aliases everyone to logged_in_users at read time for group list settings" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ yaml = <<~YAML+ groups_setting:+ type: list+ list_type: group+ default: "0|5|2"+ YAML+ theme.set_field(target: :settings, name: "yaml", value: yaml)+ theme.save!++ setting = theme.settings[:groups_setting]+ setting.value = "0|5|1"+ setting = theme.reload.settings[:groups_setting]++ expect(setting.value).to eq("5|1")+ expect(setting.default_value).to eq("5|2")+ expect(setting.value_for_editing).to eq("0|5|1")+ expect(theme.theme_settings.find_by(name: "groups_setting").value).to eq("0|5|1")+ end++ it "leaves everyone unchanged when granular group permissions are disabled" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = false+ yaml = <<~YAML+ groups_setting:+ type: list+ list_type: group+ default: "0|1"+ YAML+ theme.set_field(target: :settings, name: "yaml", value: yaml)+ theme.save!++ setting = theme.settings[:groups_setting]++ expect(setting.value).to eq("0|1")+ expect(setting.default_value).to eq("0|1")+ end+describe "#resolve_group_membership?" doit "returns true when opted-in with list_type group" doyaml = <<~YAMLdiff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rbindex 3947cbe02d9..b9963804d32 100644--- a/spec/models/theme_spec.rb+++ b/spec/models/theme_spec.rb@@ -329,6 +329,24 @@ RSpec.describe Theme doexpect(theme.reload.cached_settings).to include(name: "bill")end+ it "updates cached group list aliases when granular group permissions change" do+ theme.set_field(target: :settings, name: :yaml, value: <<~YAML)+ allowed_groups:+ type: list+ list_type: group+ default: "0|1"+ YAML+ theme.save!++ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = false+ expect(theme.cached_settings[:allowed_groups]).to eq("0|1")+ expect(theme.cached_default_settings[:allowed_groups]).to eq("0|1")++ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ expect(theme.cached_settings[:allowed_groups]).to eq("5|1")+ expect(theme.cached_default_settings[:allowed_groups]).to eq("5|1")+ end+it "records the plugins a theme statically imports from" dotheme.set_field(target: :extra_js, name: "discourse/initializers/my-init.js", value: <<~JS)import Thing from "discourse/plugins/some-plugin/lib/thing";diff --git a/spec/serializers/theme_settings_serializer_spec.rb b/spec/serializers/theme_settings_serializer_spec.rbindex 7cd319e9585..f8475ad77c9 100644--- a/spec/serializers/theme_settings_serializer_spec.rb+++ b/spec/serializers/theme_settings_serializer_spec.rb@@ -56,6 +56,24 @@ RSpec.describe ThemeSettingsSerializer doendend+ describe "#value" do+ it "serializes the unaliased group list value for editing" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ theme.set_field(target: :settings, name: "yaml", value: <<~YAML)+ groups_setting:+ type: list+ list_type: group+ default: "0|1"+ YAML+ theme.save!+ theme.settings[:groups_setting].value = "0|2"++ payload = ThemeSettingsSerializer.new(theme.reload.settings[:groups_setting]).as_json++ expect(payload[:theme_settings][:value]).to eq("0|2")+ end+ end+describe "#valid_values" dofab!(:theme_with_enum, :theme)