Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Move admin setup (#2190)
Luke Vellafe04191af887
diff --git a/apps/web/src/app/[locale]/control-panel/branding/page.tsx b/apps/web/src/app/[locale]/control-panel/branding/page.tsxindex 23f9284cf..307d3a92e 100644--- a/apps/web/src/app/[locale]/control-panel/branding/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/branding/page.tsx@@ -282,8 +282,13 @@ export default async function BrandingPage() {);}-export async function generateMetadata(): Promise<Metadata> {- const { t } = await getTranslation();+export async function generateMetadata({+ params,+}: {+ params: Promise<{ locale: string }>;+}): Promise<Metadata> {+ const { locale } = await params;+ const { t } = await getTranslation(locale);return {title: t("branding", { defaultValue: "Branding" }),};diff --git a/apps/web/src/app/[locale]/control-panel/layout.tsx b/apps/web/src/app/[locale]/control-panel/layout.tsxindex 19ab4a313..64102c33f 100644--- a/apps/web/src/app/[locale]/control-panel/layout.tsx+++ b/apps/web/src/app/[locale]/control-panel/layout.tsx@@ -2,7 +2,8 @@ import { Icon } from "@rallly/ui/icon";import { SidebarInset, SidebarTrigger } from "@rallly/ui/sidebar";import { GaugeIcon } from "lucide-react";import type { Metadata } from "next";-import { requireAdmin } from "@/auth/data";+import { requireUser } from "@/auth/data";+import { UserProvider } from "@/components/user-provider";import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";import { CommandMenu } from "@/features/navigation/command-menu";import { Trans } from "@/i18n/client";@@ -15,42 +16,49 @@ export default async function AdminLayout({}: {children: React.ReactNode;}) {- const user = await requireAdmin();+ const user = await requireUser();return (- <ControlPanelSidebarProvider>- <CommandMenu />- <ControlPanelSidebar- user={{- name: user.name,- image: user.image,- email: user.email,- }}- />- <SidebarInset>- <LicenseLimitWarning />- <div className="flex flex-1 flex-col">- <header className="sticky top-0 z-10 border-b bg-background/90 p-3 backdrop-blur-xs md:hidden">- <div className="flex items-center gap-4">- <SidebarTrigger />- <div className="flex items-center gap-2">- <Icon>- <GaugeIcon />- </Icon>- <span className="font-medium text-sm">- <Trans i18nKey="controlPanel" defaults="Control Panel" />- </span>+ <UserProvider user={user}>+ <ControlPanelSidebarProvider>+ <CommandMenu />+ <ControlPanelSidebar+ user={{+ name: user.name,+ image: user.image,+ email: user.email,+ }}+ />+ <SidebarInset>+ <LicenseLimitWarning />+ <div className="flex flex-1 flex-col">+ <header className="sticky top-0 z-10 border-b bg-background/90 p-3 backdrop-blur-xs md:hidden">+ <div className="flex items-center gap-4">+ <SidebarTrigger />+ <div className="flex items-center gap-2">+ <Icon>+ <GaugeIcon />+ </Icon>+ <span className="font-medium text-sm">+ <Trans i18nKey="controlPanel" defaults="Control Panel" />+ </span>+ </div></div>- </div>- </header>- <main className="flex-1 p-4 lg:py-12">{children}</main>- </div>- </SidebarInset>- </ControlPanelSidebarProvider>+ </header>+ <main className="flex-1 p-4 lg:py-12">{children}</main>+ </div>+ </SidebarInset>+ </ControlPanelSidebarProvider>+ </UserProvider>);}-export async function generateMetadata(): Promise<Metadata> {- const { t } = await getTranslation();+export async function generateMetadata({+ params,+}: {+ params: Promise<{ locale: string }>;+}): Promise<Metadata> {+ const { locale } = await params;+ const { t } = await getTranslation(locale);return {title: {template: `%s | ${t("controlPanel", {diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsxindex e3c5d83ed..91ddc0e0c 100644--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx@@ -228,8 +228,13 @@ export default async function LicensePage() {);}-export async function generateMetadata(): Promise<Metadata> {- const { t } = await getTranslation();+export async function generateMetadata({+ params,+}: {+ params: Promise<{ locale: string }>;+}): Promise<Metadata> {+ const { locale } = await params;+ const { t } = await getTranslation(locale);return {title: t("license", {defaultValue: "License",diff --git a/apps/web/src/app/[locale]/admin-setup/actions.ts b/apps/web/src/app/[locale]/control-panel/setup/actions.tssimilarity index 100%rename from apps/web/src/app/[locale]/admin-setup/actions.tsrename to apps/web/src/app/[locale]/control-panel/setup/actions.tsdiff --git a/apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsx b/apps/web/src/app/[locale]/control-panel/setup/make-me-admin-button.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/admin-setup/make-me-admin-button.tsxrename to apps/web/src/app/[locale]/control-panel/setup/make-me-admin-button.tsxdiff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/control-panel/setup/page.tsxsimilarity index 89%rename from apps/web/src/app/[locale]/admin-setup/page.tsxrename to apps/web/src/app/[locale]/control-panel/setup/page.tsxindex 80e9c9b2a..9415df5d7 100644--- a/apps/web/src/app/[locale]/admin-setup/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/setup/page.tsx@@ -55,8 +55,13 @@ export default async function AdminSetupPage() {);}-export async function generateMetadata(): Promise<Metadata> {- const { t } = await getTranslation();+export async function generateMetadata({+ params,+}: {+ params: Promise<{ locale: string }>;+}): Promise<Metadata> {+ const { locale } = await params;+ const { t } = await getTranslation(locale);return {title: t("adminSetup"),};diff --git a/apps/web/src/app/[locale]/control-panel/users/page.tsx b/apps/web/src/app/[locale]/control-panel/users/page.tsxindex 9c1d0f91e..ccb8aab89 100644--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx@@ -1,8 +1,8 @@+import { subject } from "@casl/ability";import type { Prisma } from "@rallly/database";import { prisma } from "@rallly/database";import { UsersIcon } from "lucide-react";import type { Metadata } from "next";-import { notFound } from "next/navigation";import * as z from "zod";import {SettingsPage,@@ -11,7 +11,7 @@ import {SettingsPageHeader,SettingsPageTitle,} from "@/app/components/settings-layout";-import { requireUser } from "@/auth/data";+import { requireAdmin } from "@/auth/data";import {EmptyState,EmptyStateDescription,@@ -20,6 +20,7 @@ import {} from "@/components/empty-state";import { Pagination } from "@/components/pagination";import { StackedList } from "@/components/stacked-list";+import { defineAbilityFor } from "@/features/user/ability";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { UserRow } from "./user-row";@@ -37,11 +38,7 @@ async function loadData({q?: string;role?: "admin" | "user";}) {- const user = await requireUser();-- if (user.role !== "admin") {- notFound();- }+ const user = await requireAdmin();const where: Prisma.UserWhereInput = {isAnonymous: false,@@ -88,11 +85,15 @@ async function loadData({where,});+ const ability = defineAbilityFor({ role: user.role, id: user.id });+return {adminUser: user,- allUsers: allUsers.map((user) => ({- ...user,- image: user.image ?? undefined,+ allUsers: allUsers.map((u) => ({+ ...u,+ image: u.image ?? undefined,+ canChangeRole: ability.can("update", subject("User", u), "role"),+ canDelete: ability.can("delete", subject("User", u)),})),totalUsers,};@@ -148,6 +149,8 @@ export default async function AdminPage(props: {userId={user.id}image={user.image}role={user.role}+ canChangeRole={user.canChangeRole}+ canDelete={user.canDelete}/>))}</StackedList>@@ -180,8 +183,13 @@ export default async function AdminPage(props: {);}-export async function generateMetadata(): Promise<Metadata> {- const { t } = await getTranslation();+export async function generateMetadata({+ params,+}: {+ params: Promise<{ locale: string }>;+}): Promise<Metadata> {+ const { locale } = await params;+ const { t } = await getTranslation(locale);return {title: t("users", {defaultValue: "Users",diff --git a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx b/apps/web/src/app/[locale]/control-panel/users/user-row.tsxindex 04371a167..eac162994 100644--- a/apps/web/src/app/[locale]/control-panel/users/user-row.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/user-row.tsx@@ -19,7 +19,6 @@ import { MoreHorizontal, TrashIcon, UserPenIcon } from "lucide-react";import { useTransition } from "react";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";import { StackedListItem } from "@/components/stacked-list";-import { useUser } from "@/components/user-provider";import { changeRoleAction } from "@/features/user/actions";import { userRoleSchema } from "@/features/user/schema";import { Trans } from "@/i18n/client";@@ -32,20 +31,22 @@ export function UserRow({userId,image,role,+ canChangeRole,+ canDelete,}: {name: string;email: string;userId: string;image?: string;role: "admin" | "user";+ canChangeRole: boolean;+ canDelete: boolean;}) {const changeRole = useSafeAction(changeRoleAction);const [isPending, startTransition] = useTransition();- const { user } = useUser();const deleteDialog = useDialog();- const isYou = userId === user?.id;return (<><StackedListItem@@ -72,7 +73,7 @@ export function UserRow({</DropdownMenuTrigger><DropdownMenuContent align="end"><DropdownMenuSub>- <DropdownMenuSubTrigger disabled={isYou}>+ <DropdownMenuSubTrigger disabled={!canChangeRole}><Icon><UserPenIcon /></Icon>@@ -105,7 +106,7 @@ export function UserRow({onClick={async () => {deleteDialog.trigger();}}- disabled={isYou}+ disabled={!canDelete}><TrashIcon className="size-4" /><Trans i18nKey="delete" defaults="Delete" />diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.tsindex 5087dd375..10f957651 100644--- a/apps/web/src/auth/data.ts+++ b/apps/web/src/auth/data.ts@@ -81,7 +81,7 @@ export const requireAdmin = cache(async () => {if (user.role !== "admin") {if (isInitialAdmin(user.email)) {- redirect("/admin-setup");+ redirect("/control-panel/setup");}notFound();diff --git a/apps/web/src/features/user/ability.ts b/apps/web/src/features/user/ability.tsindex 81ffc95cd..0dcc198a7 100644--- a/apps/web/src/features/user/ability.ts+++ b/apps/web/src/features/user/ability.ts@@ -2,12 +2,15 @@ import type { PureAbility } from "@casl/ability";import { AbilityBuilder } from "@casl/ability";import type { PrismaQuery, Subjects } from "@casl/prisma";import { createPrismaAbility } from "@casl/prisma";-import type { Space, User } from "@rallly/database";+import type { Space } from "@rallly/database";import type { UserRole } from "@/features/user/schema";type Action = "read" | "update" | "delete";type Subject = Subjects<{- User: User;+ User: {+ id: string;+ role: UserRole;+ };Space: Space;}>;@@ -83,4 +86,6 @@ function defineAbilityForAdmin(cannot("update", "User", ["role"], { id: user.id });// Can delete any usercan("delete", "User");+ // Cannot delete their own account+ cannot("delete", "User", { id: user.id });}diff --git a/apps/web/tests/admin-setup.spec.ts b/apps/web/tests/admin-setup.spec.tsindex 72a89d515..db99c280d 100644--- a/apps/web/tests/admin-setup.spec.ts+++ b/apps/web/tests/admin-setup.spec.ts@@ -29,7 +29,7 @@ test.describe("Admin Setup Page Access", () => {test("should redirect unauthenticated user to login page", async ({page,}) => {- await page.goto("/admin-setup");+ await page.goto("/control-panel/setup");await expect(page).toHaveURL(/.*\/login/);});@@ -43,8 +43,8 @@ test.describe("Admin Setup Page Access", () => {});await loginWithEmail(page, { email: INITIAL_ADMIN_TEST_EMAIL });- await page.goto("/admin-setup");- await expect(page).toHaveURL(/.*\/admin-setup/);+ await page.goto("/control-panel");+ await expect(page).toHaveURL(/.*\/control-panel\/setup/);await expect(page.getByText("Are you the admin?")).toBeVisible();await expect(page.getByRole("button", { name: "Make me an admin" }),@@ -61,7 +61,7 @@ test.describe("Admin Setup Page Access", () => {});await loginWithEmail(page, { email: REGULAR_USER_EMAIL });- await page.goto("/admin-setup");+ await page.goto("/control-panel/setup");await expect(page.getByText("404 not found")).toBeVisible();});@@ -75,8 +75,8 @@ test.describe("Admin Setup Page Access", () => {});await loginWithEmail(page, { email: SUBSEQUENT_ADMIN_EMAIL });- await page.goto("/admin-setup");- await expect(page).toHaveURL(/.*\/control-panel/);+ await page.goto("/control-panel/setup");+ await expect(page).toHaveURL("/control-panel");});test("should show 'not found' if INITIAL_ADMIN_EMAIL in env is different from user's email", async ({@@ -89,7 +89,7 @@ test.describe("Admin Setup Page Access", () => {});await loginWithEmail(page, { email: OTHER_USER_EMAIL });- await page.goto("/admin-setup");+ await page.goto("/control-panel/setup");await expect(page.getByText("404 not found")).toBeVisible();});@@ -103,11 +103,11 @@ test.describe("Admin Setup Page Access", () => {});await loginWithEmail(page, { email: INITIAL_ADMIN_TEST_EMAIL });- await page.goto("/admin-setup");+ await page.goto("/control-panel/setup");await expect(page.getByText("Are you the admin?")).toBeVisible();await page.getByRole("button", { name: "Make me an admin" }).click();- await expect(page).toHaveURL(/.*\/control-panel/, { timeout: 10000 });+ await expect(page).toHaveURL("/control-panel", { timeout: 10000 });const user = await prisma.user.findUnique({where: { email: INITIAL_ADMIN_TEST_EMAIL },