Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
♻️ Refactor developer tools access (#2121)
Luke Vellac6928b930c7a
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsxindex 4ae1458bf..da0f7e34a 100644--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/page.tsx@@ -15,32 +15,18 @@ import {} from "@/app/components/settings-layout";import { requireSpace, requireUser } from "@/auth/data";import { Trans } from "@/components/trans";-import { PostHogClient } from "@/features/analytics/posthog";+import { isApiAccessEnabled } from "@/features/developer/data";import { getTranslation } from "@/i18n/server";import { createSSRHelper } from "@/trpc/server/create-ssr-helper";-import { isSelfHosted } from "@/utils/constants";import { ApiKeysList } from "./components/api-keys-list";import { CreateApiKeyButton } from "./components/create-api-key-button";export default async function ApiKeysSettingsPage() {- if (isSelfHosted) {- return notFound();- }-- const posthog = PostHogClient();-const [space, user] = await Promise.all([requireSpace(), requireUser()]);- if (space.tier !== "pro" || space.ownerId !== user.id) {- return notFound();- }-- const isFeatureFlagEnabled = await posthog?.isFeatureEnabled(- "developer-tools",- user.id,- );+ const hasAccess = await isApiAccessEnabled(user, space);- if (!isFeatureFlagEnabled) {+ if (!hasAccess) {return notFound();}diff --git a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsxindex 697572839..1289cd42c 100644--- a/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/components/sidebar.tsx@@ -1,6 +1,5 @@"use client";-import { useFeatureFlagEnabled } from "@rallly/posthog/client";import { Icon } from "@rallly/ui/icon";import {SidebarGroup,@@ -132,11 +131,6 @@ export function SpaceSidebarMenu() {export function DeveloperSidebarMenu() {const { t } = useTranslation();const pathname = usePathname();- const isDeveloperToolsEnabled = useFeatureFlagEnabled("developer-tools");-- if (!isDeveloperToolsEnabled) {- return null;- }const menuItems = [{diff --git a/apps/web/src/app/[locale]/(space)/settings/layout.tsx b/apps/web/src/app/[locale]/(space)/settings/layout.tsxindex 450f33cc4..86cf70234 100644--- a/apps/web/src/app/[locale]/(space)/settings/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/settings/layout.tsx@@ -22,7 +22,7 @@ import { requireSpace, requireUser } from "@/auth/data";import { NavUser } from "@/components/nav-user";import { Trans } from "@/components/trans";import { BillingProvider } from "@/features/billing/client";-import { isSelfHosted } from "@/utils/constants";+import { isApiAccessEnabled } from "@/features/developer/data";import {AccountSidebarMenu,DeveloperSidebarMenu,@@ -35,9 +35,7 @@ export default async function Layout({children?: React.ReactNode;}) {const [user, space] = await Promise.all([requireUser(), requireSpace()]);- const isSpaceOwner = space.ownerId === user.id;- const isProSpace = space.tier === "pro";- const canAccessDeveloperTools = isProSpace || isSpaceOwner;+ const canAccessDeveloperTools = await isApiAccessEnabled(user, space);return (<BillingProvider>@@ -81,9 +79,7 @@ export default async function Layout({<SpaceSidebarMenu /></SidebarGroupContent></SidebarGroup>- {!isSelfHosted && canAccessDeveloperTools ? (- <DeveloperSidebarMenu />- ) : null}+ {canAccessDeveloperTools ? <DeveloperSidebarMenu /> : null}</SidebarContent><SidebarFooter><NavUserdiff --git a/apps/web/src/features/developer/data.ts b/apps/web/src/features/developer/data.tsnew file mode 100644index 000000000..631319eac--- /dev/null+++ b/apps/web/src/features/developer/data.ts@@ -0,0 +1,43 @@+import { PostHogClient } from "@/features/analytics/posthog";+import type { SpaceTier } from "@/features/space/schema";+import { isSelfHosted } from "@/utils/constants";++/**+ * Determines if a user has access to API features (API keys, developer tools)+ * @param user - The user to check access for+ * @param space - The space to check access for+ * @returns True if the user can access API features+ */+export async function isApiAccessEnabled(+ user: {+ id: string;+ },+ space: {+ tier: SpaceTier;+ ownerId: string;+ },+): Promise<boolean> {+ // Block self-hosted deployments+ if (isSelfHosted) {+ return false;+ }++ // Require pro tier+ if (space.tier !== "pro") {+ return false;+ }++ // Require space owner+ if (space.ownerId !== user.id) {+ return false;+ }++ // Check PostHog feature flag+ const posthog = PostHogClient();+ const isFeatureFlagEnabled = await posthog?.isFeatureEnabled(+ "developer-tools",+ user.id,+ );++ return isFeatureFlagEnabled ?? false;+}diff --git a/apps/web/src/trpc/trpc.ts b/apps/web/src/trpc/trpc.tsindex bb712703b..c52d1c9bb 100644--- a/apps/web/src/trpc/trpc.ts+++ b/apps/web/src/trpc/trpc.ts@@ -6,6 +6,7 @@ import { kv } from "@vercel/kv";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";@@ -145,19 +146,30 @@ export const proProcedure = privateProcedure.use(async ({ next }) => {export const spaceOwnerCloudOnlyProcedure = privateProcedure.use(async ({ ctx, next }) => {- if (isSelfHosted) {+ const space = await getActiveSpaceForUser(ctx.user.id);++ if (!space) {throw new TRPCError({code: "FORBIDDEN",- message: "This method is only available on the cloud",+ message: "No active space found",});}- const space = await getActiveSpaceForUser(ctx.user.id);+ 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 (!space || space.ownerId !== ctx.user.id) {+ if (!hasAccess) {throw new TRPCError({code: "FORBIDDEN",- message: "Only the space owner can perform this action",+ message: "API access is not enabled for this user or space",});}