Skip to content

OpenPanel is an open-source web and product analytics platform, an open-source alternative to Mixpanel with optional self-hosting.

fix: member access and other role based actions #308

Carl-Gerhard Lindesvärdbb35a0a759c2
diff --git a/apps/start/package.json b/apps/start/package.json
index bf155b7ef..4f9066026 100644
--- a/apps/start/package.json
+++ b/apps/start/package.json
@@ -28,7 +28,7 @@
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@faker-js/faker": "^9.6.0",
- "@hookform/resolvers": "^3.3.4",
+ "@hookform/resolvers": "^5.2.2",
"@hyperdx/node-opentelemetry": "^0.8.1",
"@nivo/sankey": "^0.99.0",
"@number-flow/react": "0.5.10",
diff --git a/apps/start/src/components/project-selector.tsx b/apps/start/src/components/project-selector.tsx
index 53523cc86..89fed538e 100644
--- a/apps/start/src/components/project-selector.tsx
+++ b/apps/start/src/components/project-selector.tsx
@@ -19,6 +19,7 @@ import {
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
import { useAppParams } from '@/hooks/use-app-params';
+import { useOrganizationAccess } from '@/hooks/use-organization-access';
import { pushModal } from '@/modals';
interface ProjectSelectorProps {
@@ -34,6 +35,7 @@ export default function ProjectSelector({
}: ProjectSelectorProps) {
const router = useRouter();
const { organizationId, projectId } = useAppParams();
+ const { isAdmin } = useOrganizationAccess(organizationId);
const [open, setOpen] = useState(false);
const changeProject = (newProjectId: string) => {
@@ -115,17 +117,19 @@ export default function ProjectSelector({
</Link>
</DropdownMenuItem>
)}
- <DropdownMenuItem
- className="text-emerald-600"
- onClick={() => {
- pushModal('AddProject');
- }}
- >
- Create new project
- <DropdownMenuShortcut>
- <PlusIcon size={16} />
- </DropdownMenuShortcut>
- </DropdownMenuItem>
+ {isAdmin && (
+ <DropdownMenuItem
+ className="text-emerald-600"
+ onClick={() => {
+ pushModal('AddProject');
+ }}
+ >
+ Create new project
+ <DropdownMenuShortcut>
+ <PlusIcon size={16} />
+ </DropdownMenuShortcut>
+ </DropdownMenuItem>
+ )}
</DropdownMenuGroup>
{!!organizations && (
<>
diff --git a/apps/start/src/components/sidebar-organization-menu.tsx b/apps/start/src/components/sidebar-organization-menu.tsx
index 1bb74a760..d66910b3d 100644
--- a/apps/start/src/components/sidebar-organization-menu.tsx
+++ b/apps/start/src/components/sidebar-organization-menu.tsx
@@ -18,9 +18,11 @@ import {
DropdownMenuTrigger,
} from './ui/dropdown-menu';
import { useAppContext } from '@/hooks/use-app-context';
+import { useOrganizationAccess } from '@/hooks/use-organization-access';
import { pushModal } from '@/modals';
import type { RouterOutputs } from '@/trpc/client';
import { cn } from '@/utils/cn';
+import { useParams } from '@tanstack/react-router';
export default function SidebarOrganizationMenu({
organization,
@@ -28,6 +30,8 @@ export default function SidebarOrganizationMenu({
organization: RouterOutputs['organization']['list'][number];
}) {
const { isSelfHosted } = useAppContext();
+ const { organizationId } = useParams({ strict: false });
+ const { isAdmin } = useOrganizationAccess(organizationId);
return (
<>
@@ -53,7 +57,7 @@ export default function SidebarOrganizationMenu({
<CogIcon size={20} />
<div className="flex-1">Settings</div>
</Link>
- {!isSelfHosted && (
+ {isAdmin && !isSelfHosted && (
<Link
activeOptions={{ exact: true }}
className={cn(
@@ -70,16 +74,18 @@ export default function SidebarOrganizationMenu({
{organization?.isCanceled && <Badge>Canceled</Badge>}
</Link>
)}
- <Link
- className={cn(
- 'flex items-center gap-2 rounded-md px-3 py-2 font-medium text-[13px] transition-all hover:bg-def-200'
- )}
- from="/$organizationId"
- to="/$organizationId/members"
- >
- <UsersIcon size={20} />
- <div className="flex-1">Members</div>
- </Link>
+ {isAdmin && (
+ <Link
+ className={cn(
+ 'flex items-center gap-2 rounded-md px-3 py-2 font-medium text-[13px] transition-all hover:bg-def-200'
+ )}
+ from="/$organizationId"
+ to="/$organizationId/members"
+ >
+ <UsersIcon size={20} />
+ <div className="flex-1">Members</div>
+ </Link>
+ )}
<Link
className={cn(
'flex items-center gap-2 rounded-md px-3 py-2 font-medium text-[13px] transition-all hover:bg-def-200'
@@ -96,18 +102,24 @@ export default function SidebarOrganizationMenu({
export function ActionCTAButton() {
const navigate = useNavigate();
+ const { organizationId } = useParams({ strict: false });
+ const { isAdmin } = useOrganizationAccess(organizationId);
const ACTIONS = [
- {
- label: 'Create a project',
- icon: PlusIcon,
- onClick: () => pushModal('AddProject'),
- },
- {
- label: 'Invite a user',
- icon: UsersIcon,
- onClick: () => pushModal('CreateInvite'),
- },
+ ...(isAdmin
+ ? [
+ {
+ label: 'Create a project',
+ icon: PlusIcon,
+ onClick: () => pushModal('AddProject'),
+ },
+ {
+ label: 'Invite a user',
+ icon: UsersIcon,
+ onClick: () => pushModal('CreateInvite'),
+ },
+ ]
+ : []),
{
label: 'Add integration',
icon: WorkflowIcon,
diff --git a/apps/start/src/hooks/use-organization-access.ts b/apps/start/src/hooks/use-organization-access.ts
new file mode 100644
index 000000000..dae93d89a
--- /dev/null
+++ b/apps/start/src/hooks/use-organization-access.ts
@@ -0,0 +1,17 @@
+import { useTRPC } from '@/integrations/trpc/react';
+import { useQuery } from '@tanstack/react-query';
+
+export function useOrganizationAccess(organizationId: string | undefined) {
+ const trpc = useTRPC();
+ const { data } = useQuery({
+ ...trpc.organization.myAccess.queryOptions({
+ organizationId: organizationId ?? '',
+ }),
+ enabled: !!organizationId,
+ });
+
+ return {
+ role: data?.role ?? null,
+ isAdmin: data?.role === 'org:admin',
+ };
+}
diff --git a/apps/start/src/modals/add-project.tsx b/apps/start/src/modals/add-project.tsx
index c0253ac9b..860f3a1c3 100644
--- a/apps/start/src/modals/add-project.tsx
+++ b/apps/start/src/modals/add-project.tsx
@@ -1,13 +1,3 @@
-import AnimateHeight from '@/components/animate-height';
-import { ButtonContainer } from '@/components/button-container';
-import { CreateClientSuccess } from '@/components/clients/create-client-success';
-import { CheckboxItem } from '@/components/forms/checkbox-item';
-import { InputWithLabel, WithLabel } from '@/components/forms/input-with-label';
-import TagInput from '@/components/forms/tag-input';
-import { Button } from '@/components/ui/button';
-import { useAppParams } from '@/hooks/use-app-params';
-import { useTRPC } from '@/integrations/trpc/react';
-import { handleError } from '@/integrations/trpc/react';
import { zodResolver } from '@hookform/resolvers/zod';
import { zOnboardingProject } from '@openpanel/validation';
import { useMutation, useQueryClient } from '@tanstack/react-query';
@@ -24,6 +14,15 @@ import { toast } from 'sonner';
import type { z } from 'zod';
import { popModal } from '.';
import { ModalContent, ModalHeader } from './Modal/Container';
+import AnimateHeight from '@/components/animate-height';
+import { ButtonContainer } from '@/components/button-container';
+import { CreateClientSuccess } from '@/components/clients/create-client-success';
+import { CheckboxItem } from '@/components/forms/checkbox-item';
+import { InputWithLabel, WithLabel } from '@/components/forms/input-with-label';
+import TagInput from '@/components/forms/tag-input';
+import { Button } from '@/components/ui/button';
+import { useAppParams } from '@/hooks/use-app-params';
+import { handleError, useTRPC } from '@/integrations/trpc/react';
const validator = zOnboardingProject;
type IForm = z.infer<typeof validator>;
@@ -51,7 +50,7 @@ export default function AddProject() {
onError: handleError,
onSuccess: (res) => {
queryClient.invalidateQueries(
- trpc.project.list.queryFilter({ organizationId }),
+ trpc.project.list.queryFilter({ organizationId })
);
toast.success('Project created', {
description: `${res.name}`,
@@ -68,7 +67,7 @@ export default function AddProject() {
},
});
},
- }),
+ })
);
const onSubmit = (values: IForm) => {
@@ -105,7 +104,7 @@ export default function AddProject() {
<ModalContent>
{mutation.isSuccess ? (
<>
- <ModalHeader title="Success" text={'Your project is created'} />
+ <ModalHeader text={'Your project is created'} title="Success" />
{mutation.data.client && (
<CreateClientSuccess {...mutation.data.client} />
)}
@@ -118,7 +117,7 @@ export default function AddProject() {
) : (
<>
<ModalHeader title="Create project" />
- <form onSubmit={form.handleSubmit(onSubmit)} className="col gap-4">
+ <form className="col gap-4" onSubmit={form.handleSubmit(onSubmit)}>
<InputWithLabel
label="Project name"
placeholder="Eg. My music site"
@@ -128,15 +127,15 @@ export default function AddProject() {
<div className="flex flex-col divide-y">
<Controller
- name="website"
control={form.control}
+ name="website"
render={({ field }) => (
<CheckboxItem
+ description="Track events and conversion for your website"
+ disabled={isApp}
error={form.formState.errors.website?.message}
Icon={MonitorIcon}
label="Website"
- disabled={isApp}
- description="Track events and conversion for your website"
{...field}
>
<AnimateHeight open={isWebsite && !isApp}>
@@ -160,20 +159,13 @@ export default function AddProject() {
/>
<Controller
- name="cors"
control={form.control}
+ name="cors"
render={({ field }) => (
<WithLabel label="Allowed domains">
<TagInput
{...field}
error={form.formState.errors.cors?.message}
- placeholder="Accept events from these domains"
- value={field.value ?? []}
- renderTag={(tag) =>
- tag === '*'
- ? 'Accept events from any domains'
- : tag
- }
onChange={(newValue) => {
field.onChange(
newValue.map((item) => {
@@ -186,9 +178,16 @@ export default function AddProject() {
return trimmed;
}
return `https://${trimmed}`;
- }),
+ })
);
}}
+ placeholder="Accept events from these domains"
+ renderTag={(tag) =>
+ tag === '*'
+ ? 'Accept events from any domains'
+ : tag
+ }
+ value={field.value ?? []}
/>
</WithLabel>
)}
@@ -199,28 +198,28 @@ export default function AddProject() {
)}
/>
<Controller
- name="app"
control={form.control}
+ name="app"
render={({ field }) => (
<CheckboxItem
- error={form.formState.errors.app?.message}
+ description="Track events and conversion for your app"
disabled={isWebsite}
+ error={form.formState.errors.app?.message}
Icon={SmartphoneIcon}
label="App"
- description="Track events and conversion for your app"
{...field}
/>
)}
/>
<Controller
- name="backend"
control={form.control}
+ name="backend"
render={({ field }) => (
<CheckboxItem
+ description="Track events and conversion for your backend / API"
error={form.formState.errors.backend?.message}
Icon={ServerIcon}
label="Backend / API"
- description="Track events and conversion for your backend / API"
{...field}
/>
)}
@@ -229,9 +228,9 @@ export default function AddProject() {
<ButtonContainer className="justify-end">
<Button
+ icon={SaveIcon}
loading={mutation.isPending}
type="submit"
- icon={SaveIcon}
>
Create project
</Button>
diff --git a/apps/start/src/routes/_app.$organizationId.billing.tsx b/apps/start/src/routes/_app.$organizationId.billing.tsx
index 0dcff45dc..63b2a2ffd 100644
--- a/apps/start/src/routes/_app.$organizationId.billing.tsx
+++ b/apps/start/src/routes/_app.$organizationId.billing.tsx
@@ -5,7 +5,7 @@ import { PageHeader } from '@/components/page-header';
import { useTRPC } from '@/integrations/trpc/react';
import { PAGE_TITLES, createOrganizationTitle } from '@/utils/title';
import { useQuery } from '@tanstack/react-query';
-import { createFileRoute } from '@tanstack/react-router';
+import { createFileRoute, redirect } from '@tanstack/react-router';
import { BoxSelectIcon } from 'lucide-react';
export const Route = createFileRoute('/_app/$organizationId/billing')({
@@ -20,6 +20,17 @@ export const Route = createFileRoute('/_app/$organizationId/billing')({
};
},
beforeLoad: async ({ params, context }) => {
+ const access = await context.queryClient.fetchQuery(
+ context.trpc.organization.myAccess.queryOptions({
+ organizationId: params.organizationId,
+ }),
+ );
+ if (access?.role !== 'org:admin') {
+ throw redirect({
+ to: '/$organizationId',
+ params: { organizationId: params.organizationId },
+ });
+ }
await Promise.all([
context.queryClient.prefetchQuery(
context.trpc.subscription.products.queryOptions({
diff --git a/apps/start/src/routes/_app.$organizationId.index.tsx b/apps/start/src/routes/_app.$organizationId.index.tsx
index e73225db5..027c11a49 100644
--- a/apps/start/src/routes/_app.$organizationId.index.tsx
+++ b/apps/start/src/routes/_app.$organizationId.index.tsx
@@ -5,11 +5,13 @@ import { PageHeader } from '@/components/page-header';
import ProjectCard, {
ProjectCardSkeleton,
} from '@/components/projects/project-card';
-import { LinkButton } from '@/components/ui/button';
+import { Button } from '@/components/ui/button';
import { AnimatedSearchInput } from '@/components/ui/data-table/data-table-toolbar';
import { TableButtons } from '@/components/ui/table';
+import { useOrganizationAccess } from '@/hooks/use-organization-access';
import { useSearchQueryState } from '@/hooks/use-search-query-state';
import { useTRPC } from '@/integrations/trpc/react';
+import { pushModal } from '@/modals';
import { PAGE_TITLES, createOrganizationTitle } from '@/utils/title';
import { useQuery } from '@tanstack/react-query';
import { createFileRoute } from '@tanstack/react-router';
@@ -44,18 +46,25 @@ function OrganizationPage() {
organizationId,
}),
);
+ const { isAdmin } = useOrganizationAccess(organizationId);
const { setSearch, search } = useSearchQueryState();
if (!projects?.length) {
return (
<FullPageEmptyState
title="No projects found"
- description="Create your first project to get started with analytics."
+ description={
+ isAdmin
+ ? 'Create your first project to get started with analytics.'
+ : 'You do not have access to any projects in this organization yet. Ask an admin to grant you access.'
+ }
icon={BoxSelectIcon}
>
- <LinkButton icon={PlusIcon} to=".">
- Create project
- </LinkButton>
+ {isAdmin && (
+ <Button icon={PlusIcon} onClick={() => pushModal('AddProject')}>
+ Create project
+ </Button>
+ )}
</FullPageEmptyState>
);
}
diff --git a/apps/start/src/routes/_app.$organizationId.members._tabs.tsx b/apps/start/src/routes/_app.$organizationId.members._tabs.tsx
index d55082530..128bd2f9e 100644
--- a/apps/start/src/routes/_app.$organizationId.members._tabs.tsx
+++ b/apps/start/src/routes/_app.$organizationId.members._tabs.tsx
@@ -2,7 +2,12 @@ import { PageHeader } from '@/components/page-header';
import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { usePageTabs } from '@/hooks/use-page-tabs';
import { PAGE_TITLES, createOrganizationTitle } from '@/utils/title';
-import { Outlet, createFileRoute, useRouter } from '@tanstack/react-router';
+import {
+ Outlet,
+ createFileRoute,
+ redirect,
+ useRouter,
+} from '@tanstack/react-router';
export const Route = createFileRoute('/_app/$organizationId/members/_tabs')({
component: Component,
@@ -15,6 +20,19 @@ export const Route = createFileRoute('/_app/$organizationId/members/_tabs')({
],
};
},
+ beforeLoad: async ({ params, context }) => {
+ const access = await context.queryClient.fetchQuery(
+ context.trpc.organization.myAccess.queryOptions({
+ organizationId: params.organizationId,
+ }),
+ );
+ if (access?.role !== 'org:admin') {
+ throw redirect({
+ to: '/$organizationId',
+ params: { organizationId: params.organizationId },
+ });
+ }
+ },
});
function Component() {
diff --git a/apps/start/src/routes/_app.$organizationId.tsx b/apps/start/src/routes/_app.$organizationId.tsx
index c44748e67..18ae66946 100644
--- a/apps/start/src/routes/_app.$organizationId.tsx
+++ b/apps/start/src/routes/_app.$organizationId.tsx
@@ -45,11 +45,18 @@ export const Route = createFileRoute('/_app/$organizationId')({
}
},
loader: async ({ context, params }) => {
- await context.queryClient.prefetchQuery(
- context.trpc.organization.get.queryOptions({
- organizationId: params.organizationId,
- }),
- );
+ await Promise.all([
+ context.queryClient.prefetchQuery(
+ context.trpc.organization.get.queryOptions({
+ organizationId: params.organizationId,
+ }),
+ ),
+ context.queryClient.prefetchQuery(
+ context.trpc.organization.myAccess.queryOptions({
+ organizationId: params.organizationId,
+ }),
+ ),
+ ]);
},
pendingComponent: FullPageLoadingState,
});
diff --git a/packages/db/src/services/project.service.ts b/packages/db/src/services/project.service.ts
index f550c1b0b..df3f0b111 100644
--- a/packages/db/src/services/project.service.ts
+++ b/packages/db/src/services/project.service.ts
@@ -45,17 +45,6 @@ export async function getProjectWithClients(id: string) {
return res;
}
-export function getProjectsByOrganizationId(organizationId: string) {
- return db.project.findMany({
- where: {
- organizationId,
- },
- orderBy: {
- eventsCount: 'desc',
- },
- });
-}
-
export async function getProjects({
organizationId,
userId,
diff --git a/packages/trpc/src/routers/organization.ts b/packages/trpc/src/routers/organization.ts
index 40ff4ea1d..30e567ee0 100644
--- a/packages/trpc/src/routers/organization.ts
+++ b/packages/trpc/src/routers/organization.ts
@@ -34,6 +34,17 @@ export const organizationRouter = createTRPCRouter({
return getOrganizations(ctx.session.userId);
}),
+ myAccess: protectedProcedure
+ .input(z.object({ organizationId: z.string() }))
+ .query(async ({ input, ctx }) => {
+ const access = await getOrganizationAccess({
+ userId: ctx.session.userId,
+ organizationId: input.organizationId,
+ });
+ if (!access) return null;
+ return { role: access.role };
+ }),
+
update: protectedProcedure
.input(zEditOrganization)
.mutation(async ({ input, ctx }) => {
@@ -266,13 +277,27 @@ export const organizationRouter = createTRPCRouter({
members: protectedProcedure
.input(z.object({ organizationId: z.string() }))
- .query(async ({ input }) => {
+ .query(async ({ input, ctx }) => {
+ const access = await getOrganizationAccess({
+ userId: ctx.session.userId,
+ organizationId: input.organizationId,
+ });
+ if (access?.role !== 'org:admin') {
+ throw TRPCAccessError('You do not have access to this project');
+ }
return getMembers(input.organizationId);
}),
invitations: protectedProcedure
.input(z.object({ organizationId: z.string() }))
- .query(async ({ input }) => {
+ .query(async ({ input, ctx }) => {
+ const access = await getOrganizationAccess({
+ userId: ctx.session.userId,
+ organizationId: input.organizationId,
+ });
+ if (access?.role !== 'org:admin') {
+ throw TRPCAccessError('You do not have access to this project');
+ }
return getInvites(input.organizationId);
}),
diff --git a/packages/trpc/src/routers/project.ts b/packages/trpc/src/routers/project.ts
index 7e5c63e36..0b3ffcebf 100644
--- a/packages/trpc/src/routers/project.ts
+++ b/packages/trpc/src/routers/project.ts
@@ -1,23 +1,19 @@
-import { z } from 'zod';
-
import crypto from 'node:crypto';
import { stripTrailingSlash } from '@openpanel/common';
import { hashPassword } from '@openpanel/common/server';
import {
- type Prisma,
db,
getClientByIdCached,
getId,
+ getOrganizationAccess,
getProjectByIdCached,
+ getProjects,
getProjectWithClients,
- getProjectsByOrganizationId,
+ type Prisma,
} from '@openpanel/db';
-import {
- zOnboardingProject,
- zProject,
- zProjectUpdate,
-} from '@openpanel/validation';
+import { zOnboardingProject, zProjectUpdate } from '@openpanel/validation';
import { addHours } from 'date-fns';
+import { z } from 'zod';
import { getProjectAccess } from '../access';
import { TRPCAccessError, TRPCBadRequestError } from '../errors';
import { createTRPCRouter, protectedProcedure } from '../trpc';
@@ -27,7 +23,7 @@ export const projectRouter = createTRPCRouter({
.input(
z.object({
projectId: z.string(),
- }),
+ })
)
.query(async ({ input: { projectId }, ctx }) => {
const access = await getProjectAccess({
@@ -46,11 +42,16 @@ export const projectRouter = createTRPCRouter({
.input(
z.object({
organizationId: z.string().nullable(),
- }),
+ })
)
- .query(async ({ input: { organizationId } }) => {
- if (organizationId === null) return [];
- return getProjectsByOrganizationId(organizationId);
+ .query(async ({ input: { organizationId }, ctx }) => {
+ if (organizationId === null) {
+ return [];
+ }
+ return getProjects({
+ organizationId,
+ userId: ctx.session.userId,
+ });
}),
update: protectedProcedure
@@ -102,11 +103,20 @@ export const projectRouter = createTRPCRouter({
}),
create: protectedProcedure
.input(zOnboardingProject)
- .mutation(async ({ input }) => {
+ .mutation(async ({ input, ctx }) => {
if (!input.organizationId) {
throw TRPCBadRequestError('Organization is required');
}
+ const access = await getOrganizationAccess({
+ userId: ctx.session.userId,
+ organizationId: input.organizationId,
+ });
+
+ if (access?.role !== 'org:admin') {
+ throw TRPCAccessError('Only organization admins can create projects');
+ }
+
const secret = `sec_${crypto.randomBytes(10).toString('hex')}`;
const data: Prisma.ClientCreateArgs['data'] = {
organizationId: input.organizationId,
@@ -151,7 +161,7 @@ export const projectRouter = createTRPCRouter({
.input(
z.object({
projectId: z.string(),
- }),
+ })
)
.mutation(async ({ input, ctx }) => {
const access = await getProjectAccess({
@@ -178,7 +188,7 @@ export const projectRouter = createTRPCRouter({
.input(
z.object({
projectId: z.string(),
- }),
+ })
)
.mutation(async ({ input, ctx }) => {
const access = await getProjectAccess({
diff --git a/packages/trpc/src/routers/subscription.ts b/packages/trpc/src/routers/subscription.ts
index 792c55a32..22d88d713 100644
--- a/packages/trpc/src/routers/subscription.ts
+++ b/packages/trpc/src/routers/subscription.ts
@@ -1,5 +1,6 @@
import {
db,
+ getOrganizationAccess,
getOrganizationBillingEventsCountSerieCached,
getOrganizationById,
} from '@openpanel/db';
@@ -17,9 +18,16 @@ import { zCheckout } from '@openpanel/validation';
import { getCache } from '@openpanel/redis';
import { subDays } from 'date-fns';
import { z } from 'zod';
-import { TRPCBadRequestError } from '../errors';
+import { TRPCAccessError, TRPCBadRequestError } from '../errors';
import { createTRPCRouter, protectedProcedure } from '../trpc';
+async function requireAdmin(userId: string, organizationId: string) {
+ const access = await getOrganizationAccess({ userId, organizationId });
+ if (access?.role !== 'org:admin') {
+ throw TRPCAccessError('Only organization admins can manage billing');
+ }
+}
+
export const subscriptionRouter = createTRPCRouter({
getCurrent: protectedProcedure
.input(z.object({ organizationId: z.string() }))
@@ -36,6 +44,7 @@ export const subscriptionRouter = createTRPCRouter({
checkout: protectedProcedure
.input(zCheckout)
.mutation(async ({ input, ctx }) => {
+ await requireAdmin(ctx.session.userId, input.organizationId);
const [user, organization] = await Promise.all([
db.user.findFirstOrThrow({
where: {
@@ -148,7 +157,8 @@ export const subscriptionRouter = createTRPCRouter({
cancelSubscription: protectedProcedure
.input(z.object({ organizationId: z.string() }))
- .mutation(async ({ input }) => {
+ .mutation(async ({ input, ctx }) => {
+ await requireAdmin(ctx.session.userId, input.organizationId);
const organization = await getOrganizationById(input.organizationId);
if (!organization.subscriptionId) {
throw TRPCBadRequestError('Organization has no subscription');
@@ -161,7 +171,8 @@ export const subscriptionRouter = createTRPCRouter({
portal: protectedProcedure
.input(z.object({ organizationId: z.string() }))
- .mutation(async ({ input }) => {
+ .mutation(async ({ input, ctx }) => {
+ await requireAdmin(ctx.session.userId, input.organizationId);
const organization = await getOrganizationById(input.organizationId);
if (!organization.subscriptionCustomerId) {
throw TRPCBadRequestError('Organization has no subscription');
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 860dd2a62..b5fd78cb4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -457,8 +457,8 @@ importers:
specifier: ^9.6.0
version: 9.9.0
'@hookform/resolvers':
- specifier: ^3.3.4
+ specifier: ^5.2.2
'@hyperdx/node-opentelemetry':
specifier: ^0.8.1
version: 0.8.1
@@ -4823,10 +4823,10 @@ packages:
peerDependencies:
hono: ^4
- '@hookform/[email protected]':
- resolution: {integrity: sha512-o5cgpGOuJYrd+iMKvkttOclgwRW86EsWJZZRC23prf0uU2i48Htq4PuT73AVb9ionFyZrwYEITuOFGF+BydEtQ==}
+ '@hookform/[email protected]':
+ resolution: {integrity: sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==}
peerDependencies:
- react-hook-form: ^7.0.0
+ react-hook-form: ^7.55.0
'@hyperdx/[email protected]':
resolution: {integrity: sha512-Jgk7JY5J07Mq9fgXApGVhSkS4+WdzzRcWLReAZhxgo46KShxE6w614mFqUSnuo+z6ghlehsy4ForViUfxrFyew==}
@@ -23635,8 +23635,9 @@ snapshots:
dependencies:
hono: 4.12.9
dependencies:
+ '@standard-schema/utils': 0.3.0
react-hook-form: 7.50.1([email protected])
'@hyperdx/[email protected](@opentelemetry/[email protected])':