A platform for community discussion. Free, open, simple.
FIX: Assignments tab can render for groups whose member list is forbidden, leading to a guaranteed 403 (#40006)
Isaac Janzende960665f4ab
diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjsindex 589dd2bc9f7..f51c1169643 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/group-reports-nav-item/assigned-topic-list.gjs@@ -6,7 +6,11 @@ import GroupAssignedMenuItem from "../../components/group-assigned-menu-item";@tagName("")export default class AssignedTopicList extends Component {static shouldRender(args, context) {- return context.currentUser?.can_assign && args.group.can_show_assigned_tab;+ return (+ context.currentUser?.can_assign &&+ args.group.can_show_assigned_tab &&+ args.group.can_see_members+ );}<template>diff --git a/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js b/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.jsindex ac8f7633d0f..48ae81016ec 100644--- a/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js+++ b/plugins/discourse-assign/test/javascripts/acceptance/group-assignments-test.js@@ -1,12 +1,22 @@import { visit } from "@ember/test-helpers";import { test } from "qunit";-import { acceptance } from "discourse/tests/helpers/qunit-helpers";+import { cloneJSON } from "discourse/lib/object";+import GroupFixtures from "discourse/tests/fixtures/group-fixtures";+import {+ acceptance,+ updateCurrentUser,+} from "discourse/tests/helpers/qunit-helpers";import AssignedTopics from "../fixtures/assigned-group-assignments-fixtures";import GroupMembers from "../fixtures/group-members-fixtures";+let canSeeMembers = true;+acceptance("GroupAssignments", function (needs) {needs.user();needs.settings({ assign_enabled: true, assigns_user_url_path: "/" });+ needs.hooks.beforeEach(() => {+ canSeeMembers = true;+ });needs.pretender((server, helper) => {const groupPath = "/topics/group-topics-assigned/discourse.json";const memberPath = "/topics/messages-assigned/ahmedgagan6.json";@@ -14,6 +24,12 @@ acceptance("GroupAssignments", function (needs) {const groupAssigns = AssignedTopics[groupPath];const memberAssigns = AssignedTopics[memberPath];const getMembers = GroupMembers[getMembersPath];+ server.get("/groups/discourse.json", () => {+ const response = cloneJSON(GroupFixtures["/groups/discourse.json"]);+ response.group.can_show_assigned_tab = true;+ response.group.can_see_members = canSeeMembers;+ return helper.response(response);+ });server.get(groupPath, () => helper.response(groupAssigns));server.get(memberPath, () => helper.response(memberAssigns));server.get(getMembersPath, () => helper.response(getMembers));@@ -28,4 +44,13 @@ acceptance("GroupAssignments", function (needs) {await visit("/g/discourse/assigned/ahmedgagan6");assert.dom(".topic-list-item").exists({ count: 1 });});++ test("does not show the Assignments tab when group members are hidden", async function (assert) {+ updateCurrentUser({ can_assign: true });+ canSeeMembers = false;++ await visit("/g/discourse");++ assert.dom(".assigned-topic-list").doesNotExist();+ });});