Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Refactor data access layer (#1845)
Luke Vella05a7a539f577
diff --git a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx b/apps/web/src/app/[locale]/(space)/account/billing/page.tsxindex 0fd2b161f..e1ecc59b8 100644--- a/apps/web/src/app/[locale]/(space)/account/billing/page.tsx+++ b/apps/web/src/app/[locale]/(space)/account/billing/page.tsx@@ -14,6 +14,7 @@ import {import type { Metadata } from "next";import Link from "next/link";import { notFound } from "next/navigation";+import { loadCurrentUser } from "@/auth/data";import {DescriptionDetails,DescriptionList,@@ -29,7 +30,6 @@ import {import { PayWallDialog } from "@/components/pay-wall-dialog";import { Trans } from "@/components/trans";import { loadPaymentMethods, loadSubscription } from "@/data/space";-import { loadUserAbility } from "@/data/user";import { FormattedDateTime } from "@/features/timezone/client/formatted-date-time";import { getTranslation } from "@/i18n/server";import { isSelfHosted } from "@/utils/constants";@@ -46,8 +46,8 @@ async function loadData() {notFound();}- const [{ user }, subscription, paymentMethods] = await Promise.all([- loadUserAbility(),+ const [user, subscription, paymentMethods] = await Promise.all([+ loadCurrentUser(),loadSubscription(),loadPaymentMethods(),]);diff --git a/apps/web/src/app/[locale]/(space)/account/profile/page.tsx b/apps/web/src/app/[locale]/(space)/account/profile/page.tsxindex c21f27e84..b072ad9da 100644--- a/apps/web/src/app/[locale]/(space)/account/profile/page.tsx+++ b/apps/web/src/app/[locale]/(space)/account/profile/page.tsx@@ -4,8 +4,8 @@ import { TrashIcon } from "lucide-react";import type { Metadata } from "next";import type { Params } from "@/app/[locale]/types";+import { loadCurrentUser } from "@/auth/data";import { Trans } from "@/components/trans";-import { loadUserAbility } from "@/data/user";import { getTranslation } from "@/i18n/server";import {SettingsContent,@@ -16,7 +16,7 @@ import { ProfileEmailAddress } from "./profile-email-address";import { ProfileSettings } from "./profile-settings";export default async function Page() {- const { user } = await loadUserAbility();+ const user = await loadCurrentUser();return (<SettingsContent><SettingsSectiondiff --git a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsxindex c05e91910..1203fb999 100644--- a/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx+++ b/apps/web/src/app/[locale]/(space)/components/sidebar/space-sidebar.tsx@@ -13,9 +13,9 @@ import Link from "next/link";import type React from "react";import { SpaceSidebarMenu } from "@/app/[locale]/(space)/components/sidebar/space-sidebar-menu";import { LogoLink } from "@/app/components/logo-link";+import { loadCurrentUserSpace } from "@/auth/data";import { Trans } from "@/components/trans";-import { loadActiveSpace, loadSpaces } from "@/data/space";-import { loadUserAbility } from "@/data/user";+import { loadSpaces } from "@/data/space";import { FeedbackToggle } from "@/features/feedback/components/feedback-toggle";import { SpaceDropdown } from "@/features/spaces/components/space-dropdown";import { SpaceIcon } from "@/features/spaces/components/space-icon";@@ -24,23 +24,22 @@ import { UpgradeButton } from "../upgrade-button";import { NavUser } from "./nav-user";async function loadData() {- const [{ user }, spaces, activeSpace] = await Promise.all([- loadUserAbility(),+ const [{ user, space }, spaces] = await Promise.all([+ loadCurrentUserSpace(),loadSpaces(),- loadActiveSpace(),]);return {user,spaces,- activeSpace,+ space,};}export async function SpaceSidebar({...props}: React.ComponentProps<typeof Sidebar>) {- const { user, spaces, activeSpace } = await loadData();+ const { user, spaces, space: activeSpace } = await loadData();return (<Sidebar variant="inset" {...props}>@@ -95,7 +94,7 @@ export async function SpaceSidebar({<SpaceSidebarMenu /></SidebarContent><SidebarFooter>- {!user.isPro ? (+ {activeSpace.tier !== "pro" ? (<><div className="relative overflow-hidden rounded-xl border bg-gray-50 p-3 text-sm shadow-sm"><SparklesIcon className="-top-4 absolute right-0 z-0 size-16 text-gray-200" />@@ -123,7 +122,7 @@ export async function SpaceSidebar({name={user.name}image={user.image}plan={- user.isPro ? (+ activeSpace.tier === "pro" ? (<Trans i18nKey="planPro" defaults="Pro" />) : (<Trans i18nKey="planFree" defaults="Free" />diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsxindex be3a1e0f8..49387dc70 100644--- a/apps/web/src/app/[locale]/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/layout.tsx@@ -1,21 +1,28 @@import { Button } from "@rallly/ui/button";import { SidebarInset, SidebarTrigger } from "@rallly/ui/sidebar";import Link from "next/link";-+import { redirect } from "next/navigation";+import { loadCurrentUserSpace } from "@/auth/data";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";+import { AbilityProvider } from "@/features/ability-manager/client";import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";import { CommandMenu } from "@/features/navigation/command-menu";-import { getOnboardedUser } from "@/features/setup/queries";+import { isUserOnboarded } from "@/features/setup/utils";import { TimezoneProvider } from "@/features/timezone/client/context";import { SpaceSidebar } from "./components/sidebar/space-sidebar";import { SpaceSidebarProvider } from "./components/sidebar/space-sidebar-provider";import { TopBar, TopBarLeft, TopBarRight } from "./components/top-bar";async function loadData() {- const [user] = await Promise.all([getOnboardedUser()]);+ const { user, space } = await loadCurrentUserSpace();++ if (!isUserOnboarded(user)) {+ redirect("/setup");+ }return {user,+ space,};}@@ -24,41 +31,43 @@ export default async function Layout({}: {children: React.ReactNode;}) {- const { user } = await loadData();+ const { user, space } = await loadData();return (- <TimezoneProvider initialTimezone={user.timeZone}>- <SpaceSidebarProvider>- <CommandMenu />- <SpaceSidebar />- <SidebarInset className="min-w-0">- <TopBar className="md:hidden">- <TopBarLeft>- <SidebarTrigger />- </TopBarLeft>- <TopBarRight>- <Button- asChild- variant="ghost"- className="rounded-full"- size="icon"- >- <Link href="/account/profile">- <OptimizedAvatarImage- src={user.image}- name={user.name}- size="sm"- />- </Link>- </Button>- </TopBarRight>- </TopBar>- <LicenseLimitWarning />- <div className="flex flex-1 flex-col">- <div className="flex flex-1 flex-col">{children}</div>- </div>- </SidebarInset>- </SpaceSidebarProvider>- </TimezoneProvider>+ <AbilityProvider user={user} context={{ space }}>+ <TimezoneProvider initialTimezone={user.timeZone}>+ <SpaceSidebarProvider>+ <CommandMenu />+ <SpaceSidebar />+ <SidebarInset className="min-w-0">+ <TopBar className="md:hidden">+ <TopBarLeft>+ <SidebarTrigger />+ </TopBarLeft>+ <TopBarRight>+ <Button+ asChild+ variant="ghost"+ className="rounded-full"+ size="icon"+ >+ <Link href="/account/profile">+ <OptimizedAvatarImage+ src={user.image}+ name={user.name}+ size="sm"+ />+ </Link>+ </Button>+ </TopBarRight>+ </TopBar>+ <LicenseLimitWarning />+ <div className="flex flex-1 flex-col">+ <div className="flex flex-1 flex-col">{children}</div>+ </div>+ </SidebarInset>+ </SpaceSidebarProvider>+ </TimezoneProvider>+ </AbilityProvider>);}diff --git a/apps/web/src/app/[locale]/admin-setup/page.tsx b/apps/web/src/app/[locale]/admin-setup/page.tsxindex c6c3c24a1..35eb1c44f 100644--- a/apps/web/src/app/[locale]/admin-setup/page.tsx+++ b/apps/web/src/app/[locale]/admin-setup/page.tsx@@ -4,6 +4,7 @@ import { CrownIcon } from "lucide-react";import type { Metadata } from "next";import Link from "next/link";import { notFound, redirect } from "next/navigation";+import { loadCurrentUser } from "@/auth/data";import {EmptyState,EmptyStateDescription,@@ -12,12 +13,14 @@ import {EmptyStateTitle,} from "@/components/empty-state";import { Trans } from "@/components/trans";-import { loadUserAbility } from "@/data/user";+import { defineAbilityFor } from "@/features/ability-manager";import { getTranslation } from "@/i18n/server";import { MakeMeAdminButton } from "./make-me-admin-button";export default async function AdminSetupPage() {- const { user, ability } = await loadUserAbility();+ const user = await loadCurrentUser();++ const ability = defineAbilityFor(user);if (ability.can("access", "ControlPanel")) {redirect("/control-panel");diff --git a/apps/web/src/app/[locale]/control-panel/license/page.tsx b/apps/web/src/app/[locale]/control-panel/license/page.tsxindex bddc9663d..50a6c9ba5 100644--- a/apps/web/src/app/[locale]/control-panel/license/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/license/page.tsx@@ -11,6 +11,7 @@ import dayjs from "dayjs";import { KeySquareIcon, PlusIcon, ShoppingBagIcon } from "lucide-react";import type { Metadata } from "next";import { PageIcon } from "@/app/components/page-icons";+import { requireAdmin } from "@/auth/data";import {EmptyState,EmptyStateDescription,@@ -26,16 +27,12 @@ import {} from "@/components/full-width-layout";import { Trans } from "@/components/trans";import { loadInstanceLicense } from "@/data/instance-license";-import { loadAdminUserAbility } from "@/data/user";import { LicenseKeyForm } from "@/features/licensing/components/license-key-form";import { RemoveLicenseButton } from "@/features/licensing/components/remove-license-button";import { getTranslation } from "@/i18n/server";async function loadData() {- const [_, license] = await Promise.all([- loadAdminUserAbility(),- loadInstanceLicense(),- ]);+ const [license] = await Promise.all([loadInstanceLicense(), requireAdmin()]);return { license };}diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsxindex 96e4ce83c..50e840e48 100644--- a/apps/web/src/app/[locale]/control-panel/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/page.tsx@@ -12,6 +12,7 @@ import {import type { Metadata } from "next";import Link from "next/link";import { PageIcon } from "@/app/components/page-icons";+import { requireAdmin } from "@/auth/data";import {FullWidthLayout,FullWidthLayoutContent,@@ -20,13 +21,12 @@ import {} from "@/components/full-width-layout";import { Trans } from "@/components/trans";import { loadInstanceLicense } from "@/data/instance-license";-import { loadAdminUserAbility } from "@/data/user";async function loadData() {- const [_, userCount, license] = await Promise.all([- loadAdminUserAbility(),+ const [userCount, license] = await Promise.all([prisma.user.count(),loadInstanceLicense(),+ requireAdmin(),]);return {diff --git a/apps/web/src/app/[locale]/control-panel/settings/page.tsx b/apps/web/src/app/[locale]/control-panel/settings/page.tsxindex e84a21a2d..f0c6cdde7 100644--- a/apps/web/src/app/[locale]/control-panel/settings/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/settings/page.tsx@@ -1,5 +1,6 @@import { SettingsIcon } from "lucide-react";import { PageIcon } from "@/app/components/page-icons";+import { requireAdmin } from "@/auth/data";import {FullWidthLayout,FullWidthLayoutContent,@@ -7,14 +8,14 @@ import {FullWidthLayoutTitle,} from "@/components/full-width-layout";import { Trans } from "@/components/trans";-import { loadAdminUserAbility } from "@/data/user";import { getInstanceSettings } from "@/features/instance-settings/queries";import { InstanceSettingsForm } from "./instance-settings-form";async function loadData() {- await loadAdminUserAbility();-- const instanceSettings = await getInstanceSettings();+ const [instanceSettings] = await Promise.all([+ getInstanceSettings(),+ requireAdmin(),+ ]);return {instanceSettings,diff --git a/apps/web/src/app/[locale]/control-panel/users/page.tsx b/apps/web/src/app/[locale]/control-panel/users/page.tsxindex 1be0af568..40f2386cd 100644--- a/apps/web/src/app/[locale]/control-panel/users/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/users/page.tsx@@ -2,8 +2,10 @@ 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 z from "zod";import { PageIcon } from "@/app/components/page-icons";+import { getCurrentUser } from "@/auth/data";import {EmptyState,EmptyStateDescription,@@ -19,7 +21,6 @@ import {import { Pagination } from "@/components/pagination";import { StackedList } from "@/components/stacked-list";import { Trans } from "@/components/trans";-import { loadAdminUserAbility } from "@/data/user";import { getTranslation } from "@/i18n/server";import { UserRow } from "./user-row";import { UserSearchInput } from "./user-search-input";@@ -36,7 +37,11 @@ async function loadData({q?: string;role?: "admin" | "user";}) {- const { user } = await loadAdminUserAbility();+ const user = await getCurrentUser();++ if (user.role !== "admin") {+ notFound();+ }const where: Prisma.UserWhereInput = {};diff --git a/apps/web/src/app/[locale]/setup/page.tsx b/apps/web/src/app/[locale]/setup/page.tsxindex 117c76c46..4f05cd83d 100644--- a/apps/web/src/app/[locale]/setup/page.tsx+++ b/apps/web/src/app/[locale]/setup/page.tsx@@ -2,19 +2,17 @@ import type { Metadata } from "next";import { redirect } from "next/navigation";import { ProfilePicture } from "@/app/[locale]/(space)/account/profile/profile-picture";+import { loadCurrentUser } from "@/auth/data";import { Logo } from "@/components/logo";import { Trans } from "@/components/trans";-import { loadUserAbility } from "@/data/user";import { SetupForm } from "@/features/setup/components/setup-form";-import { onboardedUserSchema } from "@/features/setup/schema";+import { isUserOnboarded } from "@/features/setup/utils";import { getTranslation } from "@/i18n/server";export default async function SetupPage() {- const { user } = await loadUserAbility();+ const user = await loadCurrentUser();- const isUserOnboarded = onboardedUserSchema.safeParse(user).success;-- if (isUserOnboarded) {+ if (isUserOnboarded(user)) {redirect("/");}diff --git a/apps/web/src/app/api/stripe/checkout/route.ts b/apps/web/src/app/api/stripe/checkout/route.tsindex b637411e4..86908a5eb 100644--- a/apps/web/src/app/api/stripe/checkout/route.ts+++ b/apps/web/src/app/api/stripe/checkout/route.ts@@ -4,7 +4,7 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";import type { NextRequest } from "next/server";import { NextResponse } from "next/server";import { z } from "zod";-import { requireUser } from "@/data/user";+import { getCurrentUserSpace } from "@/auth/data";import type {SubscriptionCheckoutMetadata,SubscriptionMetadata,@@ -17,7 +17,8 @@ const inputSchema = z.object({});export async function POST(request: NextRequest) {- const { user } = await requireUser();+ const { user, space } = await getCurrentUserSpace();+ const spaceId = space.id;const formData = await request.formData();const data = inputSchema.safeParse(Object.fromEntries(formData.entries()));@@ -60,7 +61,7 @@ export async function POST(request: NextRequest) {customerId = customer.id;}- if (user.isPro) {+ if (space.tier === "pro") {// User already has an active subscription. Take them to customer portalreturn NextResponse.redirect(new URL("/api/stripe/portal", request.url),@@ -70,21 +71,6 @@ export async function POST(request: NextRequest) {const proPricingData = await getProPricing();- let spaceId = user.activeSpaceId;-- if (!spaceId) {- const space = await prisma.space.findFirstOrThrow({- where: {- ownerId: user.id,- },- select: {- id: true,- },- });-- spaceId = space.id;- }-const checkoutSession = await stripe.checkout.sessions.create({success_url: absoluteUrl(return_path ?? "/api/stripe/portal?session_id={CHECKOUT_SESSION_ID}",diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.tsindex bcbaba9fd..a732e2626 100644--- a/apps/web/src/auth/data.ts+++ b/apps/web/src/auth/data.ts@@ -1,6 +1,7 @@import "server-only";import { prisma } from "@rallly/database";+import { notFound, redirect } from "next/navigation";import { cache } from "react";import { createSpaceDTO } from "@/data/space";import { createUserDTO } from "@/data/user";@@ -33,6 +34,26 @@ export const getCurrentUser = async () => {return createUserDTO(user);};+export const loadCurrentUser = cache(async () => {+ try {+ return await getCurrentUser();+ } catch (error) {+ if (error instanceof AppError) {+ switch (error.code) {+ case "NOT_FOUND":+ redirect("/api/auth/invalid-session");+ break;+ case "UNAUTHORIZED":+ redirect("/login");+ break;+ default:+ throw error;+ }+ }+ throw error;+ }+});+export const getCurrentUserSpace = async () => {const user = await getCurrentUser();@@ -113,4 +134,30 @@ export const getCurrentUserSpace = async () => {};};-export const loadCurrentUserSpace = cache(getCurrentUserSpace);+export const loadCurrentUserSpace = cache(async () => {+ try {+ return await getCurrentUserSpace();+ } catch (error) {+ if (error instanceof AppError) {+ switch (error.code) {+ case "NOT_FOUND":+ redirect("/api/auth/invalid-session");+ break;+ case "UNAUTHORIZED":+ redirect("/login");+ break;+ default:+ throw error;+ }+ }+ throw error;+ }+});++export const requireAdmin = cache(async () => {+ const user = await loadCurrentUser();++ if (user.role !== "admin") {+ notFound();+ }+});diff --git a/apps/web/src/auth/queries.ts b/apps/web/src/auth/queries.tsindex e23aaf63f..de581cd45 100644--- a/apps/web/src/auth/queries.ts+++ b/apps/web/src/auth/queries.ts@@ -3,10 +3,6 @@ import { defineAbilityFor } from "@/features/ability-manager";import { getUser } from "@/features/user/queries";import { auth } from "@/next-auth";-export const isInitialAdmin = (email: string) => {- return email.toLowerCase() === process.env.INITIAL_ADMIN_EMAIL?.toLowerCase();-};-export const requireUserAbility = async () => {const session = await auth();if (!session?.user) {diff --git a/apps/web/src/data/space.ts b/apps/web/src/data/space.tsindex 597d77f6d..9fc28252f 100644--- a/apps/web/src/data/space.ts+++ b/apps/web/src/data/space.ts@@ -5,9 +5,20 @@ import type {} from "@rallly/database";import { prisma } from "@rallly/database";import { cache } from "react";-import { loadUserAbility } from "@/data/user";+import { loadCurrentUser } from "@/auth/data";+import { defineAbilityFor } from "@/features/ability-manager";import type { SpaceMemberRole } from "@/features/spaces/schema";import { fromDBRole, toDBRole } from "@/features/spaces/utils";+import { AppError } from "@/lib/errors";+import { isSelfHosted } from "@/utils/constants";++function getSpaceTier(space: {+ subscription: {+ active: boolean;+ } | null;+}) {+ return isSelfHosted ? "pro" : space.subscription?.active ? "pro" : "hobby";+}export function createSpaceDTO(userId: string,@@ -27,14 +38,17 @@ export function createSpaceDTO(const role = space.members.find((member) => member.userId === userId)?.role;if (!role) {- throw new Error("User is not a member of the space");+ throw new AppError({+ code: "INTERNAL_SERVER_ERROR",+ message: "User is not a member of the space",+ });}return {id: space.id,name: space.name,ownerId: space.ownerId,- tier: space.subscription?.active ? "pro" : "hobby",+ tier: getSpaceTier(space),role: fromDBRole(role),} satisfies SpaceDTO;}@@ -48,7 +62,8 @@ export type SpaceDTO = {};export const loadSpaces = cache(async () => {- const { user, ability } = await loadUserAbility();+ const user = await loadCurrentUser();+ const ability = defineAbilityFor(user);const spaces = await prisma.space.findMany({where: accessibleBy(ability).Space,include: {@@ -91,7 +106,7 @@ export const loadSpace = cache(async ({ id }: { id: string }) => {const space = spaces.find((space) => space.id === id);if (!space) {- const { user } = await loadUserAbility();+ const user = await loadCurrentUser();throw new Error(`User ${user.id} does not have access to space ${id}`);}@@ -99,7 +114,7 @@ export const loadSpace = cache(async ({ id }: { id: string }) => {});const loadDefaultSpace = cache(async () => {- const { user } = await loadUserAbility();+ const user = await loadCurrentUser();const spaces = await loadSpaces();const defaultSpace = spaces.find((space) => space.ownerId === user.id);@@ -111,7 +126,7 @@ const loadDefaultSpace = cache(async () => {});export const loadActiveSpace = cache(async () => {- const { user } = await loadUserAbility();+ const user = await loadCurrentUser();if (user.activeSpaceId) {try {@@ -148,7 +163,7 @@ export const loadSubscription = cache(async () => {});export const loadPaymentMethods = cache(async () => {- const { user } = await loadUserAbility();+ const user = await loadCurrentUser();const paymentMethods = await prisma.paymentMethod.findMany({where: {userId: user.id,diff --git a/apps/web/src/data/user.ts b/apps/web/src/data/user.tsindex 6311464e6..f49a86a71 100644--- a/apps/web/src/data/user.ts+++ b/apps/web/src/data/user.ts@@ -1,9 +1,4 @@import type { User } from "@rallly/database";-import { notFound, redirect } from "next/navigation";-import { cache } from "react";-import { defineAbilityFor } from "@/features/ability-manager";-import { getUser } from "@/features/user/queries";-import { auth } from "@/next-auth";export const createUserDTO = (user: User) => ({id: user.id,@@ -12,44 +7,9 @@ export const createUserDTO = (user: User) => ({email: user.email,role: user.role,activeSpaceId: user.activeSpaceId ?? undefined,-});--export const requireUser = async () => {- const session = await auth();-- if (!session?.user) {- redirect("/login");- }-- const user = await getUser(session.user.id);-- if (!user) {- redirect("/api/auth/invalid-session");- }-- return {- user,- };-};--export const loadUserAbility = cache(async () => {- const { user } = await requireUser();-- return {- user,- ability: defineAbilityFor(user),- };-});--export const loadAdminUserAbility = cache(async () => {- const { user, ability } = await loadUserAbility();-- if (user.role !== "admin") {- notFound();- }-- return {- user,- ability,- };+ timeZone: user.timeZone ?? undefined,+ timeFormat: user.timeFormat ?? undefined,+ locale: user.locale ?? undefined,+ weekStart: user.weekStart ?? undefined,+ customerId: user.customerId ?? undefined,});diff --git a/apps/web/src/features/ability-manager/ability.ts b/apps/web/src/features/ability-manager/ability.tsindex 0ca9b5092..458c7f0b3 100644--- a/apps/web/src/features/ability-manager/ability.ts+++ b/apps/web/src/features/ability-manager/ability.ts@@ -13,7 +13,7 @@ import type {UserRole,} from "@prisma/client";-export type User = {+export type UserContext = {id: string;email: string;role: UserRole;@@ -28,7 +28,7 @@ type SpaceContext = {tier: SpaceTier;};-export type AbilityContext = {+export type AppContext = {space?: SpaceContext;};@@ -45,7 +45,7 @@ export type Action =export type Subject =| Subjects<{- User: User;+ User: UserContext;Poll: Poll;Space: Space;Comment: Comment;@@ -60,12 +60,12 @@ export type Subject =export type AppAbility = PureAbility<[Action, Subject], PrismaQuery>;// Main ability definition function following RBAC pattern-export function defineAbilityFor(user?: User, context?: AbilityContext) {+export function defineAbilityFor(user?: UserContext, context?: AppContext) {return createPrismaAbility<AppAbility>(defineRulesFor(user, context));}// Rule definition function that delegates to specific role handlers-export function defineRulesFor(user?: User, context?: AbilityContext) {+export function defineRulesFor(user?: UserContext, context?: AppContext) {const builder = new AbilityBuilder<AppAbility>(createPrismaAbility);if (!user) {@@ -95,9 +95,11 @@ export function defineRulesFor(user?: User, context?: AbilityContext) {// Base authenticated user rulesfunction defineAuthenticatedUserRules(- { can, cannot }: AbilityBuilder<AppAbility>,- user: User,+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,) {+ const { can, cannot } = builder;+// Profile managementcan("update", "User", ["email", "name"], { id: user.id });can("delete", "User", { id: user.id });@@ -130,9 +132,11 @@ function defineAuthenticatedUserRules(}function defineAdminRules(- { can, cannot }: AbilityBuilder<AppAbility>,- user: User,+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,) {+ const { can, cannot } = builder;+// System administrationcan("access", "ControlPanel");can("update", "User", ["role"]);@@ -140,44 +144,38 @@ function defineAdminRules(can("delete", "User");}-function defineUserRules({ can }: AbilityBuilder<AppAbility>, user: User) {- // Initial admin setup+function defineUserRules(+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,+) {+ const { can } = builder;+if (user.email === process.env.INITIAL_ADMIN_EMAIL) {can("update", "User", ["role"], { id: user.id });}}-// Space-specific rules based on user's role in the spacefunction defineSpaceRules(- { can, cannot }: AbilityBuilder<AppAbility>,- user: User,+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,spaceContext: SpaceContext,) {+ const { can, cannot } = builder;+const { role, tier, id: spaceId } = spaceContext;- // All members can read space content- can("read", "Poll", { spaceId });- can("read", "Comment", {- poll: { spaceId },- });- can("read", "SpaceMember", { spaceId });-- // Owner and Admin permissions- if (role === "owner" || role === "admin") {- can(["update", "delete"], "SpaceMember", { spaceId });- can("update", "SpaceMember", ["role"], { spaceId });- // Cannot update their own role- cannot("update", "SpaceMember", ["role"], {- spaceId,- userId: user.id,- });+ switch (role) {+ case "owner":+ defineSpaceOwnerRules(builder, user, spaceContext);+ break;+ case "admin":+ defineSpaceAdminRules(builder, user, spaceContext);+ break;+ case "member":+ defineSpaceMemberRules(builder, user, spaceContext);+ break;}- can("cancel", "ScheduledEvent", {- spaceId,- });-- // Tier-based permissionsswitch (tier) {case "hobby":cannot("update", "Poll", [@@ -188,10 +186,48 @@ function defineSpaceRules(cannot("invite", "SpaceMember", { spaceId });break;case "pro":- if (role === "owner" || role === "admin") {- can("invite", "SpaceMember", { spaceId });- can("create", "SpaceMember", { spaceId });- }+ can("invite", "SpaceMember", { spaceId });break;}}++function defineSpaceMemberRules(+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,+ space: SpaceContext,+) {+ const { can } = builder;++ can("cancel", "ScheduledEvent", { spaceId: space.id, userId: user.id });+}++function defineSpaceAdminRules(+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,+ space: SpaceContext,+) {+ const { can, cannot } = builder;++ can("cancel", "ScheduledEvent", { spaceId: space.id });++ can(["read", "update", "delete"], "SpaceMember", { spaceId: space.id });+ cannot("update", "SpaceMember", ["role"], {+ spaceId: space.id,+ userId: user.id,+ });+}++function defineSpaceOwnerRules(+ builder: AbilityBuilder<AppAbility>,+ user: UserContext,+ space: SpaceContext,+) {+ const { can, cannot } = builder;++ can(["read", "update", "delete"], "SpaceMember", { spaceId: space.id });+ cannot("update", "SpaceMember", ["role"], {+ spaceId: space.id,+ userId: user.id,+ });+ can("cancel", "ScheduledEvent", { spaceId: space.id });+}diff --git a/apps/web/src/features/ability-manager/client.tsx b/apps/web/src/features/ability-manager/client.tsxnew file mode 100644index 000000000..ee10559ac--- /dev/null+++ b/apps/web/src/features/ability-manager/client.tsx@@ -0,0 +1,34 @@+"use client";+import { createContextualCan } from "@casl/react";+import React from "react";+import type {+ AppAbility,+ AppContext,+ UserContext,+} from "@/features/ability-manager/ability";+import { defineAbilityFor } from "@/features/ability-manager/ability";++export const AbilityContext = React.createContext<AppAbility>({} as AppAbility);+export const Can = createContextualCan(AbilityContext.Consumer);++export const AbilityProvider = ({+ user,+ context,+ children,+}: {+ user?: UserContext;+ context?: AppContext;+ children: React.ReactNode;+}) => {+ const ability = defineAbilityFor(user, context);+ return (+ <AbilityContext.Provider value={ability}>+ {children}+ </AbilityContext.Provider>+ );+};++export const useAppAbility = () => {+ const ability = React.useContext(AbilityContext);+ return ability;+};diff --git a/apps/web/src/features/setup/queries.ts b/apps/web/src/features/setup/queries.tsdeleted file mode 100644index 0eced22a8..000000000--- a/apps/web/src/features/setup/queries.ts+++ /dev/null@@ -1,29 +0,0 @@-import { headers } from "next/headers";-import { redirect } from "next/navigation";-import { cache } from "react";--import { loadUserAbility } from "@/data/user";-import { onboardedUserSchema } from "./schema";--export const getOnboardedUser = cache(async () => {- const { user } = await loadUserAbility();-- const onboardedUser = onboardedUserSchema.safeParse(user);-- if (!onboardedUser.success) {- const headerList = await headers();- const pathname = headerList.get("x-pathname");- const searchParams =- pathname && pathname !== "/"- ? `?redirectTo=${encodeURIComponent(pathname)}`- : "";- redirect(`/setup${searchParams}`);- }-- return {- ...user,- timeZone: onboardedUser.data.timeZone,- locale: onboardedUser.data.locale,- name: onboardedUser.data.name,- };-});diff --git a/apps/web/src/features/setup/utils.ts b/apps/web/src/features/setup/utils.tsnew file mode 100644index 000000000..726a00868--- /dev/null+++ b/apps/web/src/features/setup/utils.ts@@ -0,0 +1,6 @@+import { onboardedUserSchema } from "@/features/setup/schema";+import type { OnboardedUser } from "@/features/setup/types";++export const isUserOnboarded = (user: Partial<OnboardedUser>) => {+ return onboardedUserSchema.safeParse(user).success;+};diff --git a/apps/web/src/features/spaces/actions.ts b/apps/web/src/features/spaces/actions.tsindex ec07cd80e..80d960380 100644--- a/apps/web/src/features/spaces/actions.ts+++ b/apps/web/src/features/spaces/actions.ts@@ -4,7 +4,11 @@ import { subject } from "@casl/ability";import { accessibleBy } from "@casl/prisma";import { prisma } from "@rallly/database";import { z } from "zod";-import { authActionClient } from "@/features/safe-action/server";+import {+ authActionClient,+ spaceActionClient,+} from "@/features/safe-action/server";+import { spaceMemberRoleSchema } from "@/features/spaces/schema";import { AppError } from "@/lib/errors";export const setActiveSpaceAction = authActionClient@@ -130,3 +134,24 @@ export const deleteSpaceAction = authActionClient},});});++export const inviteMemberAction = spaceActionClient+ .metadata({+ actionName: "space_invite_member",+ })+ .inputSchema(+ z.object({+ email: z.string().email(),+ role: spaceMemberRoleSchema,+ }),+ )+ .action(async ({ ctx, parsedInput }) => {+ if (ctx.ability.cannot("invite", "SpaceMember")) {+ throw new AppError({+ code: "FORBIDDEN",+ message: "You do not have access to this space",+ });+ }++ // create space member invite+ });diff --git a/apps/web/src/features/spaces/api.ts b/apps/web/src/features/spaces/api.tsdeleted file mode 100644index d2a4d505a..000000000--- a/apps/web/src/features/spaces/api.ts+++ /dev/null@@ -1,33 +0,0 @@-import { prisma } from "@rallly/database";-import { requireUserAbility } from "@/auth/queries";--export async function getActiveSpace() {- const { user } = await requireUserAbility();- if (user.activeSpaceId) {- const space = await prisma.space.findFirst({- where: {- id: user.activeSpaceId,- },- });-- if (space) {- return space;- }-- console.warn(- `User ${user.id} has an active space ID ${user.activeSpaceId} that does not exist or is no longer accessible`,- );- }-- const space = await prisma.space.findFirst({- where: {- ownerId: user.id,- },- });-- if (!space) {- throw new Error("User does not have an active space");- }-- return space;-}diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.tsindex a605c10b3..de0a55c98 100644--- a/apps/web/src/trpc/routers/polls.ts+++ b/apps/web/src/trpc/routers/polls.ts@@ -8,9 +8,9 @@ import dayjs from "dayjs";import * as ics from "ics";import { revalidatePath } from "next/cache";import { z } from "zod";+import { getCurrentUserSpace } from "@/auth/data";import { moderateContent } from "@/features/moderation";import { formatEventDateTime } from "@/features/scheduled-event/utils";-import { getActiveSpace } from "@/features/spaces/api";import { getEmailClient } from "@/utils/emails";import {createRateLimitMiddleware,@@ -181,7 +181,7 @@ export const polls = router({let spaceId: string | undefined;if (!ctx.user.isGuest) {- const space = await getActiveSpace();+ const { space } = await getCurrentUserSpace();spaceId = space.id;}