Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Refactor data fetching and auth for spaces (#2224)
Luke Vella25a8853cfa0c
diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsxindex cc910b8d0..f219269fc 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/layout.tsx@@ -1,23 +1,20 @@-import { requireSpace } from "@/auth/data";import { BillingProvider } from "@/features/billing/client";-import { SpaceProvider } from "@/features/space/client";-import { getSession } from "@/lib/auth";+import { isQuickCreateEnabled } from "@/features/quick-create";+import {+ createPrivateSSRHelper,+ createPublicSSRHelper,+} from "@/trpc/server/create-ssr-helper";export default async function Layout({children,}: {children: React.ReactNode;}) {- const session = await getSession();+ const helpers = isQuickCreateEnabled+ ? await createPublicSSRHelper()+ : await createPrivateSSRHelper();- if (session?.user && !session.user.isGuest) {- const space = await requireSpace();- return (- <SpaceProvider data={space} userId={session.user.id}>- <BillingProvider>{children}</BillingProvider>- </SpaceProvider>- );- }+ await helpers.billing.getTier.prefetch();return <BillingProvider>{children}</BillingProvider>;}diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsxindex 03b66ab4d..1946224ba 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/new/page.tsx@@ -1,27 +1,23 @@-import { Button } from "@rallly/ui/button";import type { Metadata } from "next";-import Link from "next/link";-import { redirect } from "next/navigation";import { PollPageIcon } from "@/app/components/page-icons";-import { getCurrentUser } from "@/auth/data";import { CreatePoll } from "@/components/create-poll";import { UserDropdown } from "@/components/user-dropdown";import { isQuickCreateEnabled } from "@/features/quick-create";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";-import { getRegistrationEnabled } from "@/utils/get-registration-enabled";+import {+ createPrivateSSRHelper,+ createPublicSSRHelper,+} from "@/trpc/server/create-ssr-helper";import { BackButton } from "./back-button";export default async function Page() {- const [user, isRegistrationEnabled] = await Promise.all([- getCurrentUser(),- getRegistrationEnabled(),- ]);+ const helpers = isQuickCreateEnabled+ ? await createPublicSSRHelper()+ : await createPrivateSSRHelper();- if (!user && !isQuickCreateEnabled) {- redirect(`/login?redirectTo=${encodeURIComponent("/new")}`);- }+ await helpers.user.getMe.prefetch();return (<div className="absolute inset-0 h-dvh overflow-auto bg-gray-100 dark:bg-gray-900">@@ -41,32 +37,7 @@ export default async function Page() {</div></div><div className="flex flex-1 justify-end">- {user ? (- <UserDropdown- name={user.name}- image={user.image ?? undefined}- email={user.email ?? undefined}- />- ) : (- <div className="flex items-center gap-x-2">- <Button variant="ghost" asChild>- <Link- href={`/login?redirectTo=${encodeURIComponent("/new")}`}- >- <Trans i18nKey="login" defaults="Login" />- </Link>- </Button>- {isRegistrationEnabled ? (- <Button variant="primary" asChild>- <Link- href={`/register?redirectTo=${encodeURIComponent("/new")}`}- >- <Trans i18nKey="signUp" defaults="Sign up" />- </Link>- </Button>- ) : null}- </div>- )}+ <UserDropdown /></div></div></div>diff --git a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/layout.tsx b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/layout.tsxindex d5647c919..8d4d6d7b0 100644--- a/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/(optional-space)/poll/[urlId]/layout.tsx@@ -5,7 +5,7 @@ import type { Metadata } from "next";import { notFound, redirect } from "next/navigation";import { PollLayout } from "@/components/layouts/poll-layout";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";export default async function Layout(props: React.PropsWithChildren<{ params: Promise<{ urlId: string }> }>,@@ -14,7 +14,7 @@ export default async function Layout(const { children } = props;- const trpc = await createAuthenticatedSSRHelper();+ const trpc = await createPublicSSRHelper();const [poll] = await Promise.all([trpc.polls.get.fetch({ urlId: params.urlId }).catch((e) => {diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsxindex d23aad25a..d0a877258 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item.tsx@@ -7,9 +7,13 @@ import { useBilling } from "@/features/billing/client";import { Trans } from "@/i18n/client";export function UpgradeMenuItem() {- const { showPayWall } = useBilling();+ const { showPayWall, isFree } = useBilling();const posthog = usePostHog();+ if (!isFree) {+ return null;+ }+return (<SidebarMenuItem><SidebarMenuButtondiff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsxindex b02d7bbc6..eee608e5a 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/events-page.tsx@@ -102,7 +102,7 @@ function EventsEmptyState({ status }: { status: Status }) {function EventsPageContent() {const searchParams = useSearchParams();const { t } = useTranslation();- const [members] = trpc.space.members.useSuspenseQuery();+ const [{ data: members }] = trpc.space.listMembers.useSuspenseQuery();const { status, q, member } = eventsSearchParamsSchema.parse(Object.fromEntries(searchParams.entries()),diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsxindex 8877703a0..2a43c3135 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/events/page.tsx@@ -1,7 +1,7 @@import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import type { Metadata } from "next";import { getTranslation } from "@/i18n/server";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";import { EventsPage } from "./events-page";import { eventsSearchParamsSchema } from "./schema";@@ -11,10 +11,10 @@ export default async function Page(props: {const searchParams = await props.searchParams;const { status, q, member } = eventsSearchParamsSchema.parse(searchParams);- const helpers = await createAuthenticatedSSRHelper();+ const helpers = await createPrivateSSRHelper();await Promise.all([- helpers.space.members.prefetch(),+ helpers.space.listMembers.prefetch(),helpers.events.infiniteList.prefetchInfinite({status,search: q,diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsxindex 8447e6504..0c7148981 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/layout.tsx@@ -13,12 +13,11 @@ import {SidebarSeparator,} from "@rallly/ui/sidebar";import { GaugeIcon, Settings2Icon } from "lucide-react";-import type { Metadata } from "next";import Link from "next/link";import { FeedbackMenuItem } from "@/app/[locale]/(app)/(space)/(dashboard)/components/feedback-menu-item";import { SpaceSidebarMenu } from "@/app/[locale]/(app)/(space)/(dashboard)/components/space-sidebar-menu";import { UpgradeMenuItem } from "@/app/[locale]/(app)/(space)/(dashboard)/components/upgrade-menu-item";-import { requireSpace, requireUser } from "@/auth/data";+import { requireUser } from "@/auth/data";import { NavUser } from "@/components/nav-user";import { LicenseLimitWarning } from "@/features/licensing/components/license-limit-warning";import { CommandMenu } from "@/features/navigation/command-menu";@@ -33,18 +32,14 @@ export default async function Layout({}: {children: React.ReactNode;}) {- const [user, activeSpace, spaces] = await Promise.all([- requireUser(),- requireSpace(),- loadSpaces(),- ]);+ const [user, spaces] = await Promise.all([requireUser(), loadSpaces()]);return (<SpaceSidebarProvider><CommandMenu /><Sidebar><SidebarHeader>- <SpaceDropdown spaces={spaces} initialSpaceId={activeSpace.id} />+ <SpaceDropdown spaces={spaces} /></SidebarHeader><SidebarContent><SpaceSidebarMenu />@@ -53,7 +48,7 @@ export default async function Layout({<SidebarGroup><SidebarGroupContent><SidebarMenu>- {activeSpace.tier === "hobby" ? <UpgradeMenuItem /> : null}+ <UpgradeMenuItem /><IfFeatureEnabled feature="feedback"><FeedbackMenuItem /></IfFeatureEnabled>@@ -98,13 +93,3 @@ export default async function Layout({</SpaceSidebarProvider>);}--export async function generateMetadata(): Promise<Metadata> {- const space = await requireSpace();- return {- title: {- template: "%s",- default: space.name,- },- };-}diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/page.tsxindex 56617898a..52bacea14 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/page.tsx@@ -1,11 +1,11 @@import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import type { Metadata } from "next";import { getTranslation } from "@/i18n/server";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";import { DashboardHome } from "./dashboard-home";export default async function Page() {- const helpers = await createAuthenticatedSSRHelper();+ const helpers = await createPrivateSSRHelper();await helpers.dashboard.stats.prefetch();diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsxindex 748ca2b72..7055f5994 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/page.tsx@@ -1,7 +1,7 @@import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import type { Metadata } from "next";import { getTranslation } from "@/i18n/server";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";import { PollsPage } from "./polls-page";import { searchParamsSchema } from "./schema";@@ -11,10 +11,10 @@ export default async function Page(props: {const searchParams = await props.searchParams;const { status, q, member } = searchParamsSchema.parse(searchParams);- const helpers = await createAuthenticatedSSRHelper();+ const helpers = await createPrivateSSRHelper();await Promise.all([- helpers.space.members.prefetch(),+ helpers.space.listMembers.prefetch(),helpers.polls.infiniteChronological.prefetchInfinite({status,search: q,diff --git a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsxindex 211c8092b..481d79154 100644--- a/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/(dashboard)/polls/polls-page.tsx@@ -57,7 +57,7 @@ function PollsEmptyState() {export function PollsPage() {const searchParams = useSearchParams();const { t } = useTranslation();- const [members] = trpc.space.members.useSuspenseQuery();+ const [{ data: members }] = trpc.space.listMembers.useSuspenseQuery();const { status, q, member } = searchParamsSchema.parse(Object.fromEntries(searchParams.entries()),diff --git a/apps/web/src/app/[locale]/(app)/(space)/layout.tsx b/apps/web/src/app/[locale]/(app)/(space)/layout.tsxindex cba38100e..2325ef854 100644--- a/apps/web/src/app/[locale]/(app)/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/layout.tsx@@ -1,26 +1,32 @@-import { requireSpace, requireUser } from "@/auth/data";+import { dehydrate, HydrationBoundary } from "@tanstack/react-query";+import { redirect } from "next/navigation";import { BillingProvider } from "@/features/billing/client";import { SpaceProvider } from "@/features/space/client";--async function loadData() {- const [user, space] = await Promise.all([requireUser(), requireSpace()]);-- return {- user,- space,- };-}+import { getPathname } from "@/lib/pathname";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";+import { buildSafeRedirectUrl } from "@/utils/redirect";export default async function Layout({children,}: {children: React.ReactNode;}) {- const { user, space } = await loadData();+ const helpers = await createPrivateSSRHelper();++ const space = await helpers.space.getCurrent.fetch();++ if (!space) {+ const pathname = await getPathname();+ redirect(+ buildSafeRedirectUrl({ destination: "/setup", returnUrl: pathname }),+ );+ }return (- <SpaceProvider key={space.id} data={space} userId={user.id}>- <BillingProvider>{children}</BillingProvider>- </SpaceProvider>+ <HydrationBoundary state={dehydrate(helpers.queryClient)}>+ <SpaceProvider>+ <BillingProvider>{children}</BillingProvider>+ </SpaceProvider>+ </HydrationBoundary>);}diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/page.tsxindex 4c0f159f3..f72f9a15d 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/api-keys/page.tsx@@ -13,26 +13,20 @@ import {SettingsPageHeader,SettingsPageTitle,} from "@/app/components/settings-layout";-import { requireSpace, requireUser } from "@/auth/data";-import { isApiAccessEnabled } from "@/features/developer/data";import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";import { ApiKeysList } from "./components/api-keys-list";import { CreateApiKeyButton } from "./components/create-api-key-button";export default async function ApiKeysSettingsPage() {- const [space, user] = await Promise.all([requireSpace(), requireUser()]);-- const hasAccess = await isApiAccessEnabled(user, space);-- if (!hasAccess) {+ const helpers = await createPrivateSSRHelper();+ try {+ await helpers.apiKeys.list.prefetch();+ } catch {notFound();}- const helpers = await createAuthenticatedSSRHelper();- await helpers.apiKeys.list.prefetch();-return (<HydrationBoundary state={dehydrate(helpers.queryClient)}><SettingsPage>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsxindex 5e5928a29..7757ad340 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page-client.tsx@@ -1,6 +1,5 @@"use client";-import type { SubscriptionStatus } from "@rallly/database";import { usePostHog } from "@rallly/posthog/client";import { Alert, AlertDescription, AlertTitle } from "@rallly/ui/alert";import { Button } from "@rallly/ui/button";@@ -11,6 +10,7 @@ import {CheckCircleIcon,CreditCardIcon,SendIcon,+ ShieldXIcon,} from "lucide-react";import { useSearchParams } from "next/navigation";import {@@ -22,167 +22,214 @@ import {PageSectionHeader,PageSectionTitle,} from "@/app/components/page-layout";+import {+ SettingsPage,+ SettingsPageContent,+ SettingsPageDescription,+ SettingsPageHeader,+ SettingsPageTitle,+} from "@/app/components/settings-layout";+import {+ EmptyState,+ EmptyStateDescription,+ EmptyStateIcon,+ EmptyStateTitle,+} from "@/components/empty-state";import { useBilling } from "@/features/billing/client";import { SubscriptionStatusLabel } from "@/features/billing/components/subscription-status-label";+import { useSpace } from "@/features/space/client";import type { SpaceTier } from "@/features/space/schema";import { Trans } from "@/i18n/client";+import { trpc } from "@/trpc/client";import { BillingPlan } from "./components/billing-plan";import { ManageSeatsDialog } from "./components/manage-seats-dialog";-export function BillingPageClient({- tier,- subscription,- totalSeats,- usedSeats,-}: {- tier: SpaceTier;- subscription?: {- id: string;- status: SubscriptionStatus;- cancelAtPeriodEnd: boolean;- periodEnd: Date;- };- totalSeats: number;- usedSeats: number;-}) {- const posthog = usePostHog();+export function BillingPageClient() {+ const { data: space, getMemberAbility } = useSpace();+ const ability = getMemberAbility();+ const canManageBilling = ability.can("manage", "Billing");++ if (!canManageBilling) {+ return (+ <EmptyState className="h-full">+ <EmptyStateIcon>+ <ShieldXIcon />+ </EmptyStateIcon>+ <EmptyStateTitle>+ <Trans i18nKey="accessDenied" defaults="Access Denied" />+ </EmptyStateTitle>+ <EmptyStateDescription>+ <Trans+ i18nKey="ownerPermissionsRequired"+ defaults="Only space owners can access billing settings."+ />+ </EmptyStateDescription>+ </EmptyState>+ );+ }++ return <BillingPageContent tier={space.tier} />;+}+function BillingPageContent({ tier }: { tier: SpaceTier }) {+ const posthog = usePostHog();const searchParams = useSearchParams();const { showPayWall } = useBilling();+ const [subscription] = trpc.billing.getSubscription.useSuspenseQuery();+ const [seats] = trpc.space.seats.useSuspenseQuery();+const didUpdateSeats = searchParams.has("seats_updated");return (- <PageSectionGroup>- <PageSection>- <PageSectionHeader>- <PageSectionTitle>- <Trans i18nKey="billingPlanTitle" defaults="Plan" />- </PageSectionTitle>- <PageSectionDescription>- <Trans- i18nKey="billingSubscriptionDescription"- defaults="Manage your current subscription plan"- />- </PageSectionDescription>- </PageSectionHeader>- <PageSectionContent>- <BillingPlan- tier={tier}- status={- subscription ? (- <SubscriptionStatusLabel- status={subscription.status}- cancelAtPeriodEnd={subscription.cancelAtPeriodEnd}- periodEnd={subscription.periodEnd}- />- ) : (- <Trans i18nKey="priceFree" />- )- }- seats={totalSeats}+ <SettingsPage>+ <SettingsPageHeader>+ <SettingsPageTitle>+ <Trans i18nKey="billing" defaults="Billing" />+ </SettingsPageTitle>+ <SettingsPageDescription>+ <Trans+ i18nKey="billingDescription"+ defaults="Manage your billing information and subscription."/>- <div>- {subscription ? (- <div className="flex justify-between gap-2">- <Button- onClick={() => {- posthog?.capture(- "space_billing:billing_portal_button_click",- );- }}- asChild- >- <a href="/api/stripe/portal">- <Icon>- <CreditCardIcon />- </Icon>- <Trans- i18nKey="manageSubscription"- defaults="Manage Subscription"+ </SettingsPageDescription>+ </SettingsPageHeader>+ <SettingsPageContent>+ <PageSectionGroup>+ <PageSection>+ <PageSectionHeader>+ <PageSectionTitle>+ <Trans i18nKey="billingPlanTitle" defaults="Plan" />+ </PageSectionTitle>+ <PageSectionDescription>+ <Trans+ i18nKey="billingSubscriptionDescription"+ defaults="Manage your current subscription plan"+ />+ </PageSectionDescription>+ </PageSectionHeader>+ <PageSectionContent>+ <BillingPlan+ tier={tier}+ status={+ subscription ? (+ <SubscriptionStatusLabel+ status={subscription.status}+ cancelAtPeriodEnd={subscription.cancelAtPeriodEnd}+ periodEnd={subscription.periodEnd}/>- </a>- </Button>- <ManageSeatsDialog- usedSeats={usedSeats}- currentSeats={totalSeats}- >- <DialogTrigger asChild>+ ) : (+ <Trans i18nKey="priceFree" />+ )+ }+ seats={seats.total}+ />+ <div>+ {subscription ? (+ <div className="flex justify-between gap-2"><ButtononClick={() => {posthog?.capture(- "space_billing:manage_seats_button_click",+ "space_billing:billing_portal_button_click",);}}+ asChild>- <Icon>- <ArmchairIcon />- </Icon>- <Trans i18nKey="manageSeats" defaults="Manage Seats" />+ <a href="/api/stripe/portal">+ <Icon>+ <CreditCardIcon />+ </Icon>+ <Trans+ i18nKey="manageSubscription"+ defaults="Manage Subscription"+ />+ </a></Button>- </DialogTrigger>- </ManageSeatsDialog>+ <ManageSeatsDialog+ usedSeats={seats.used}+ currentSeats={seats.total}+ >+ <DialogTrigger asChild>+ <Button+ onClick={() => {+ posthog?.capture(+ "space_billing:manage_seats_button_click",+ );+ }}+ >+ <Icon>+ <ArmchairIcon />+ </Icon>+ <Trans+ i18nKey="manageSeats"+ defaults="Manage Seats"+ />+ </Button>+ </DialogTrigger>+ </ManageSeatsDialog>+ </div>+ ) : (+ <Button+ variant="primary"+ onClick={() => {+ showPayWall();+ posthog?.capture("space_billing:upgrade_button_click");+ }}+ >+ <Trans i18nKey="upgradeToPro" />+ </Button>+ )}</div>- ) : (+ {didUpdateSeats ? (+ <Alert variant="success">+ <CheckCircleIcon />+ <AlertTitle>+ <Trans+ i18nKey="seatsUpdatedAlertTitle"+ defaults="Seats Updated"+ />+ </AlertTitle>+ <AlertDescription>+ <Trans+ i18nKey="seatsUpdatedAlertDescription"+ defaults="Your seat allocation has been successfully updated. The changes will be reflected in your next billing cycle."+ />+ </AlertDescription>+ </Alert>+ ) : null}+ </PageSectionContent>+ </PageSection>+ <PageSectionDivider />+ <PageSection>+ <PageSectionHeader>+ <PageSectionTitle>+ <Trans i18nKey="support" defaults="Support" />+ </PageSectionTitle>+ <PageSectionDescription>+ <Trans+ i18nKey="supportDescription"+ defaults="Need help with anything?"+ />+ </PageSectionDescription>+ </PageSectionHeader>+ <PageSectionContent><Button- variant="primary"onClick={() => {- showPayWall();- posthog?.capture("space_billing:upgrade_button_click");+ posthog?.capture("space_billing:support_button_click");}}+ asChild>- <Trans i18nKey="upgradeToPro" />+ <a href="mailto:[email protected]">+ <Icon>+ <SendIcon />+ </Icon>+ <Trans i18nKey="contactSupport" defaults="Contact Support" />+ </a></Button>- )}- </div>- {didUpdateSeats ? (- <Alert variant="success">- <CheckCircleIcon />- <AlertTitle>- <Trans- i18nKey="seatsUpdatedAlertTitle"- defaults="Seats Updated"- />- </AlertTitle>- <AlertDescription>- <Trans- i18nKey="seatsUpdatedAlertDescription"- defaults="Your seat allocation has been successfully updated. The changes will be reflected in your next billing cycle."- />- </AlertDescription>- </Alert>- ) : null}- </PageSectionContent>- </PageSection>- <PageSectionDivider />- <PageSection>- <PageSectionHeader>- <PageSectionTitle>- <Trans i18nKey="support" defaults="Support" />- </PageSectionTitle>- <PageSectionDescription>- <Trans- i18nKey="supportDescription"- defaults="Need help with anything?"- />- </PageSectionDescription>- </PageSectionHeader>- <PageSectionContent>- <Button- onClick={() => {- posthog?.capture("space_billing:support_button_click");- }}- asChild- >- <a href="mailto:[email protected]">- <Icon>- <SendIcon />- </Icon>- <Trans i18nKey="contactSupport" defaults="Contact Support" />- </a>- </Button>- </PageSectionContent>- </PageSection>- </PageSectionGroup>+ </PageSectionContent>+ </PageSection>+ </PageSectionGroup>+ </SettingsPageContent>+ </SettingsPage>);}diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsxindex c7f7e8425..6a913bb6f 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/billing/page.tsx@@ -1,87 +1,27 @@-import { ShieldXIcon } from "lucide-react";+import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import type { Metadata } from "next";import { notFound } from "next/navigation";-import {- SettingsPage,- SettingsPageContent,- SettingsPageDescription,- SettingsPageHeader,- SettingsPageTitle,-} from "@/app/components/settings-layout";-import { requireSpace, requireUser } from "@/auth/data";-import {- EmptyState,- EmptyStateDescription,- EmptyStateIcon,- EmptyStateTitle,-} from "@/components/empty-state";-import { getSpaceSubscription } from "@/features/billing/data";-import { loadMembers } from "@/features/space/data";-import { defineAbilityForMember } from "@/features/space/member/ability";-import { getTotalSeatsForSpace } from "@/features/space/utils";-import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { isFeatureEnabled } from "@/lib/feature-flags/server";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";import { BillingPageClient } from "./page-client";export default async function BillingSettingsPage() {if (!isFeatureEnabled("billing")) {notFound();}- const [space, user] = await Promise.all([requireSpace(), requireUser()]);- const ability = defineAbilityForMember({ space, user });- const canManageBilling = ability.can("manage", "Billing");+ const helpers = await createPrivateSSRHelper();- if (!canManageBilling) {- return (- <EmptyState className="h-full">- <EmptyStateIcon>- <ShieldXIcon />- </EmptyStateIcon>- <EmptyStateTitle>- <Trans i18nKey="accessDenied" defaults="Access Denied" />- </EmptyStateTitle>- <EmptyStateDescription>- <Trans- i18nKey="ownerPermissionsRequired"- defaults="Only space owners can access billing settings."- />- </EmptyStateDescription>- </EmptyState>- );- }-- const [subscription, members, totalSeats] = await Promise.all([- getSpaceSubscription(space.id),- loadMembers(),- getTotalSeatsForSpace(space.id),+ await Promise.all([+ helpers.billing.getSubscription.prefetch(),+ helpers.space.seats.prefetch(),]);- const usedSeats = members.total;-return (- <SettingsPage>- <SettingsPageHeader>- <SettingsPageTitle>- <Trans i18nKey="billing" defaults="Billing" />- </SettingsPageTitle>- <SettingsPageDescription>- <Trans- i18nKey="billingDescription"- defaults="Manage your billing information and subscription."- />- </SettingsPageDescription>- </SettingsPageHeader>- <SettingsPageContent>- <BillingPageClient- tier={space.tier}- subscription={subscription ?? undefined}- totalSeats={totalSeats}- usedSeats={usedSeats}- />- </SettingsPageContent>- </SettingsPage>+ <HydrationBoundary state={dehydrate(helpers.queryClient)}>+ <BillingPageClient />+ </HydrationBoundary>);}diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/page.tsxindex 0c8a2967b..bbdbbf0a9 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/calendars/page.tsx@@ -19,7 +19,7 @@ import {import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";import { isFeatureEnabled } from "@/lib/feature-flags/server";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";import { CalendarConnectionList } from "./components/calendar-connection-list";import { ConnectCalendarDropdown } from "./components/connect-calendar-dropdown";import { DefaultCalendarSelect } from "./components/default-calendar-select";@@ -31,7 +31,7 @@ export default async function CalendarsPage() {notFound();}- const trpc = await createAuthenticatedSSRHelper();+ const trpc = await createPrivateSSRHelper();await Promise.all([trpc.calendars.list.prefetch(),diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/components/sidebar.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/components/sidebar.tsxindex 296e0f721..abc835e47 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/components/sidebar.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/components/sidebar.tsx@@ -1,5 +1,6 @@"use client";+import { useFeatureFlagEnabled } from "@rallly/posthog/client";import { Icon } from "@rallly/ui/icon";import {SidebarGroup,@@ -22,6 +23,8 @@ import {} from "lucide-react";import { usePathname } from "next/navigation";import { HoverPrefetchLink } from "@/components/hover-prefetch-link";+import { useUser } from "@/components/user-provider";+import { useSpace } from "@/features/space/client";import { Trans, useTranslation } from "@/i18n/client";import { useFeatureFlag } from "@/lib/feature-flags/client";@@ -134,17 +137,15 @@ export function SpaceSidebarMenu() {}export function DeveloperSidebarMenu() {- const { t } = useTranslation();+ const { data: space } = useSpace();+ const { user } = useUser();+ const isSpaceOwner = space.ownerId === user?.id;const pathname = usePathname();+ const isDeveloperToolsEnabled = useFeatureFlagEnabled("developer-tools");- const menuItems = [- {- id: "apiKeys",- label: t("apiKeys", { defaultValue: "API Keys" }),- icon: <KeyIcon />,- href: "/settings/api-keys",- },- ];+ if (!isSpaceOwner || !isDeveloperToolsEnabled) {+ return null;+ }return (<SidebarGroup>@@ -153,22 +154,22 @@ export function DeveloperSidebarMenu() {</SidebarGroupLabel><SidebarGroupContent><SidebarMenu>- {menuItems.map((item) => (- <SidebarMenuItem key={item.id}>- <SidebarMenuButton- asChild- isActive={pathname.startsWith(item.href)}+ <SidebarMenuItem>+ <SidebarMenuButton+ asChild+ isActive={pathname.startsWith("/settings/api-keys")}+ >+ <HoverPrefetchLink+ href="/settings/api-keys"+ className="flex items-center gap-x-2">- <HoverPrefetchLink- href={item.href}- className="flex items-center gap-x-2"- >- <Icon>{item.icon}</Icon>- {item.label}- </HoverPrefetchLink>- </SidebarMenuButton>- </SidebarMenuItem>- ))}+ <Icon>+ <KeyIcon />+ </Icon>+ <Trans i18nKey="apiKeys" defaults="API Keys" />+ </HoverPrefetchLink>+ </SidebarMenuButton>+ </SidebarMenuItem></SidebarMenu></SidebarGroupContent></SidebarGroup>diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/general/page-client.tsxnew file mode 100644index 000000000..d49af4171--- /dev/null+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/general/page-client.tsx@@ -0,0 +1,107 @@+"use client";++import { subject } from "@casl/ability";+import { Alert, AlertDescription } from "@rallly/ui/alert";+import { EyeIcon } from "lucide-react";+import {+ PageSection,+ PageSectionContent,+ PageSectionDescription,+ PageSectionGroup,+ PageSectionHeader,+ PageSectionTitle,+} from "@/app/components/page-layout";+import {+ SettingsPage,+ SettingsPageContent,+ SettingsPageDescription,+ SettingsPageHeader,+ SettingsPageTitle,+} from "@/app/components/settings-layout";+import { useUser } from "@/components/user-provider";+import { useSpace } from "@/features/space/client";+import { Trans } from "@/i18n/client";+import { DeleteSpaceButton } from "./components/delete-space-button";+import { LeaveSpaceButton } from "./components/leave-space-button";+import { SpaceSettingsForm } from "./components/space-settings-form";++export function GeneralSettingsPageClient() {+ const { data: space, getMemberAbility } = useSpace();+ const { user } = useUser();+ const ability = getMemberAbility();+ const isAdmin = space.role === "admin";+ const canDeleteSpace = ability.can("delete", subject("Space", { ...space }));+ const isOwner = user ? space.ownerId === user.id : false;++ return (+ <SettingsPage>+ <SettingsPageHeader>+ <SettingsPageTitle>+ <Trans i18nKey="general" defaults="General" />+ </SettingsPageTitle>+ <SettingsPageDescription>+ <Trans+ i18nKey="generalDescription"+ defaults="Change the settings of your current space"+ />+ </SettingsPageDescription>+ </SettingsPageHeader>+ <SettingsPageContent>+ <PageSectionGroup>+ {!isAdmin ? (+ <Alert variant="note">+ <EyeIcon />+ <AlertDescription>+ <Trans+ i18nKey="generalSettingsAdminRoleRequired"+ defaults="You need to be an admin to make changes to this space."+ />+ </AlertDescription>+ </Alert>+ ) : null}+ <PageSection variant="card">+ <PageSectionContent>+ <SpaceSettingsForm space={space} disabled={!isAdmin} />+ </PageSectionContent>+ </PageSection>+ {!isOwner ? (+ <PageSection variant="card">+ <PageSectionHeader>+ <PageSectionTitle>+ <Trans i18nKey="leaveSpace" defaults="Leave Space" />+ </PageSectionTitle>+ <PageSectionDescription>+ <Trans+ i18nKey="leaveSpaceDescription"+ defaults="Remove yourself from this space. You'll lose access to all polls in this space."+ />+ </PageSectionDescription>+ </PageSectionHeader>+ <PageSectionContent>+ <LeaveSpaceButton spaceName={space.name} spaceId={space.id} />+ </PageSectionContent>+ </PageSection>+ ) : null}+ {canDeleteSpace ? (+ <PageSection variant="card">+ <PageSectionHeader>+ <PageSectionTitle>+ <Trans i18nKey="deleteSpace" defaults="Delete Space" />+ </PageSectionTitle>+ <PageSectionDescription>+ <Trans+ i18nKey="deleteSpaceDescription"+ defaults="Permanently delete this space and all its content. This action cannot be undone."+ />+ </PageSectionDescription>+ </PageSectionHeader>+ <PageSectionContent>+ <DeleteSpaceButton spaceName={space.name} spaceId={space.id} />+ </PageSectionContent>+ </PageSection>+ ) : null}+ </PageSectionGroup>+ </SettingsPageContent>+ </SettingsPage>+ );+}diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/general/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/general/page.tsxindex 4b0064225..029151368 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/general/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/general/page.tsx@@ -1,108 +1,9 @@-import { subject } from "@casl/ability";-import { Alert, AlertDescription } from "@rallly/ui/alert";-import { EyeIcon } from "lucide-react";import type { Metadata } from "next";-import {- PageSection,- PageSectionContent,- PageSectionDescription,- PageSectionGroup,- PageSectionHeader,- PageSectionTitle,-} from "@/app/components/page-layout";-import {- SettingsPage,- SettingsPageContent,- SettingsPageDescription,- SettingsPageHeader,- SettingsPageTitle,-} from "@/app/components/settings-layout";-import { requireSpace, requireUser } from "@/auth/data";-import { defineAbilityForMember } from "@/features/space/member/ability";-import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";-import { DeleteSpaceButton } from "./components/delete-space-button";-import { LeaveSpaceButton } from "./components/leave-space-button";-import { SpaceSettingsForm } from "./components/space-settings-form";+import { GeneralSettingsPageClient } from "./page-client";-export default async function GeneralSettingsPage() {- const [space, user] = await Promise.all([requireSpace(), requireUser()]);- const ability = defineAbilityForMember({ space, user });- const isAdmin = space.role === "admin";- const canDeleteSpace = ability.can("delete", subject("Space", { ...space }));-- const isOwner = space.ownerId === user.id;- return (- <SettingsPage>- <SettingsPageHeader>- <SettingsPageTitle>- <Trans i18nKey="general" defaults="General" />- </SettingsPageTitle>- <SettingsPageDescription>- <Trans- i18nKey="generalDescription"- defaults="Change the settings of your current space"- />- </SettingsPageDescription>- </SettingsPageHeader>- <SettingsPageContent>- <PageSectionGroup>- {!isAdmin ? (- <Alert variant="note">- <EyeIcon />- <AlertDescription>- <Trans- i18nKey="generalSettingsAdminRoleRequired"- defaults="You need to be an admin to make changes to this space."- />- </AlertDescription>- </Alert>- ) : null}- <PageSection variant="card">- <PageSectionContent>- <SpaceSettingsForm space={space} disabled={!isAdmin} />- </PageSectionContent>- </PageSection>- {!isOwner ? (- <PageSection variant="card">- <PageSectionHeader>- <PageSectionTitle>- <Trans i18nKey="leaveSpace" defaults="Leave Space" />- </PageSectionTitle>- <PageSectionDescription>- <Trans- i18nKey="leaveSpaceDescription"- defaults="Remove yourself from this space. You'll lose access to all polls in this space."- />- </PageSectionDescription>- </PageSectionHeader>- <PageSectionContent>- <LeaveSpaceButton spaceName={space.name} spaceId={space.id} />- </PageSectionContent>- </PageSection>- ) : null}- {canDeleteSpace ? (- <PageSection variant="card">- <PageSectionHeader>- <PageSectionTitle>- <Trans i18nKey="deleteSpace" defaults="Delete Space" />- </PageSectionTitle>- <PageSectionDescription>- <Trans- i18nKey="deleteSpaceDescription"- defaults="Permanently delete this space and all its content. This action cannot be undone."- />- </PageSectionDescription>- </PageSectionHeader>- <PageSectionContent>- <DeleteSpaceButton spaceName={space.name} spaceId={space.id} />- </PageSectionContent>- </PageSection>- ) : null}- </PageSectionGroup>- </SettingsPageContent>- </SettingsPage>- );+export default function GeneralSettingsPage() {+ return <GeneralSettingsPageClient />;}export async function generateMetadata(): Promise<Metadata> {diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsxindex aa04f5f22..3a1c80388 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/layout.tsx@@ -18,10 +18,9 @@ import {import { ArrowLeftIcon, SettingsIcon } from "lucide-react";import Link from "next/link";import type React from "react";-import { requireSpace, requireUser } from "@/auth/data";+import { requireUser } from "@/auth/data";import { NavUser } from "@/components/nav-user";import { BillingProvider } from "@/features/billing/client";-import { isApiAccessEnabled } from "@/features/developer/data";import { Trans } from "@/i18n/client";import {AccountSidebarMenu,@@ -34,8 +33,7 @@ export default async function Layout({}: {children?: React.ReactNode;}) {- const [user, space] = await Promise.all([requireUser(), requireSpace()]);- const canAccessDeveloperTools = await isApiAccessEnabled(user, space);+ const user = await requireUser();return (<BillingProvider>@@ -79,7 +77,7 @@ export default async function Layout({<SpaceSidebarMenu /></SidebarGroupContent></SidebarGroup>- {canAccessDeveloperTools ? <DeveloperSidebarMenu /> : null}+ <DeveloperSidebarMenu /></SidebarContent><SidebarFooter><NavUserdiff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsxnew file mode 100644index 000000000..223926190--- /dev/null+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page-client.tsx@@ -0,0 +1,196 @@+"use client";++import { Alert, AlertDescription } from "@rallly/ui/alert";+import { Badge } from "@rallly/ui/badge";+import { InfoIcon } from "lucide-react";+import Link from "next/link";+import {+ PageSection,+ PageSectionContent,+ PageSectionDescription,+ PageSectionDivider,+ PageSectionGroup,+ PageSectionHeader,+ PageSectionTitle,+} from "@/app/components/page-layout";+import {+ SettingsPage,+ SettingsPageContent,+ SettingsPageDescription,+ SettingsPageHeader,+ SettingsPageTitle,+} from "@/app/components/settings-layout";+import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";+import { StackedList, StackedListItem } from "@/components/stacked-list";+import { IfCloudHosted, IfSelfHosted } from "@/contexts/environment";+import { SpaceRole } from "@/features/space/components/space-role";+import { Trans } from "@/i18n/client";+import { trpc } from "@/trpc/client";+import { InviteDropdownMenu } from "./components/invite-dropdown-menu";+import { InviteMemberButton } from "./components/invite-member-button";+import { MemberDropdownMenu } from "./components/member-dropdown-menu";++export function MembersSettingsPageClient() {+ const [members] = trpc.space.listMembers.useSuspenseQuery();+ const [invites] = trpc.space.listInvites.useSuspenseQuery();+ const [seats] = trpc.space.seats.useSuspenseQuery();++ return (+ <SettingsPage>+ <SettingsPageHeader>+ <SettingsPageTitle>+ <Trans i18nKey="members" />+ </SettingsPageTitle>+ <SettingsPageDescription>+ <Trans+ i18nKey="membersDescription"+ defaults="Members have access to your space"+ />+ </SettingsPageDescription>+ </SettingsPageHeader>+ <SettingsPageContent>+ <PageSectionGroup>+ <PageSection>+ <PageSectionContent>+ <StackedList>+ {members.data.map((member) => (+ <StackedListItem key={member.id}>+ <div className="flex flex-1 items-center gap-4">+ <OptimizedAvatarImage+ src={member.image ?? undefined}+ name={member.name}+ size="lg"+ />+ <div>+ <div className="flex items-center gap-x-2">+ <div className="font-semibold text-sm">+ {member.name}+ </div>+ <div>+ {member.isOwner ? (+ <Badge>+ <Trans i18nKey="owner" defaults="Owner" />+ </Badge>+ ) : null}+ </div>+ </div>+ <div className="text-muted-foreground text-sm">+ {member.email}+ </div>+ </div>+ </div>+ <div className="text-sm">+ <SpaceRole role={member.role} />+ </div>+ <MemberDropdownMenu member={member} />+ </StackedListItem>+ ))}+ </StackedList>+ </PageSectionContent>+ </PageSection>+ <PageSectionDivider />+ <PageSection>+ <PageSectionHeader>+ <PageSectionTitle>+ <Trans i18nKey="pendingInvites" defaults="Pending Invites" />+ </PageSectionTitle>+ <PageSectionDescription>+ <Trans+ i18nKey="pendingInvitesDescription"+ defaults="Invite other users to share your space."+ />+ </PageSectionDescription>+ </PageSectionHeader>+ <PageSectionContent>+ {invites.length > 0 ? (+ <StackedList>+ {invites.map((invite) => (+ <StackedListItem key={invite.id}>+ <div className="flex flex-1 items-center gap-4">+ <OptimizedAvatarImage name={invite.email} size="md" />+ <div>+ <div className="flex items-center gap-x-2">+ <div className="font-semibold text-sm">+ {invite.email}+ </div>+ </div>+ <div className="text-muted-foreground text-sm">+ <Trans+ i18nKey="memberInvitedBy"+ defaults="Invited by {inviterName}"+ values={{ inviterName: invite.invitedBy.name }}+ />+ </div>+ </div>+ </div>+ <div className="text-sm">+ <SpaceRole role={invite.role} />+ </div>+ <InviteDropdownMenu invite={invite} />+ </StackedListItem>+ ))}+ </StackedList>+ ) : null}+ <div className="flex items-center gap-4">+ <InviteMemberButton+ usedSeats={seats.used}+ totalSeats={seats.total}+ />+ <p className="font-medium text-sm">+ <Trans+ i18nKey="seatUsage"+ defaults="{usedSeats} of {totalSeats} seats used"+ values={{+ usedSeats: seats.used,+ totalSeats: seats.total,+ }}+ />+ </p>+ </div>+ {seats.total - seats.used <= 0 ? (+ <Alert variant="info">+ <InfoIcon />+ <AlertDescription>+ <IfCloudHosted>+ <p>+ <Trans+ i18nKey="noSeatsAvailableAlertBillingDescription"+ defaults="Increase the number of seats in this space from the <a>billing page</a>."+ components={{+ a: (+ <Link+ className="underline hover:text-foreground"+ href="/settings/billing"+ />+ ),+ }}+ />+ </p>+ </IfCloudHosted>+ <IfSelfHosted>+ <p>+ <Trans+ i18nKey="noSeatsAvailableAlertSelfHostedDescription"+ defaults="You will need to <a>upgrade</a> to increase the number of seats in this space."+ components={{+ a: (+ <Link+ className="underline hover:text-foreground"+ prefetch={false}+ href="https://support.rallly.co/self-hosting/licensing"+ />+ ),+ }}+ />+ </p>+ </IfSelfHosted>+ </AlertDescription>+ </Alert>+ ) : null}+ </PageSectionContent>+ </PageSection>+ </PageSectionGroup>+ </SettingsPageContent>+ </SettingsPage>+ );+}diff --git a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsxindex 3f147cf1b..fb3b0bb79 100644--- a/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx+++ b/apps/web/src/app/[locale]/(app)/(space)/settings/members/page.tsx@@ -1,201 +1,22 @@-import { Alert, AlertDescription } from "@rallly/ui/alert";-import { Badge } from "@rallly/ui/badge";-import { InfoIcon } from "lucide-react";+import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import type { Metadata } from "next";-import Link from "next/link";-import {- PageSection,- PageSectionContent,- PageSectionDescription,- PageSectionDivider,- PageSectionGroup,- PageSectionHeader,- PageSectionTitle,-} from "@/app/components/page-layout";-import {- SettingsPage,- SettingsPageContent,- SettingsPageDescription,- SettingsPageHeader,- SettingsPageTitle,-} from "@/app/components/settings-layout";-import { requireSpace } from "@/auth/data";-import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";-import { StackedList, StackedListItem } from "@/components/stacked-list";-import { IfCloudHosted, IfSelfHosted } from "@/contexts/environment";-import { SpaceRole } from "@/features/space/components/space-role";-import { loadInvites, loadMembers } from "@/features/space/data";-import { getTotalSeatsForSpace } from "@/features/space/utils";-import { Trans } from "@/i18n/client";import { getTranslation } from "@/i18n/server";-import { InviteDropdownMenu } from "./components/invite-dropdown-menu";-import { InviteMemberButton } from "./components/invite-member-button";-import { MemberDropdownMenu } from "./components/member-dropdown-menu";+import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";+import { MembersSettingsPageClient } from "./page-client";export default async function MembersSettingsPage() {- const space = await requireSpace();- const [members, invites, totalSeats] = await Promise.all([- loadMembers(),- loadInvites(),- getTotalSeatsForSpace(space.id),- ]);+ const helpers = await createPrivateSSRHelper();- const usedSeats = members.total;+ await Promise.all([+ helpers.space.listMembers.prefetch(),+ helpers.space.listInvites.prefetch(),+ helpers.space.seats.prefetch(),+ ]);return (- <SettingsPage>- <SettingsPageHeader>- <SettingsPageTitle>- <Trans i18nKey="members" />- </SettingsPageTitle>- <SettingsPageDescription>- <Trans- i18nKey="membersDescription"- defaults="Members have access to your space"- />- </SettingsPageDescription>- </SettingsPageHeader>- <SettingsPageContent>- <PageSectionGroup>- <PageSection>- <PageSectionContent>- <StackedList>- {members.data.map((member) => (- <StackedListItem key={member.id}>- <div className="flex flex-1 items-center gap-4">- <OptimizedAvatarImage- src={member.image ?? undefined}- name={member.name}- size="lg"- />- <div>- <div className="flex items-center gap-x-2">- <div className="font-semibold text-sm">- {member.name}- </div>- <div>- {member.isOwner ? (- <Badge>- <Trans i18nKey="owner" defaults="Owner" />- </Badge>- ) : null}- </div>- </div>- <div className="text-muted-foreground text-sm">- {member.email}- </div>- </div>- </div>- <div className="text-sm">- <SpaceRole role={member.role} />- </div>- <MemberDropdownMenu member={member} />- </StackedListItem>- ))}- </StackedList>- </PageSectionContent>- </PageSection>- <PageSectionDivider />- <PageSection>- <PageSectionHeader>- <PageSectionTitle>- <Trans i18nKey="pendingInvites" defaults="Pending Invites" />- </PageSectionTitle>- <PageSectionDescription>- <Trans- i18nKey="pendingInvitesDescription"- defaults="Invite other users to share your space."- />- </PageSectionDescription>- </PageSectionHeader>- <PageSectionContent>- {invites.length > 0 ? (- <StackedList>- {invites.map((invite) => (- <StackedListItem key={invite.id}>- <div className="flex flex-1 items-center gap-4">- <OptimizedAvatarImage name={invite.email} size="md" />- <div>- <div className="flex items-center gap-x-2">- <div className="font-semibold text-sm">- {invite.email}- </div>- </div>- <div className="text-muted-foreground text-sm">- <Trans- i18nKey="memberInvitedBy"- defaults="Invited by {inviterName}"- values={{ inviterName: invite.invitedBy.name }}- />- </div>- </div>- </div>- <div className="text-sm">- <SpaceRole role={invite.role} />- </div>- <InviteDropdownMenu invite={invite} />- </StackedListItem>- ))}- </StackedList>- ) : null}- <div className="flex items-center gap-4">- <InviteMemberButton- usedSeats={usedSeats}- totalSeats={totalSeats}- />- <p className="font-medium text-sm">- <Trans- i18nKey="seatUsage"- defaults="{usedSeats} of {totalSeats} seats used"- values={{ usedSeats, totalSeats }}- />- </p>- </div>- {totalSeats - usedSeats <= 0 ? (- <Alert variant="info">- <InfoIcon />- <AlertDescription>- <IfCloudHosted>- <p>- <Trans- i18nKey="noSeatsAvailableAlertBillingDescription"- defaults="Increase the number of seats in this space from the <a>billing page</a>."- components={{- a: (- <Link- className="underline hover:text-foreground"- href="/settings/billing"- />- ),- }}- />- </p>- </IfCloudHosted>- <IfSelfHosted>- <p>- <Trans- i18nKey="noSeatsAvailableAlertSelfHostedDescription"- defaults="You will need to <a>upgrade</a> to increase the number of seats in this space."- components={{- a: (- <Link- className="underline hover:text-foreground"- prefetch={false}- href="https://support.rallly.co/self-hosting/licensing"- />- ),- }}- />- </p>- </IfSelfHosted>- </AlertDescription>- </Alert>- ) : null}- </PageSectionContent>- </PageSection>- </PageSectionGroup>- </SettingsPageContent>- </SettingsPage>+ <HydrationBoundary state={dehydrate(helpers.queryClient)}>+ <MembersSettingsPageClient />+ </HydrationBoundary>);}diff --git a/apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsx b/apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsxindex 709a20755..bdca08b6a 100644--- a/apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsx+++ b/apps/web/src/app/[locale]/(app)/invite/[urlId]/page.tsx@@ -5,7 +5,7 @@ import type { Metadata } from "next";import { notFound } from "next/navigation";import { InvitePageLoader } from "@/app/[locale]/(app)/invite/[urlId]/invite-page-loader";import { PermissionProvider } from "@/contexts/permissions";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";import Providers from "./providers";@@ -23,7 +23,7 @@ export default async function Page(props: {notFound();}- const trpc = await createAuthenticatedSSRHelper();+ const trpc = await createPublicSSRHelper();await Promise.all([trpc.polls.get.prefetch({ urlId: params.urlId }),diff --git a/apps/web/src/app/[locale]/(app)/layout.tsx b/apps/web/src/app/[locale]/(app)/layout.tsxindex ba304a751..617b2ec7a 100644--- a/apps/web/src/app/[locale]/(app)/layout.tsx+++ b/apps/web/src/app/[locale]/(app)/layout.tsx@@ -2,7 +2,7 @@ import { dehydrate, HydrationBoundary } from "@tanstack/react-query";import { TimeZoneChangeDetector } from "@/app/[locale]/timezone-change-detector";import { UserSync } from "@/components/user-provider";import { PreferencesProvider } from "@/contexts/preferences";-import { createAuthenticatedSSRHelper } from "@/trpc/server/create-ssr-helper";+import { createPublicSSRHelper } from "@/trpc/server/create-ssr-helper";import { ConnectedDayjsProvider } from "@/utils/dayjs";export default async function AppLayout({@@ -10,9 +10,12 @@ export default async function AppLayout({}: {children: React.ReactNode;}) {- const helpers = await createAuthenticatedSSRHelper();+ const helpers = await createPublicSSRHelper();- await helpers.user.getMe.prefetch();+ await Promise.all([+ helpers.user.getMe.prefetch(),+ helpers.billing.getTier.prefetch(),+ ]);return (<HydrationBoundary state={dehydrate(helpers.queryClient)}>diff --git a/apps/web/src/app/[locale]/(auth)/layout.tsx b/apps/web/src/app/[locale]/(auth)/layout.tsxindex bc0a52498..d37cbe744 100644--- a/apps/web/src/app/[locale]/(auth)/layout.tsx+++ b/apps/web/src/app/[locale]/(auth)/layout.tsx@@ -1,14 +1,22 @@+import { redirect } from "next/navigation";import {isQuickCreateEnabled,QuickCreateButton,QuickCreateWidget,} from "@/features/quick-create";+import { getSession } from "@/lib/auth";export default async function Layout({children,}: {children: React.ReactNode;}) {+ const session = await getSession();++ if (session?.user && !session.user.isGuest) {+ redirect("/");+ }+return (<div className="relative flex min-h-dvh flex-col items-center justify-center bg-background"><div className="z-10 flex w-full flex-1 lg:p-4">diff --git a/apps/web/src/app/api/stripe/checkout/route.ts b/apps/web/src/app/api/stripe/checkout/route.tsindex 5b712a229..152093402 100644--- a/apps/web/src/app/api/stripe/checkout/route.ts+++ b/apps/web/src/app/api/stripe/checkout/route.ts@@ -4,13 +4,14 @@ import { absoluteUrl } from "@rallly/utils/absolute-url";import type { NextRequest } from "next/server";import { NextResponse } from "next/server";import * as z from "zod";-import { requireSpace, requireUser } from "@/auth/data";import type { CustomerMetadata } from "@/features/billing/schema";+import { getActiveSpaceForUser } from "@/features/space/data";import type {SubscriptionCheckoutMetadata,SubscriptionMetadata,} from "@/features/subscription/schema";-import { AppError } from "@/lib/errors";+import { getUser } from "@/features/user/data";+import { getSession } from "@/lib/auth";const inputSchema = z.object({period: z.enum(["monthly", "yearly"]).optional(),@@ -19,13 +20,29 @@ const inputSchema = z.object({});export async function POST(request: NextRequest) {- const [user, space] = await Promise.all([requireUser(), requireSpace()]);+ const session = await getSession();++ if (!session?.user || session.user.isGuest) {+ return NextResponse.redirect(absoluteUrl("/login"), 303);+ }++ const user = await getUser(session.user.id);++ if (!user) {+ return NextResponse.json({ error: "User not found" }, { status: 404 });+ }++ const space = await getActiveSpaceForUser(user.id);++ if (!space) {+ return NextResponse.json({ error: "Space not found" }, { status: 404 });+ }if (space.ownerId !== user.id) {- throw new AppError({- code: "FORBIDDEN",- message: "You need to be the owner of this space to upgrade it",- });+ return NextResponse.json(+ { error: "You need to be the owner of this space to upgrade it" },+ { status: 403 },+ );}const spaceId = space.id;diff --git a/apps/web/src/auth/data.ts b/apps/web/src/auth/data.tsindex 10f957651..473953a7d 100644--- a/apps/web/src/auth/data.ts+++ b/apps/web/src/auth/data.ts@@ -1,14 +1,15 @@import "server-only";import { prisma } from "@rallly/database";-import { headers } from "next/headers";import { notFound, redirect } from "next/navigation";import { cache } from "react";import { createSpaceDTO } from "@/features/space/data";import { getUser } from "@/features/user/data";import { getSession } from "@/lib/auth";import { AppError } from "@/lib/errors";+import { getPathname } from "@/lib/pathname";import { isInitialAdmin } from "@/utils/is-initial-admin";+import { buildSafeRedirectUrl } from "@/utils/redirect";/*** Gets the current user if they are logged in, otherwise null.@@ -92,13 +93,12 @@ export const requireAdmin = cache(async () => {export const requireUser = cache(async () => {const session = await getSession();- const headersList = await headers();- const pathname = headersList.get("x-pathname") ?? "/";if (!session?.user || session.user.isGuest) {- const searchParams = new URLSearchParams();- searchParams.set("redirectTo", pathname);- redirect(`/login?${searchParams.toString()}`);+ const pathname = await getPathname();+ redirect(+ buildSafeRedirectUrl({ destination: "/login", returnUrl: pathname }),+ );}const user = await getUser(session.user.id);@@ -109,40 +109,3 @@ export const requireUser = cache(async () => {return user;});--export const requireSpace = cache(async () => {- const user = await requireUser();-- const spaceMember = await prisma.spaceMember.findFirst({- where: {- userId: user.id,- },- orderBy: {- lastSelectedAt: "desc",- },- include: {- space: {- select: {- id: true,- ownerId: true,- name: true,- tier: true,- image: true,- },- },- },- });-- if (!spaceMember) {- redirect("/setup");- }-- return createSpaceDTO({- id: spaceMember.space.id,- ownerId: spaceMember.space.ownerId,- name: spaceMember.space.name,- tier: spaceMember.space.tier,- role: spaceMember.role,- image: spaceMember.space.image,- });-});diff --git a/apps/web/src/components/forms/poll-settings.tsx b/apps/web/src/components/forms/poll-settings.tsxindex eb87910d8..18231454f 100644--- a/apps/web/src/components/forms/poll-settings.tsx+++ b/apps/web/src/components/forms/poll-settings.tsx@@ -14,7 +14,6 @@ import type React from "react";import { useFormContext } from "react-hook-form";import { ProBadge } from "@/components/pro-badge";import { useBilling } from "@/features/billing/client";-import { useSpace } from "@/features/space/client";import { Trans } from "@/i18n/client";export type PollSettingsFormData = {@@ -64,10 +63,7 @@ const Setting = ({ children }: React.PropsWithChildren) => {export const PollSettingsForm = ({ children }: React.PropsWithChildren) => {const form = useFormContext<PollSettingsFormData>();const posthog = usePostHog();- const { showPayWall } = useBilling();-- const space = useSpace();- const isFree = space.data.tier === "hobby";+ const { showPayWall, isFree } = useBilling();return (<Card>diff --git a/apps/web/src/components/poll/manage-poll.tsx b/apps/web/src/components/poll/manage-poll.tsxindex afc847931..8181de047 100644--- a/apps/web/src/components/poll/manage-poll.tsx+++ b/apps/web/src/components/poll/manage-poll.tsx@@ -31,7 +31,6 @@ import { SchedulePollDialog } from "@/components/poll/manage-poll/schedule-poll-import { ProBadge } from "@/components/pro-badge";import { usePoll } from "@/contexts/poll";import { useBilling } from "@/features/billing/client";-import { useSpace } from "@/features/space/client";import { Trans } from "@/i18n/client";import { trpc } from "@/trpc/client";import { DeletePollDialog } from "./manage-poll/delete-poll-dialog";@@ -122,12 +121,11 @@ const ManagePoll: React.FunctionComponent<{disabled?: boolean;}> = ({ disabled }) => {const poll = usePoll();- const space = useSpace();const [showDeletePollDialog, setShowDeletePollDialog] = React.useState(false);const duplicateDialog = useDialog();const scheduleDialog = useDialog();- const { showPayWall } = useBilling();+ const { showPayWall, isFree } = useBilling();const posthog = usePostHog();const { exportToCsv } = useCsvExporter();@@ -175,7 +173,7 @@ const ManagePoll: React.FunctionComponent<{<DropdownMenuItemdisabled={!!poll.event}onClick={() => {- if (space.data.tier !== "pro") {+ if (isFree) {showPayWall();posthog?.capture("trigger paywall", {poll_id: poll.id,@@ -191,7 +189,7 @@ const ManagePoll: React.FunctionComponent<{<CalendarCheck2Icon /></Icon><Trans i18nKey="schedulePoll" defaults="Schedule" />- {space.data.tier !== "pro" ? <ProBadge /> : null}+ {isFree ? <ProBadge /> : null}</DropdownMenuItem><OpenCloseToggle /></>@@ -204,7 +202,7 @@ const ManagePoll: React.FunctionComponent<{</DropdownMenuItem><DropdownMenuItemonClick={() => {- if (space.data.tier !== "pro") {+ if (isFree) {showPayWall();posthog?.capture("trigger paywall", {poll_id: poll.id,@@ -218,7 +216,7 @@ const ManagePoll: React.FunctionComponent<{><DropdownMenuItemIconLabel icon={CopyIcon}><Trans i18nKey="duplicate" defaults="Duplicate" />- {space.data.tier !== "pro" ? <ProBadge /> : null}+ {isFree ? <ProBadge /> : null}</DropdownMenuItemIconLabel></DropdownMenuItem><DropdownMenuSeparator />diff --git a/apps/web/src/components/user-dropdown.tsx b/apps/web/src/components/user-dropdown.tsxindex aa4b69ddf..eaedb011e 100644--- a/apps/web/src/components/user-dropdown.tsx+++ b/apps/web/src/components/user-dropdown.tsx@@ -32,24 +32,40 @@ import {} from "lucide-react";import Link from "next/link";import { OptimizedAvatarImage } from "@/components/optimized-avatar-image";+import { useUser } from "@/components/user-provider";import { useTheme } from "@/features/theme/client";import { Trans } from "@/i18n/client";import { signOut } from "@/lib/auth-client";+import { useFeatureFlag } from "@/lib/feature-flags/client";-export const UserDropdown = ({- name,- image,- email,- className,-}: {- name: string;- image?: string;- email?: string;- className?: string;-}) => {+export const UserDropdown = ({ className }: { className?: string }) => {+ const { user } = useUser();const posthog = usePostHog();const { theme, setTheme } = useTheme();+ const isRegistrationEnabled = useFeatureFlag("registration");++ if (!user) {+ return (+ <div className="flex items-center gap-x-2">+ <Button variant="ghost" asChild>+ <Link href={`/login?redirectTo=${encodeURIComponent("/new")}`}>+ <Trans i18nKey="login" defaults="Login" />+ </Link>+ </Button>+ {isRegistrationEnabled ? (+ <Button variant="primary" asChild>+ <Link href={`/register?redirectTo=${encodeURIComponent("/new")}`}>+ <Trans i18nKey="signUp" defaults="Sign up" />+ </Link>+ </Button>+ ) : null}+ </div>+ );+ }++ const { image, name, email } = user;+return (<DropdownMenu modal={false}><DropdownMenuTriggerdiff --git a/apps/web/src/features/billing/client.tsx b/apps/web/src/features/billing/client.tsxindex 7554085d4..983bb9e3c 100644--- a/apps/web/src/features/billing/client.tsx+++ b/apps/web/src/features/billing/client.tsx@@ -3,20 +3,27 @@import type { ButtonProps } from "@rallly/ui/button";import { Button } from "@rallly/ui/button";import React from "react";+import type { SpaceTier } from "@/features/space/schema";+import { trpc } from "@/trpc/client";import { PayWallDialog } from "./components/pay-wall-dialog";interface BillingContextType {+ tier: SpaceTier;+ isFree: boolean;showPayWall: () => void;}const BillingContext = React.createContext<BillingContextType | null>(null);-interface BillingProviderProps {- children: React.ReactNode;+function useCurrentTier(): SpaceTier {+ const { data: tier } = trpc.billing.getTier.useQuery();++ return tier ?? "hobby";}-export function BillingProvider({ children }: BillingProviderProps) {+export function BillingProvider({ children }: { children: React.ReactNode }) {const [isPayWallOpen, setIsPayWallOpen] = React.useState(false);+ const tier = useCurrentTier();const showPayWall = React.useCallback(() => {setIsPayWallOpen(true);@@ -24,9 +31,11 @@ export function BillingProvider({ children }: BillingProviderProps) {const contextValue = React.useMemo(() => ({+ tier,+ isFree: tier === "hobby",showPayWall,}),- [showPayWall],+ [tier, showPayWall],);return (diff --git a/apps/web/src/features/poll/data.ts b/apps/web/src/features/poll/data.tsindex ec31172d4..63dc33d3c 100644--- a/apps/web/src/features/poll/data.ts+++ b/apps/web/src/features/poll/data.ts@@ -1,7 +1,6 @@import type { PollStatus, Prisma } from "@rallly/database";import { prisma } from "@rallly/database";import { shortUrl } from "@rallly/utils/absolute-url";-import { requireSpace } from "@/auth/data";export async function getPollResults({pollId,@@ -155,6 +154,7 @@ type PollFilters = {pageSize?: number;q?: string;member?: string;+ spaceId: string;};export const getPolls = async ({@@ -163,12 +163,11 @@ export const getPolls = async ({member,page = 1,pageSize = 20,+ spaceId,}: PollFilters) => {- const space = await requireSpace();-// Build the where clause based on filtersconst where: Prisma.PollWhereInput = {- spaceId: space.id,+ spaceId,deletedAt: null,...(status && { status }),...(q && { title: { contains: q, mode: "insensitive" } }),diff --git a/apps/web/src/features/scheduled-event/data.ts b/apps/web/src/features/scheduled-event/data.tsindex 0e9e0d1cf..715e3c350 100644--- a/apps/web/src/features/scheduled-event/data.ts+++ b/apps/web/src/features/scheduled-event/data.ts@@ -1,128 +1,8 @@import type { Prisma, ScheduledEventStatus } from "@rallly/database";import { prisma } from "@rallly/database";-import { requireSpace } from "@/auth/data";import { dayjs } from "@/lib/dayjs";import type { Status } from "./schema";-const mapStatus = {- upcoming: "confirmed",- unconfirmed: "unconfirmed",- past: "confirmed",- canceled: "canceled",-} as const;--function getEventsWhereInput({- spaceId,- status,- search,-}: {- spaceId: string;- status: Status;- search?: string;-}) {- const now = new Date();-- const todayStart = dayjs().startOf("day").utc().toDate();-- const where: Prisma.ScheduledEventWhereInput = {- spaceId,- deletedAt: null,- ...(status === "upcoming" && {- OR: [- { allDay: false, start: { gte: now } },- { allDay: true, start: { gte: todayStart } },- ],- }),- ...(status === "past" && {- OR: [- { allDay: false, start: { lt: now } },- { allDay: true, start: { lt: todayStart } },- ],- }),- ...(search && { title: { contains: search, mode: "insensitive" } }),- status: mapStatus[status],- };-- return where;-}--export const getScheduledEvents = async ({- status,- search,- page = 1,- pageSize = 10,-}: {- status: Status;- search?: string;- page?: number;- pageSize?: number;-}) => {- const space = await requireSpace();- const where = getEventsWhereInput({- spaceId: space.id,- status,- search,- });-- const [rawEvents, totalCount] = await prisma.$transaction([- prisma.scheduledEvent.findMany({- where,- orderBy: {- start: status === "past" ? "desc" : "asc",- },- select: {- id: true,- title: true,- description: true,- location: true,- start: true,- end: true,- allDay: true,- timeZone: true,- status: true,- invites: {- select: {- id: true,- inviteeName: true,- user: {- select: {- image: true,- },- },- },- },- },- skip: (page - 1) * pageSize,- take: pageSize,- }),- prisma.scheduledEvent.count({ where }),- ]);-- const events = rawEvents.map((event) => ({- ...event,- invites: event.invites.map((invite) => ({- id: invite.id,- inviteeName: invite.inviteeName,- inviteeImage: invite.user?.image ?? undefined,- })),- }));-- const totalPages = Math.ceil(totalCount / pageSize);- const hasNextPage = page * pageSize < totalCount;-- return { events, totalCount, totalPages, hasNextPage };-};--export const getUpcomingEventsCount = async () => {- const space = await requireSpace();- return prisma.scheduledEvent.count({- where: getEventsWhereInput({- spaceId: space.id,- status: "upcoming",- }),- });-};-// Common event selection fieldsconst eventSelectFields = {id: true,@@ -235,18 +115,19 @@ export const getUpcomingEvents = async ({member,page = 1,pageSize = 20,+ spaceId,}: {search?: string;member?: string;page?: number;pageSize?: number;+ spaceId: string;}) => {- const space = await requireSpace();const now = new Date();const todayStart = dayjs().startOf("day").utc().toDate();const where: Prisma.ScheduledEventWhereInput = {- ...buildBaseWhere(space.id, search, member),+ ...buildBaseWhere(spaceId, search, member),status: "confirmed",OR: [{ allDay: false, start: { gte: now } },@@ -285,18 +166,19 @@ export const getPastEvents = async ({member,page = 1,pageSize = 20,+ spaceId,}: {search?: string;member?: string;page?: number;pageSize?: number;+ spaceId: string;}) => {- const space = await requireSpace();const now = new Date();const todayStart = dayjs().startOf("day").utc().toDate();const where: Prisma.ScheduledEventWhereInput = {- ...buildBaseWhere(space.id, search, member),+ ...buildBaseWhere(spaceId, search, member),status: "confirmed",OR: [{ allDay: false, start: { lt: now } },@@ -335,16 +217,16 @@ export const getUnconfirmedEvents = async ({member,page = 1,pageSize = 20,+ spaceId,}: {search?: string;member?: string;page?: number;pageSize?: number;+ spaceId: string;}) => {- const space = await requireSpace();-const where: Prisma.ScheduledEventWhereInput = {- ...buildBaseWhere(space.id, search, member),+ ...buildBaseWhere(spaceId, search, member),status: "unconfirmed",};@@ -379,16 +261,16 @@ export const getCanceledEvents = async ({member,page = 1,pageSize = 20,+ spaceId,}: {search?: string;member?: string;page?: number;pageSize?: number;+ spaceId: string;}) => {- const space = await requireSpace();-const where: Prisma.ScheduledEventWhereInput = {- ...buildBaseWhere(space.id, search, member),+ ...buildBaseWhere(spaceId, search, member),status: "canceled",};@@ -424,14 +306,16 @@ export const getEventsChronological = async ({member,page = 1,pageSize = 20,+ spaceId,}: {status?: Status;search?: string;member?: string;page?: number;pageSize?: number;+ spaceId: string;}) => {- const commonParams = { search, member, page, pageSize };+ const commonParams = { search, member, page, pageSize, spaceId };switch (status) {case "upcoming":diff --git a/apps/web/src/features/space/client.tsx b/apps/web/src/features/space/client.tsxindex 0a65d4076..2a9786a6d 100644--- a/apps/web/src/features/space/client.tsx+++ b/apps/web/src/features/space/client.tsx@@ -1,71 +1,69 @@"use client";import { usePostHog } from "@rallly/posthog/client";+import { useRouter } from "next/navigation";import React from "react";-import type { MemberAbility } from "@/features/space/member/ability";+import { RouterLoadingIndicator } from "@/components/router-loading-indicator";+import { useUser } from "@/components/user-provider";import { defineAbilityForMember } from "@/features/space/member/ability";-import type { SpaceDTO } from "@/features/space/types";-import type { SpaceAbility } from "./ability";+import { trpc } from "@/trpc/client";import { defineAbilityForSpace } from "./ability";-const SpaceContext = React.createContext<{- data: SpaceDTO;- getAbility: () => SpaceAbility;- getMemberAbility: () => MemberAbility;-}>({- data: {- id: "",- name: "",- ownerId: "system",- role: "member",- tier: "hobby",- },- getAbility: () => defineAbilityForSpace(),- getMemberAbility: () => defineAbilityForMember(),-});-export const useSpace = () => {- return React.useContext(SpaceContext);-};+ const { user } = useUser();+ const [data] = trpc.space.getCurrent.useSuspenseQuery();++ if (!data) {+ throw new Error("No active space found");+ }-export const SpaceProvider = ({- data,- userId,- children,-}: {- data: SpaceDTO;- userId: string;- children: React.ReactNode;-}) => {- const value = React.useMemo(+ const userId = user?.id;++ return React.useMemo(() => ({data,getAbility: () => defineAbilityForSpace(data),getMemberAbility: () =>- defineAbilityForMember({- user: {- id: userId,- },- space: {- id: data.id,- ownerId: data.ownerId,- role: data.role,- },- }),+ defineAbilityForMember(+ userId+ ? {+ user: { id: userId },+ space: {+ id: data.id,+ ownerId: data.ownerId,+ role: data.role,+ },+ }+ : undefined,+ ),}),[data, userId],);+};+export function SpaceProvider({ children }: { children: React.ReactNode }) {+ const router = useRouter();+ const { data: space, isLoading } = trpc.space.getCurrent.useQuery();const posthog = usePostHog();React.useEffect(() => {- posthog?.group("space", data.id, {- name: data.name,- tier: data.tier,- });- }, [posthog, data.id, data.name, data.tier]);+ if (!isLoading && !space) {+ router.replace("/setup");+ }+ }, [isLoading, space, router]);- return (- <SpaceContext.Provider value={value}>{children}</SpaceContext.Provider>- );-};+ React.useEffect(() => {+ if (space?.id) {+ posthog?.group("space", space.id, {+ name: space.name,+ tier: space.tier,+ });+ }+ }, [posthog, space?.id, space?.name, space?.tier]);++ if (!space) {+ return <RouterLoadingIndicator />;+ }++ return <>{children}</>;+}diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsxindex cec253b61..0117a2985 100644--- a/apps/web/src/features/space/components/space-dropdown.tsx+++ b/apps/web/src/features/space/components/space-dropdown.tsx@@ -24,6 +24,7 @@ import Link from "next/link";import React from "react";import { RouterLoadingIndicator } from "@/components/router-loading-indicator";import { setActiveSpaceAction } from "@/features/space/actions";+import { useSpace } from "@/features/space/client";import { SpaceTierLabel } from "@/features/space/components/space-tier";import { Trans } from "@/i18n/client";import { useSafeAction } from "@/lib/safe-action/client";@@ -32,7 +33,6 @@ import { SpaceIcon } from "./space-icon";export function SpaceDropdown({spaces,- initialSpaceId,}: {spaces: {id: string;@@ -40,9 +40,9 @@ export function SpaceDropdown({tier: "hobby" | "pro";image?: string;}[];- initialSpaceId: string;}) {- const [selectedSpaceId, setSelectedSpaceId] = React.useState(initialSpaceId);+ const { data: space } = useSpace();+ const [selectedSpaceId, setSelectedSpaceId] = React.useState(space.id);const [isPending, startTransition] = React.useTransition();const setActiveSpace = useSafeAction(setActiveSpaceAction);diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.tsindex 99a9422d9..7300bbe97 100644--- a/apps/web/src/features/space/data.ts+++ b/apps/web/src/features/space/data.ts@@ -6,7 +6,7 @@ import type {import { prisma } from "@rallly/database";import { createLogger } from "@rallly/logger";import { cache } from "react";-import { requireSpace, requireUser } from "@/auth/data";+import { requireUser } from "@/auth/data";const logger = createLogger("space/data");@@ -126,60 +126,6 @@ export const loadSpace = cache(async ({ id }: { id: string }) => {return space;});-export const loadPaymentMethods = cache(async () => {- const user = await requireUser();- const paymentMethods = await prisma.paymentMethod.findMany({- where: {- userId: user.id,- },- select: {- id: true,- type: true,- data: true,- },- });-- return paymentMethods;-});--export const loadMembers = cache(async () => {- const space = await requireSpace();-- const [members, totalCount] = await Promise.all([- prisma.spaceMember.findMany({- where: {- spaceId: space.id,- },- select: {- id: true,- userId: true,- role: true,- spaceId: true,- user: {- select: {- name: true,- email: true,- image: true,- },- },- },- orderBy: {- createdAt: "asc",- },- }),- prisma.spaceMember.count({- where: {- spaceId: space.id,- },- }),- ]);-- return {- total: totalCount,- data: members.map((member) => createMemberDTO({ ...member, space })),- };-});-export const getMember = async (id: string) => {const member = await prisma.spaceMember.findUnique({where: {@@ -212,33 +158,6 @@ export const getMember = async (id: string) => {return createMemberDTO(member);};-export const loadInvites = cache(async () => {- const space = await requireSpace();-- const invites = await prisma.spaceMemberInvite.findMany({- where: {- spaceId: space.id,- },- include: {- invitedBy: {- select: {- id: true,- name: true,- email: true,- },- },- },- orderBy: {- createdAt: "desc",- },- });-- return invites.map((invite) => ({- ...invite,- role: fromDBRole(invite.role),- }));-});-export const getActiveSpaceForUser = async (userId: string) => {const spaceMember = await prisma.spaceMember.findFirst({where: {diff --git a/apps/web/src/lib/errors.ts b/apps/web/src/lib/errors.tsindex f4e6f18e1..38cce3d00 100644--- a/apps/web/src/lib/errors.ts+++ b/apps/web/src/lib/errors.ts@@ -6,6 +6,7 @@ export type AppErrorCode =| "PAYMENT_REQUIRED"| "PAYLOAD_TOO_LARGE"| "SERVICE_UNAVAILABLE"+ | "SETUP_REQUIRED"| "TOO_MANY_REQUESTS";export class AppError extends Error {diff --git a/apps/web/src/lib/pathname.ts b/apps/web/src/lib/pathname.tsnew file mode 100644index 000000000..3e4dcb83a--- /dev/null+++ b/apps/web/src/lib/pathname.ts@@ -0,0 +1,14 @@+import { headers } from "next/headers";+import type { NextRequest, NextResponse } from "next/server";++const HEADER_NAME = "x-pathname";++export async function getPathname() {+ const headersList = await headers();+ return headersList.get(HEADER_NAME);+}++export function setPathname(req: NextRequest, res: NextResponse) {+ const pathname = req.nextUrl.pathname;+ res.headers.set(HEADER_NAME, pathname);+}diff --git a/apps/web/src/proxy.ts b/apps/web/src/proxy.tsindex 60a94389c..ddf3a9fac 100644--- a/apps/web/src/proxy.ts+++ b/apps/web/src/proxy.ts@@ -1,6 +1,7 @@import type { NextRequest } from "next/server";import { NextResponse } from "next/server";import { getLocaleFromRequest, setLocaleCookie } from "@/lib/locale/server";+import { setPathname } from "@/lib/pathname";export const proxy = async (req: NextRequest) => {const { nextUrl } = req;@@ -16,7 +17,8 @@ export const proxy = async (req: NextRequest) => {setLocaleCookie(req, res, locale);res.headers.set("x-locale", locale);- res.headers.set("x-pathname", pathname);++ setPathname(req, res);return res;};diff --git a/apps/web/src/trpc/client/provider.tsx b/apps/web/src/trpc/client/provider.tsxindex 5c51adf0d..92fc58166 100644--- a/apps/web/src/trpc/client/provider.tsx+++ b/apps/web/src/trpc/client/provider.tsx@@ -4,6 +4,7 @@ import { toast } from "@rallly/ui/sonner";import { absoluteUrl } from "@rallly/utils/absolute-url";import {MutationCache,+ QueryCache,QueryClient,QueryClientProvider,} from "@tanstack/react-query";@@ -13,6 +14,11 @@ import superjson from "superjson";import { useTranslation } from "@/i18n/client";import { signOut } from "@/lib/auth-client";import { trpc } from "../client";+import type { AppRouter } from "../routers";++function isTRPCClientError(error: Error): error is TRPCClientError<AppRouter> {+ return error instanceof TRPCClientError;+}export function TRPCProvider(props: { children: React.ReactNode }) {const posthog = usePostHog();@@ -26,15 +32,24 @@ export function TRPCProvider(props: { children: React.ReactNode }) {staleTime: 1000 * 60,},},+ queryCache: new QueryCache({+ onError(error) {+ if (isTRPCClientError(error)) {+ if (error.data?.code === "UNAUTHORIZED") {+ window.location.href = "/login";+ }+ }+ },+ }),mutationCache: new MutationCache({onError(error) {- if (error instanceof TRPCClientError) {+ if (isTRPCClientError(error)) {posthog.capture("failed api request", {- path: error.data.path,- code: error.data.code,+ path: error.data?.path,+ code: error.data?.code,message: error.message,});- switch (error.data.code) {+ switch (error.data?.code) {case "UNAUTHORIZED":window.location.href = "/login";break;diff --git a/apps/web/src/trpc/routers/api-keys.ts b/apps/web/src/trpc/routers/api-keys.tsindex db9838304..42c72214b 100644--- a/apps/web/src/trpc/routers/api-keys.ts+++ b/apps/web/src/trpc/routers/api-keys.ts@@ -1,11 +1,25 @@import { prisma } from "@rallly/database";import { TRPCError } from "@trpc/server";import * as z from "zod";+import { isApiAccessEnabled } from "@/features/developer/data";import { createApiKey } from "@/features/developer/utils";-import { router, spaceOwnerCloudOnlyProcedure } from "../trpc";+import { router, spaceOwnerProcedure } from "../trpc";++const apiAccessProcedure = spaceOwnerProcedure.use(async ({ ctx, next }) => {+ const hasAccess = await isApiAccessEnabled(ctx.user, ctx.space);++ if (!hasAccess) {+ throw new TRPCError({+ code: "FORBIDDEN",+ message: "API access is not enabled for this user or space",+ });+ }++ return next();+});export const apiKeys = router({- list: spaceOwnerCloudOnlyProcedure.query(async ({ ctx }) => {+ list: apiAccessProcedure.query(async ({ ctx }) => {const keys = await prisma.spaceApiKey.findMany({where: {spaceId: ctx.space.id,@@ -26,7 +40,7 @@ export const apiKeys = router({return keys;}),- create: spaceOwnerCloudOnlyProcedure+ create: apiAccessProcedure.input(z.object({name: z.string().min(1).max(100),@@ -46,7 +60,7 @@ export const apiKeys = router({return { apiKey };}),- revoke: spaceOwnerCloudOnlyProcedure+ revoke: apiAccessProcedure.input(z.object({id: z.string(),diff --git a/apps/web/src/trpc/routers/billing.ts b/apps/web/src/trpc/routers/billing.tsnew file mode 100644index 000000000..8e7039bda--- /dev/null+++ b/apps/web/src/trpc/routers/billing.ts@@ -0,0 +1,23 @@+import { getSpaceSubscription } from "@/features/billing/data";+import { getActiveSpaceForUser } from "@/features/space/data";+import { isSelfHosted } from "@/utils/constants";+import { publicProcedure, router, spaceOwnerProcedure } from "../trpc";++export const billing = router({+ getTier: publicProcedure.query(async ({ ctx }) => {+ if (isSelfHosted) {+ return "pro" as const;+ }++ if (!ctx.user || ctx.user.isGuest) {+ return "hobby" as const;+ }++ const space = await getActiveSpaceForUser(ctx.user.id);++ return space?.tier ?? ("hobby" as const);+ }),+ getSubscription: spaceOwnerProcedure.query(async ({ ctx }) => {+ return await getSpaceSubscription(ctx.space.id);+ }),+});diff --git a/apps/web/src/trpc/routers/dashboard.ts b/apps/web/src/trpc/routers/dashboard.tsindex 91767f241..8ac570dac 100644--- a/apps/web/src/trpc/routers/dashboard.ts+++ b/apps/web/src/trpc/routers/dashboard.ts@@ -1,21 +1,14 @@import type { Prisma } from "@rallly/database";import { prisma } from "@rallly/database";-import { TRPCError } from "@trpc/server";-import { getActiveSpaceForUser } from "@/features/space/data";import type { MemberAbilityContext } from "@/features/space/member/ability";import { defineAbilityForMember } from "@/features/space/member/ability";import { getTotalSeatsForSpace } from "@/features/space/utils";import { dayjs } from "@/lib/dayjs";-import { privateProcedure, router } from "../trpc";+import { router, spaceProcedure } from "../trpc";export const dashboard = router({- stats: privateProcedure.query(async ({ ctx }) => {- const space = await getActiveSpaceForUser(ctx.user.id);-- if (!space) {- throw new TRPCError({ code: "NOT_FOUND", message: "Space not found" });- }-+ stats: spaceProcedure.query(async ({ ctx }) => {+ const { space } = ctx;const now = new Date();const todayStart = dayjs().tz(ctx.user.timeZone ?? "UTC")diff --git a/apps/web/src/trpc/routers/events.ts b/apps/web/src/trpc/routers/events.tsindex ee299cdc0..3da51ac4c 100644--- a/apps/web/src/trpc/routers/events.ts+++ b/apps/web/src/trpc/routers/events.ts@@ -1,9 +1,9 @@import * as z from "zod";import { getEventsChronological } from "@/features/scheduled-event/data";-import { privateProcedure, router } from "../trpc";+import { router, spaceProcedure } from "../trpc";export const events = router({- infiniteList: privateProcedure+ infiniteList: spaceProcedure.input(z.object({status: z@@ -15,7 +15,7 @@ export const events = router({limit: z.number().max(100).optional().default(20),}),)- .query(async ({ input }) => {+ .query(async ({ ctx, input }) => {const { cursor: page, limit: pageSize, status, search, member } = input;const result = await getEventsChronological({@@ -24,6 +24,7 @@ export const events = router({member,page,pageSize,+ spaceId: ctx.space.id,});let nextCursor: number | undefined;diff --git a/apps/web/src/trpc/routers/index.ts b/apps/web/src/trpc/routers/index.tsindex 7a6727084..6b9a4df92 100644--- a/apps/web/src/trpc/routers/index.ts+++ b/apps/web/src/trpc/routers/index.ts@@ -3,6 +3,7 @@ import "@/lib/dayjs";import { mergeRouters, router } from "../trpc";import { apiKeys } from "./api-keys";import { auth } from "./auth";+import { billing } from "./billing";import { calendars } from "./calendars";import { dashboard } from "./dashboard";import { events } from "./events";@@ -14,6 +15,7 @@ export const appRouter = mergeRouters(router({apiKeys,auth,+ billing,dashboard,events,polls,diff --git a/apps/web/src/trpc/routers/polls.ts b/apps/web/src/trpc/routers/polls.tsindex f791a8db5..127fda041 100644--- a/apps/web/src/trpc/routers/polls.ts+++ b/apps/web/src/trpc/routers/polls.ts@@ -5,7 +5,6 @@ import { nanoid } from "@rallly/utils/nanoid";import { TRPCError } from "@trpc/server";import { revalidatePath } from "next/cache";import * as z from "zod";-import { getCurrentUserSpace } from "@/auth/data";import { moderateContent } from "@/features/moderation";import { getPolls } from "@/features/poll/data";import { canUserManagePoll } from "@/features/poll/helpers";@@ -23,6 +22,7 @@ import {publicProcedure,requireUserMiddleware,router,+ spaceProcedure,} from "../trpc";import { comments } from "./polls/comments";import { participants } from "./polls/participants";@@ -47,7 +47,7 @@ const getPollIdFromAdminUrlId = async (urlId: string) => {export const polls = router({participants,comments,- infiniteChronological: privateProcedure+ infiniteChronological: spaceProcedure.input(z.object({status: z.enum(["open", "closed", "scheduled", "canceled"]).optional(),@@ -57,7 +57,7 @@ export const polls = router({limit: z.number().default(20),}),)- .query(async ({ input }) => {+ .query(async ({ ctx, input }) => {const { cursor: page, limit: pageSize, status, search, member } = input;const result = await getPolls({@@ -66,6 +66,7 @@ export const polls = router({member,page,pageSize,+ spaceId: ctx.space.id,});let nextCursor: number | undefined;@@ -100,71 +101,6 @@ export const polls = router({{} as Record<PollStatus, number>,);}),- /** @deprecated */- infiniteList: privateProcedure- .input(- z.object({- status: z.enum(["all", "open", "closed", "scheduled", "canceled"]),- cursor: z.string().optional(),- limit: z.number(),- }),- )- .query(async ({ ctx, input }) => {- const { cursor, limit, status } = input;- const polls = await prisma.poll.findMany({- where: {- ...(ctx.user.isLegacyGuest- ? { guestId: ctx.user.id }- : { userId: ctx.user.id }),- deletedAt: null,- status: status === "all" ? undefined : status,- },- orderBy: [- {- createdAt: "desc",- },- {- title: "asc",- },- ],- cursor: cursor ? { id: cursor } : undefined,- take: limit + 1,- select: {- id: true,- title: true,- location: true,- timeZone: true,- createdAt: true,- status: true,- guestId: true,- user: {- select: {- id: true,- name: true,- },- },- participants: {- where: {- deletedAt: null,- },- select: {- id: true,- name: true,- },- },- },- });-- let nextCursor: typeof cursor | undefined;- if (polls.length > input.limit) {- const nextItem = polls.pop();- nextCursor = nextItem?.id;- }- return {- polls,- nextCursor,- };- }),make: possiblyPublicProcedure.input(@@ -191,6 +127,14 @@ export const polls = router({const activeSpace = ctx.user.isGuest? null: await getActiveSpaceForUser(ctx.user.id);++ if (!ctx.user.isGuest && !activeSpace) {+ throw new TRPCError({+ code: "FORBIDDEN",+ message: "You must be a member of a space to create a poll",+ });+ }+const isPro = activeSpace?.tier === "pro";const moderation = await moderateContent({@@ -228,18 +172,7 @@ export const polls = router({const adminToken = nanoid();const participantUrlId = nanoid();const pollId = nanoid();- let spaceId: string | undefined;-- if (!ctx.user.isGuest) {- const data = await getCurrentUserSpace();- if (!data) {- throw new TRPCError({- code: "NOT_FOUND",- message: "Space not found",- });- }- spaceId = data.space.id;- }+ const spaceId = activeSpace?.id;const poll = await prisma.poll.create({include: {diff --git a/apps/web/src/trpc/routers/space.ts b/apps/web/src/trpc/routers/space.tsindex 3e94bb816..f5ca80d1d 100644--- a/apps/web/src/trpc/routers/space.ts+++ b/apps/web/src/trpc/routers/space.ts@@ -1,37 +1,86 @@import { prisma } from "@rallly/database";-import { getActiveSpaceForUser } from "@/features/space/data";-import { privateProcedure, router } from "../trpc";+import { getSpaceSeatCount } from "@/features/space/data";+import { fromDBRole, getTotalSeatsForSpace } from "@/features/space/utils";+import { router, spaceProcedure } from "../trpc";export const space = router({- members: privateProcedure.query(async ({ ctx }) => {- const activeSpace = await getActiveSpaceForUser(ctx.user.id);-- if (!activeSpace) {- return [];- }+ getCurrent: spaceProcedure.query(async ({ ctx }) => {+ return ctx.space;+ }),+ listMembers: spaceProcedure.query(async ({ ctx }) => {+ const [members, totalCount] = await Promise.all([+ prisma.spaceMember.findMany({+ where: {+ spaceId: ctx.space.id,+ },+ select: {+ id: true,+ userId: true,+ role: true,+ spaceId: true,+ user: {+ select: {+ name: true,+ email: true,+ image: true,+ },+ },+ },+ orderBy: {+ createdAt: "asc",+ },+ }),+ prisma.spaceMember.count({+ where: {+ spaceId: ctx.space.id,+ },+ }),+ ]);- const members = await prisma.spaceMember.findMany({+ return {+ total: totalCount,+ data: members.map((member) => ({+ id: member.id,+ userId: member.userId,+ spaceId: member.spaceId,+ name: member.user.name,+ email: member.user.email,+ image: member.user.image ?? undefined,+ role: fromDBRole(member.role),+ isOwner: member.userId === ctx.space.ownerId,+ })),+ };+ }),+ listInvites: spaceProcedure.query(async ({ ctx }) => {+ const invites = await prisma.spaceMemberInvite.findMany({where: {- spaceId: activeSpace.id,+ spaceId: ctx.space.id,},- select: {- userId: true,- user: {+ include: {+ invitedBy: {select: {+ id: true,name: true,- image: true,+ email: true,},},},orderBy: {- createdAt: "asc",+ createdAt: "desc",},});- return members.map((member) => ({- userId: member.userId,- name: member.user.name,- image: member.user.image ?? undefined,+ return invites.map((invite) => ({+ ...invite,+ role: fromDBRole(invite.role),}));}),+ seats: spaceProcedure.query(async ({ ctx }) => {+ const [total, used] = await Promise.all([+ getTotalSeatsForSpace(ctx.space.id),+ getSpaceSeatCount(ctx.space.id),+ ]);++ return { total, used };+ }),});diff --git a/apps/web/src/trpc/server/create-ssr-helper.ts b/apps/web/src/trpc/server/create-ssr-helper.tsindex 5ea313f4f..ef7c9228f 100644--- a/apps/web/src/trpc/server/create-ssr-helper.ts+++ b/apps/web/src/trpc/server/create-ssr-helper.ts@@ -1,32 +1,21 @@import { createWideEvent } from "@rallly/logger";import { createServerSideHelpers } from "@trpc/react-query/server";+import { redirect } from "next/navigation";import superjson from "superjson";import { getSession } from "@/lib/auth";+import { getPathname } from "@/lib/pathname";+import { buildSafeRedirectUrl } from "@/utils/redirect";import type { TRPCContext } from "../context";import { appRouter } from "../routers";/**- * Server-Side Helper for public data fetching- * @description Use for prefetching public data on the server. Does not include- * session context, allowing the page to be cached. Use createAuthenticatedSSRHelper- * for pages that need auth context.- * @see https://trpc.io/docs/client/nextjs/server-side-helpers#1-internal-router- */-export const createSSRHelper = () => {- return createServerSideHelpers({- router: appRouter,- ctx: { event: createWideEvent({ service: "trpc" }) } satisfies TRPCContext,- transformer: superjson,- });-};--/**- * Authenticated Server-Side Helper- * @description Use for prefetching data that requires session context.+ * Public Server-Side Helper+ * @description Use for prefetching data with optional session context.+ * Includes the session if available but does not require authentication.* Note: Using this makes the page dynamic (not cached).* @see https://trpc.io/docs/client/nextjs/server-side-helpers#1-internal-router*/-export const createAuthenticatedSSRHelper = async () => {+export const createPublicSSRHelper = async () => {const session = await getSession();const event = createWideEvent({service: "trpc",@@ -50,3 +39,39 @@ export const createAuthenticatedSSRHelper = async () => {transformer: superjson,});};++/**+ * Private Server-Side Helper+ * @description Use for prefetching data that requires a logged-in (non-guest) user.+ * Redirects to /login if the user is not authenticated or is a guest.+ */+export const createPrivateSSRHelper = async () => {+ const session = await getSession();++ if (!session?.user || session.user.isGuest) {+ const pathname = await getPathname();+ redirect(+ buildSafeRedirectUrl({ destination: "/login", returnUrl: pathname }),+ );+ }++ const event = createWideEvent({+ service: "trpc",+ });++ return createServerSideHelpers({+ router: appRouter,+ ctx: {+ user: {+ id: session.user.id,+ isGuest: false,+ locale: session.user.locale ?? undefined,+ image: session.user.image ?? undefined,+ timeZone: session.user.timeZone ?? undefined,+ isLegacyGuest: false,+ },+ event,+ } satisfies TRPCContext,+ transformer: superjson,+ });+};diff --git a/apps/web/src/trpc/trpc.ts b/apps/web/src/trpc/trpc.tsindex 37046e63c..212e6cabf 100644--- a/apps/web/src/trpc/trpc.ts+++ b/apps/web/src/trpc/trpc.ts@@ -2,20 +2,26 @@ import { prisma } from "@rallly/database";import { initTRPC, TRPCError } from "@trpc/server";import { waitUntil } from "@vercel/functions";import superjson from "superjson";-import { getCurrentUserSpace } from "@/auth/data";import { PostHogClient } from "@/features/analytics/posthog";-import { isApiAccessEnabled } from "@/features/developer/data";import { isQuickCreateEnabled } from "@/features/quick-create";import { getActiveSpaceForUser } from "@/features/space/data";import { getUser } from "@/features/user/data";+import { AppError } from "@/lib/errors";import { createRatelimit } from "@/lib/rate-limit";import { isSelfHosted } from "@/utils/constants";import type { TRPCContext } from "./context";const t = initTRPC.context<TRPCContext>().create({transformer: superjson,- errorFormatter({ shape }) {- return shape;+ errorFormatter({ shape, error }) {+ return {+ ...shape,+ data: {+ ...shape.data,+ appError:+ error.cause instanceof AppError ? error.cause.code : undefined,+ },+ };},});@@ -123,15 +129,25 @@ export const privateProcedure = procedureWithAnalytics.use(},);-export const proProcedure = privateProcedure.use(async ({ next }) => {- if (isSelfHosted) {- // Self-hosted instances don't have paid subscriptions- return next();+export const spaceProcedure = privateProcedure.use(async ({ ctx, next }) => {+ const space = await getActiveSpaceForUser(ctx.user.id);++ if (!space) {+ throw new TRPCError({+ code: "FORBIDDEN",+ message: "No active space found",+ });}- const data = await getCurrentUserSpace();+ return next({+ ctx: {+ space,+ },+ });+});- if (!data || data.space.tier !== "pro") {+export const proProcedure = spaceProcedure.use(async ({ ctx, next }) => {+ if (!isSelfHosted && ctx.space.tier !== "pro") {throw new TRPCError({code: "UNAUTHORIZED",message:@@ -142,43 +158,16 @@ export const proProcedure = privateProcedure.use(async ({ next }) => {return next();});-export const spaceOwnerCloudOnlyProcedure = privateProcedure.use(- async ({ ctx, next }) => {- const space = await getActiveSpaceForUser(ctx.user.id);-- if (!space) {- throw new TRPCError({- code: "FORBIDDEN",- message: "No active space found",- });- }-- const user = await getUser(ctx.user.id);-- if (!user) {- throw new TRPCError({- code: "UNAUTHORIZED",- message: "User does not exist",- });- }-- const hasAccess = await isApiAccessEnabled(user, space);-- if (!hasAccess) {- throw new TRPCError({- code: "FORBIDDEN",- message: "API access is not enabled for this user or space",- });- }-- return next({- ctx: {- space,- user: ctx.user,- },+export const spaceOwnerProcedure = spaceProcedure.use(async ({ ctx, next }) => {+ if (ctx.space.ownerId !== ctx.user.id) {+ throw new TRPCError({+ code: "FORBIDDEN",+ message: "Only the space owner can perform this action",});- },-);+ }++ return next();+});export const createRateLimitMiddleware = (name: string,diff --git a/apps/web/src/utils/redirect.ts b/apps/web/src/utils/redirect.tsindex 07b4c56e9..4b481d35d 100644--- a/apps/web/src/utils/redirect.ts+++ b/apps/web/src/utils/redirect.ts@@ -23,3 +23,22 @@ export function validateRedirectUrl(// Return undefined for invalid redirects, let caller decide the defaultreturn undefined;}++/**+ * Builds a destination URL with a validated `redirectTo` query parameter.+ */+export function buildSafeRedirectUrl({+ destination,+ returnUrl,+}: {+ destination: string;+ returnUrl?: string | null;+}) {+ const validated = validateRedirectUrl(returnUrl);+ if (!validated) {+ return destination;+ }+ const searchParams = new URLSearchParams();+ searchParams.set("redirectTo", validated);+ return `${destination}?${searchParams.toString()}`;+}