The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Harden workspace invite accept and fix API error display
Kiran K8df1d48a4c29
diff --git a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.tsindex 3544f1c971..cc430e2f23 100644--- a/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts+++ b/apps/web/app/api/workspaces/[idOrSlug]/invites/accept/route.ts@@ -18,6 +18,11 @@ export const POST = withSession(async ({ session, params }) => {slug,},},+ select: {+ projectId: true,+ expires: true,+ role: true,+ },});if (!invite) {@@ -34,22 +39,20 @@ export const POST = withSession(async ({ session, params }) => {});}- const workspace = await prisma.$transaction(async (tx) => {- const existingMembership = await tx.projectUsers.findFirst({+ const [workspaceUser, workspace] = await Promise.all([+ prisma.projectUsers.findUnique({where: {- userId: session.user.id,- projectId: invite.projectId,+ userId_projectId: {+ userId: session.user.id,+ projectId: invite.projectId,+ },},- });-- if (existingMembership) {- throw new DubApiError({- code: "conflict",- message: "You are already a member of this workspace.",- });- }+ select: {+ id: true,+ },+ }),- const workspace = await tx.project.findUniqueOrThrow({+ prisma.project.findUniqueOrThrow({where: {id: invite.projectId,},@@ -70,24 +73,33 @@ export const POST = withSession(async ({ session, params }) => {},},},+ }),+ ]);++ if (workspaceUser) {+ throw new DubApiError({+ code: "conflict",+ message: "You are already a member of this workspace.",});+ }- if (workspace._count.users >= workspace.usersLimit) {- throw new DubApiError({- code: "exceeded_limit",- message: exceededLimitError({- plan: workspace.plan as PlanProps,- limit: workspace.usersLimit,- type: "users",- }),- });- }+ assertRoleAllowedForPlan({+ role: invite.role,+ plan: workspace.plan,+ });- assertRoleAllowedForPlan({- role: invite.role,- plan: workspace.plan,+ if (workspace._count.users >= workspace.usersLimit) {+ throw new DubApiError({+ code: "exceeded_limit",+ message: exceededLimitError({+ plan: workspace.plan as PlanProps,+ limit: workspace.usersLimit,+ type: "users",+ }),});+ }+ await prisma.$transaction(async (tx) => {await tx.projectUsers.create({data: {userId: session.user.id,@@ -99,7 +111,6 @@ export const POST = withSession(async ({ session, params }) => {},});- // Delete invite inside transaction to ensure consistencyawait tx.projectInvite.delete({where: {email_projectId: {@@ -109,7 +120,25 @@ export const POST = withSession(async ({ session, params }) => {},});- return workspace;+ const userCount = await tx.projectUsers.count({+ where: {+ projectId: workspace.id,+ user: {+ isMachine: false,+ },+ },+ });++ if (userCount > workspace.usersLimit) {+ throw new DubApiError({+ code: "exceeded_limit",+ message: exceededLimitError({+ plan: workspace.plan as PlanProps,+ limit: workspace.usersLimit,+ type: "users",+ }),+ });+ }});// Update default workspacediff --git a/apps/web/app/app.dub.co/(invites)/[slug]/invite/accept-invite-button.tsx b/apps/web/app/app.dub.co/(invites)/[slug]/invite/accept-invite-button.tsxindex 51c7f65467..d16f6b1a1a 100644--- a/apps/web/app/app.dub.co/(invites)/[slug]/invite/accept-invite-button.tsx+++ b/apps/web/app/app.dub.co/(invites)/[slug]/invite/accept-invite-button.tsx@@ -2,14 +2,12 @@import { mutatePrefix } from "@/lib/swr/mutate";import { Button, useKeyboardShortcut } from "@dub/ui";-import { useSession } from "next-auth/react";import { useParams, useRouter } from "next/navigation";import { useState } from "react";import { toast } from "sonner";export function AcceptInviteButton() {const { slug } = useParams<{ slug: string }>();- const { data: session } = useSession();const router = useRouter();const [isAccepting, setIsAccepting] = useState(false);@@ -24,7 +22,7 @@ export function AcceptInviteButton() {});if (!response.ok) {- const error = await response.json();+ const { error } = await response.json();toast.error(error.message || "Failed to accept invite.");setIsAccepting(false);return;@@ -34,7 +32,6 @@ export function AcceptInviteButton() {router.replace(`/${slug}`);toast.success("You now are a part of this workspace!");} catch (e) {- console.error("Failed to accept invite", e);setIsAccepting(false);}};