Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
🔒️ Show access denied to non-admins on the members page (#3352)
Luke Vella53c413bfbc9f
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex bbc41a176..070b41bf6 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -523,6 +523,7 @@"memberInactive": "Inactive","memberInvitedBy": "Invited by {inviterName}","members": "Members",+ "membersAdminRequired": "Only space admins can manage members.","membersInactiveAlertDescription": "These members lost access when this space's Pro subscription ended. Their seats are kept and access is restored when the space is upgraded again.","membersInactiveAlertTitle": "Members are inactive","membersListActions": "Actions",diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsxindex 99d0e7efb..af3249e8c 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/members/members-page.tsx@@ -5,7 +5,13 @@ import {AlertDescription,AlertTitle,} from "@rallly/ui/alert";-import { InfoIcon, SparklesIcon } from "lucide-react";+import { InfoIcon, ShieldXIcon, SparklesIcon } from "lucide-react";+import {+ EmptyState,+ EmptyStateDescription,+ EmptyStateIcon,+ EmptyStateTitle,+} from "@/components/empty-state";import { Link } from "@/components/link";import { ListViewActions } from "@/components/list-view";import { defineAbilityForSpace } from "@/features/space/ability";@@ -33,10 +39,19 @@ async function getMemberAbility() {});}+// Member management is admin only: the sidebar and home tile hide the page+// from members, and a direct link lands on the denied state below.+function isSpaceAdmin(space: { role: string }) {+ return space.role === "admin";+}+export async function MembersPageActions() {const space = await loadActiveSpace();- if (defineAbilityForSpace(space).cannot("invite", "Member")) {+ if (+ !isSpaceAdmin(space) ||+ defineAbilityForSpace(space).cannot("invite", "Member")+ ) {return null;}@@ -64,8 +79,28 @@ export async function MembersPageActions() {}export async function MembersPageContent() {- const [space, members, seatUsage, memberAbility] = await Promise.all([- loadActiveSpace(),+ const space = await loadActiveSpace();++ if (!isSpaceAdmin(space)) {+ return (+ <EmptyState className="h-96">+ <EmptyStateIcon>+ <ShieldXIcon />+ </EmptyStateIcon>+ <EmptyStateTitle>+ <Trans i18nKey="accessDenied" defaults="Access denied" />+ </EmptyStateTitle>+ <EmptyStateDescription>+ <Trans+ i18nKey="membersAdminRequired"+ defaults="Only space admins can manage members."+ />+ </EmptyStateDescription>+ </EmptyState>+ );+ }++ const [members, seatUsage, memberAbility] = await Promise.all([loadSpaceMembers(),loadSeatUsage(),getMemberAbility(),diff --git a/apps/web/tests/space-members.spec.ts b/apps/web/tests/space-members.spec.tsindex 139974e74..01e85129b 100644--- a/apps/web/tests/space-members.spec.ts+++ b/apps/web/tests/space-members.spec.ts@@ -37,9 +37,12 @@ async function createSpaceAdmin({async function createMemberInDb({spaceId,name,+ lastSelectedAt,}: {spaceId: string;name: string;+ /** Makes this space the member's active space */+ lastSelectedAt?: Date;}) {const email = `${name.toLowerCase().replace(/\s/g, "-")}-${runId}@example.com`;const user = await createUserInDb({ email, name });@@ -50,9 +53,20 @@ async function createMemberInDb({spaceId,userId: user.id,role: "MEMBER",+ lastSelectedAt,},});+ if (lastSelectedAt) {+ // The active space is the membership with the latest lastSelectedAt,+ // and Postgres sorts NULL first in a descending order, so the user's+ // own space (never selected) would still win unless it gets a date too.+ await prisma.spaceMember.updateMany({+ where: { userId: user.id, spaceId: { not: spaceId } },+ data: { lastSelectedAt: new Date(0) },+ });+ }+return { user, email };}@@ -239,4 +253,26 @@ test.describe("Space members", () => {),).toBeVisible();});++ test("a non-admin member who opens the page directly sees access denied", async ({+ page,+ }) => {+ const owner = await createSpaceAdmin({ name: "Gate Owner", seats: 3 });+ const member = await createMemberInDb({+ spaceId: owner.space.id,+ name: "Gate Member",+ lastSelectedAt: new Date(),+ });++ await gotoMembersPage(page, member.email);++ await expect(mainContent(page).getByText("Access denied")).toBeVisible();+ await expect(+ mainContent(page).getByText("Only space admins can manage members."),+ ).toBeVisible();+ await expect(mainContent(page).getByText(owner.email)).toHaveCount(0);+ await expect(+ page.getByRole("button", { name: "Invite member" }),+ ).toHaveCount(0);+ });});