Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Remove spaces.getCurrent from tRPC (#2691)
Luke Vella81d3fd72cc02
diff --git a/apps/web/src/app/[locale]/(space)/layout.tsx b/apps/web/src/app/[locale]/(space)/layout.tsxindex 662e6a9ba..ddb19be74 100644--- a/apps/web/src/app/[locale]/(space)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/layout.tsx@@ -1,41 +1,28 @@-import { dehydrate, HydrationBoundary } from "@tanstack/react-query";-import { redirect } from "next/navigation";import { SessionRefresher } from "@/components/session-refresher";import { PayWall } from "@/features/billing/components/pay-wall";import { SpaceProvider } from "@/features/space/client";+import { getActiveSpace } from "@/features/space/data";import { TimeZoneMismatchDialog } from "@/features/user/components/timezone-mismatch-dialog";import { UserProvider } from "@/features/user/components/user-provider";import { getLocale } from "@/i18n/server/get-locale";import { getSession } from "@/lib/auth";import { DateTimeProvider } from "@/lib/datetime/client";-import { getPathname } from "@/lib/pathname";-import { buildSafeRedirectUrl } from "@/lib/utils/redirect";-import { createPrivateSSRHelper } from "@/trpc/server/create-ssr-helper";export default async function Layout({children,}: {children: React.ReactNode;}) {- const helpers = await createPrivateSSRHelper();-const [locale, session, space] = await Promise.all([getLocale(),getSession(),- helpers.spaces.getCurrent.fetch(),+ getActiveSpace(),]);const user = session?.user;- if (!space) {- const pathname = await getPathname();- redirect(- buildSafeRedirectUrl({ destination: "/setup", returnUrl: pathname }),- );- }-return (- <HydrationBoundary state={dehydrate(helpers.queryClient)}>+ <><SessionRefresher /><TimeZoneMismatchDialog homeTimeZone={user?.timeZone} /><UserProvider user={user ?? null}>@@ -43,14 +30,14 @@ export default async function Layout({locale={locale}timeZone={user?.timeZone}timeFormat={user?.timeFormat}- weekStart={user?.weekStart ?? undefined}+ weekStart={user?.weekStart}>- <SpaceProvider>+ <SpaceProvider space={space}>{children}<PayWall /></SpaceProvider></DateTimeProvider></UserProvider>- </HydrationBoundary>+ </>);}diff --git a/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsxindex 80b2fbf49..f4ef0292e 100644--- a/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/billing/page.tsx@@ -25,10 +25,7 @@ import {SettingsPageTitle,} from "@/components/settings-layout";import { getSpaceSubscription } from "@/features/billing/data";-import {- getActiveSpaceForUser,- getSpaceSeatCount,-} from "@/features/space/data";+import { getActiveSpace, getSpaceSeatCount } from "@/features/space/data";import { defineAbilityForMember } from "@/features/space/member/ability";import { getCurrentUser } from "@/features/user/data";import { Trans } from "@/i18n/client";@@ -60,16 +57,7 @@ export default async function BillingSettingsPage({);}- const space = await getActiveSpaceForUser(user.id);-- if (!space) {- redirect(- buildSafeRedirectUrl({- destination: "/setup",- returnUrl: await getPathname(),- }),- );- }+ const space = await getActiveSpace();const ability = defineAbilityForMember({user: { id: user.id },diff --git a/apps/web/src/features/space/client.tsx b/apps/web/src/features/space/client.tsxindex 10b00dcc2..adf6d580d 100644--- a/apps/web/src/features/space/client.tsx+++ b/apps/web/src/features/space/client.tsx@@ -1,59 +1,51 @@"use client";import { posthog } from "@rallly/posthog/client";-import { useRouter } from "next/navigation";import React from "react";-import { RouterLoadingIndicator } from "@/components/router-loading-indicator";import { getPrimaryColorVars } from "@/features/branding/utils";import { defineAbilityForMember } from "@/features/space/member/ability";+import type { SpaceDTO } from "@/features/space/types";import { trpc } from "@/trpc/client";import { defineAbilityForSpace } from "./ability";+const SpaceContext = React.createContext<SpaceDTO | null>(null);+export const useSpace = () => {+ const space = React.useContext(SpaceContext);const [user] = trpc.user.getAuthed.useSuspenseQuery();- const [data] = trpc.spaces.getCurrent.useSuspenseQuery();- if (!data) {- throw new Error("No active space found");+ if (!space) {+ throw new Error("useSpace must be used within a SpaceProvider");}return React.useMemo(() => ({- data,- getAbility: () => defineAbilityForSpace(data),+ data: space,+ getAbility: () => defineAbilityForSpace(space),getMemberAbility: () =>defineAbilityForMember({user: { id: user.id },space: {- id: data.id,- ownerId: data.ownerId,- role: data.role,+ id: space.id,+ ownerId: space.ownerId,+ role: space.role,},}),}),- [data, user.id],+ [space, user.id],);};-export function SpaceProvider({ children }: { children: React.ReactNode }) {- const router = useRouter();- const { data: space, isLoading } = trpc.spaces.getCurrent.useQuery();-- React.useEffect(() => {- if (!isLoading && !space) {- router.replace("/setup");- }- }, [isLoading, space, router]);-+export function SpaceProvider({+ space,+ children,+}: {+ space: SpaceDTO;+ children: React.ReactNode;+}) {React.useEffect(() => {- if (space?.id) {- posthog?.group("space", space.id);- }- }, [space?.id]);-- if (!space) {- return <RouterLoadingIndicator />;- }+ posthog?.group("space", space.id);+ }, [space.id]);const primaryColorVars =space.showBranding && space.primaryColor@@ -61,9 +53,10 @@ export function SpaceProvider({ children }: { children: React.ReactNode }) {: null;return (- <div data-space-branding style={{ display: "contents" }}>- {primaryColorVars ? (- <style>{`+ <SpaceContext.Provider value={space}>+ <div data-space-branding style={{ display: "contents" }}>+ {primaryColorVars ? (+ <style>{`html.light [data-space-branding] {--primary: ${primaryColorVars.light};--primary-foreground: ${primaryColorVars.lightForeground};@@ -73,8 +66,9 @@ export function SpaceProvider({ children }: { children: React.ReactNode }) {--primary-foreground: ${primaryColorVars.darkForeground};}`}</style>- ) : null}- {children}- </div>+ ) : null}+ {children}+ </div>+ </SpaceContext.Provider>);}diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsxindex 397d0c42f..21a818013 100644--- a/apps/web/src/features/space/components/space-dropdown.tsx+++ b/apps/web/src/features/space/components/space-dropdown.tsx@@ -22,6 +22,7 @@ import {} from "lucide-react";import Link from "next/link";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";@@ -31,22 +32,12 @@ import { SpaceIcon } from "./space-icon";export function SpaceDropdown() {const { data: spaces = [] } = trpc.spaces.list.useQuery();- const { data: activeSpace } = trpc.spaces.getCurrent.useQuery();+ const { data: activeSpace } = useSpace();- const utils = trpc.useUtils();- const setActiveSpace = useSafeAction(setActiveSpaceAction, {- onSuccess: () => {- utils.spaces.getCurrent.invalidate();- },- });+ const setActiveSpace = useSafeAction(setActiveSpaceAction);const newSpaceDialog = useDialog();- if (!activeSpace) {- // This should never happen- return null;- }-- const selectedSpaceId = activeSpace?.id;+ const selectedSpaceId = activeSpace.id;return (<>diff --git a/apps/web/src/features/space/data.ts b/apps/web/src/features/space/data.tsindex 98a316c09..dcd70308f 100644--- a/apps/web/src/features/space/data.ts+++ b/apps/web/src/features/space/data.ts@@ -5,12 +5,17 @@ import type {SpaceTier as DBSpaceTier,} from "@rallly/database";import { prisma } from "@rallly/database";+import { redirect } from "next/navigation";import { cache } from "react";import type { MemberDTO } from "@/features/space/member/types";import type { AuthorizedSpaceId, SpaceDTO } from "@/features/space/types";import { fromDBRole } from "@/features/space/utils";+import { getSessionState } from "@/lib/auth";import { isSelfHosted } from "@/lib/constants";+import { InvalidSessionError } from "@/lib/errors/invalid-session-error";+import { getPathname } from "@/lib/pathname";+import { buildSafeRedirectUrl } from "@/lib/utils/redirect";function createMemberDTO(member: {id: string;@@ -112,6 +117,55 @@ export function getSpaceBranding(spaceId: string) {});}+/**+ * The active space for the signed-in user, gated for server rendering:+ * redirects to /login when unauthenticated or a guest, redirects to /setup+ * when the user has no space, and throws InvalidSessionError when banned.+ * React cached, so every page and layout that needs the space in a request+ * shares one gate and one query. Server component/page use only — the+ * redirects make it unsuitable for route handlers and tRPC procedures.+ */+export const getActiveSpace = cache(async () => {+ const state = await getSessionState();++ // An unreadable session (store unreachable, transient failure) is not+ // "logged out" — redirecting to /login on it is one leg of a redirect+ // loop. Fail the render instead so the user gets the error boundary's+ // retry page.+ if (state.status === "error") {+ throw new Error("Failed to read session");+ }++ const user =+ state.status === "authenticated" ? state.session.user : undefined;++ if (!user || user.isGuest) {+ redirect(+ buildSafeRedirectUrl({+ destination: "/login",+ returnUrl: await getPathname(),+ }),+ );+ }++ if (user.banned) {+ throw new InvalidSessionError();+ }++ const space = await getActiveSpaceForUser(user.id);++ if (!space) {+ redirect(+ buildSafeRedirectUrl({+ destination: "/setup",+ returnUrl: await getPathname(),+ }),+ );+ }++ return space;+});+export const getActiveSpaceForUser = cache(async (userId: string) => {const spaceMember = await prisma.spaceMember.findFirst({where: {diff --git a/apps/web/src/trpc/routers/spaces.ts b/apps/web/src/trpc/routers/spaces.tsindex 15bef3bae..a18af58eb 100644--- a/apps/web/src/trpc/routers/spaces.ts+++ b/apps/web/src/trpc/routers/spaces.ts@@ -9,7 +9,6 @@ import { getInstanceBranding } from "@/emails/branding";import { defineAbilityForSpace } from "@/features/space/ability";import {createSpaceDTO,- getActiveSpaceForUser,getMember,getSpaceSeatCount,} from "@/features/space/data";@@ -69,9 +68,6 @@ export const spaces = router({}),);}),- getCurrent: privateProcedure.query(async ({ ctx }) => {- return await getActiveSpaceForUser(ctx.user.id);- }),listMembers: spaceProcedure.query(async ({ ctx }) => {const [members, totalCount] = await Promise.all([prisma.spaceMember.findMany({