refactor(web): migrate all auth to withAuthV2/withOptionalAuthV2

brendan-kellam · claude · brendan-kellam · commit 7b227503b675 · 2026-04-01T14:50:46.000-07:00
Replace all usages of the legacy withAuth and withOrgMembership
helpers with the newer withAuthV2, withOptionalAuthV2, and
withMinimumOrgRole APIs. This consolidates auth into a single
context object that provides user, org, role, and a user-scoped
prisma client, eliminating the need for separate domain parameters
and nested auth wrappers.

Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/web/src/actions.ts b/packages/web/src/actions.ts
diff --git a/packages/web/src/app/[domain]/chat/[id]/page.tsx b/packages/web/src/app/[domain]/chat/[id]/page.tsx
@@ -104,7 +104,7 @@ export default async function Page(props: PageProps) {
 
     const languageModels = await getConfiguredLanguageModelsInfo();
     const repos = await getRepos();
-    const searchContexts = await getSearchContexts(params.domain);
+    const searchContexts = await getSearchContexts();
     const chatInfo = await getChatInfo({ chatId: params.id });
     const chatHistory = session ? await getUserChatHistory() : [];
 
diff --git a/packages/web/src/app/[domain]/chat/page.tsx b/packages/web/src/app/[domain]/chat/page.tsx
@@ -27,7 +27,7 @@ interface PageProps {
 export default async function Page(props: PageProps) {
     const params = await props.params;
     const languageModels = await getConfiguredLanguageModelsInfo();
-    const searchContexts = await getSearchContexts(params.domain);
+    const searchContexts = await getSearchContexts();
     const allRepos = await getRepos();
     const session = await auth();
     const chatHistory = session ? await getUserChatHistory() : [];
diff --git a/packages/web/src/app/[domain]/components/navigationMenu/index.tsx b/packages/web/src/app/[domain]/components/navigationMenu/index.tsx
@@ -33,7 +33,7 @@ export const NavigationMenu = async ({
         throw new ServiceErrorException(repoStats);
     }
 
-    const role = isAuthenticated ? await getCurrentUserRole(domain) : null;
+    const role = isAuthenticated ? await getCurrentUserRole() : null;
     if (isServiceError(role)) {
         throw new ServiceErrorException(role);
     }
@@ -43,7 +43,7 @@ export const NavigationMenu = async ({
             return null;
         }
 
-        const joinRequests = await getOrgAccountRequests(domain);
+        const joinRequests = await getOrgAccountRequests();
         if (isServiceError(joinRequests)) {
             throw new ServiceErrorException(joinRequests);
         }
diff --git a/packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts b/packages/web/src/app/[domain]/components/searchBar/useSuggestionsData.ts
@@ -107,7 +107,7 @@ export const useSuggestionsData = ({
 
     const { data: searchContextSuggestions, isLoading: _isLoadingSearchContexts } = useQuery({
         queryKey: ["searchContexts", domain],
-        queryFn: () => getSearchContexts(domain),
+        queryFn: () => getSearchContexts(),
         select: (data): Suggestion[] => {
             if (isServiceError(data)) {
                 return [];
diff --git a/packages/web/src/app/[domain]/repos/[id]/page.tsx b/packages/web/src/app/[domain]/repos/[id]/page.tsx
@@ -52,7 +52,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
 
     const repoMetadata = repoMetadataSchema.parse(repo.metadata);
 
-    const userRole = await getCurrentUserRole(SINGLE_TENANT_ORG_DOMAIN);
+    const userRole = await getCurrentUserRole();
     if (isServiceError(userRole)) {
         throw new ServiceErrorException(userRole);
     }
diff --git a/packages/web/src/app/[domain]/repos/layout.tsx b/packages/web/src/app/[domain]/repos/layout.tsx
@@ -24,7 +24,7 @@ export default async function Layout(
         throw new ServiceErrorException(repoStats);
     }
 
-    const userRoleInOrg = await getCurrentUserRole(domain);
+    const userRoleInOrg = await getCurrentUserRole();
 
     return (
         <div className="min-h-screen flex flex-col">
diff --git a/packages/web/src/app/[domain]/settings/apiKeys/apiKeysPage.tsx b/packages/web/src/app/[domain]/settings/apiKeys/apiKeysPage.tsx
@@ -7,7 +7,6 @@ import { Input } from "@/components/ui/input";
 import { isServiceError } from "@/lib/utils";
 import { Copy, Check, AlertTriangle, Loader2, Plus } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { useDomain } from "@/hooks/useDomain";
 import { useToast } from "@/components/hooks/use-toast";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 import { DataTable } from "@/components/ui/data-table";
@@ -16,7 +15,6 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 
 export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
-    const domain = useDomain();
     const { toast } = useToast();
     const captureEvent = useCaptureEvent();
 
@@ -33,7 +31,7 @@ export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
         setIsLoading(true);
         setError(null);
         try {
-            const keys = await getUserApiKeys(domain);
+            const keys = await getUserApiKeys();
             if (isServiceError(keys)) {
                 setError("Failed to load API keys");
                 toast({
@@ -55,7 +53,7 @@ export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
         } finally {
             setIsLoading(false);
         }
-    }, [domain, toast]);
+    }, [toast]);
 
     useEffect(() => {
         loadApiKeys();
@@ -73,7 +71,7 @@ export function ApiKeysPage({ canCreateApiKey }: { canCreateApiKey: boolean }) {
 
         setIsCreatingKey(true);
         try {
-            const result = await createApiKey(newKeyName.trim(), domain);
+            const result = await createApiKey(newKeyName.trim());
             if (isServiceError(result)) {
                 toast({
                     title: "Error",
diff --git a/packages/web/src/app/[domain]/settings/apiKeys/columns.tsx b/packages/web/src/app/[domain]/settings/apiKeys/columns.tsx
@@ -4,7 +4,6 @@ import { ColumnDef } from "@tanstack/react-table"
 import { ArrowUpDown, Key, Trash2 } from "lucide-react"
 import { Button } from "@/components/ui/button"
 import { deleteApiKey } from "@/actions"
-import { useParams } from "next/navigation"
 import {
     AlertDialog,
     AlertDialogAction,
@@ -27,14 +26,13 @@ export type ApiKeyColumnInfo = {
 
 // Component for the actions cell to properly use React hooks
 function ApiKeyActions({ apiKey }: { apiKey: ApiKeyColumnInfo }) {
-    const params = useParams<{ domain: string }>()
     const [isPending, setIsPending] = useState(false)
     const { toast } = useToast()
     
     const handleDelete = async () => {
         setIsPending(true)
         try {
-            await deleteApiKey(apiKey.name, params.domain)
+            await deleteApiKey(apiKey.name)
             window.location.reload()
         } catch (error) {
             console.error("Failed to delete API key", error)
diff --git a/packages/web/src/app/[domain]/settings/layout.tsx b/packages/web/src/app/[domain]/settings/layout.tsx
@@ -70,7 +70,7 @@ export const getSidebarNavItems = async () =>
     withAuthV2(async ({ role }) => {
         let numJoinRequests: number | undefined;
         if (role === OrgRole.OWNER) {
-            const requests = await getOrgAccountRequests(SINGLE_TENANT_ORG_DOMAIN);
+            const requests = await getOrgAccountRequests();
             if (isServiceError(requests)) {
                 throw new ServiceErrorException(requests);
             }
diff --git a/packages/web/src/app/[domain]/settings/license/page.tsx b/packages/web/src/app/[domain]/settings/license/page.tsx
@@ -75,7 +75,7 @@ export default async function LicensePage(props: LicensePageProps) {
         )
     }
 
-    const members = await getOrgMembers(domain);
+    const members = await getOrgMembers();
     if (isServiceError(members)) {
         throw new ServiceErrorException(members);
     }
diff --git a/packages/web/src/app/[domain]/settings/members/components/inviteMemberCard.tsx b/packages/web/src/app/[domain]/settings/members/components/inviteMemberCard.tsx
@@ -12,7 +12,6 @@ import { PlusCircleIcon, Loader2, AlertCircle } from "lucide-react";
 import { OrgRole } from "@prisma/client";
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from "@/components/ui/alert-dialog";
 import { createInvites } from "@/actions";
-import { useDomain } from "@/hooks/useDomain";
 import { isServiceError } from "@/lib/utils";
 import { useToast } from "@/components/hooks/use-toast";
 import { useRouter } from "next/navigation";
@@ -35,8 +34,7 @@ interface InviteMemberCardProps {
 export const InviteMemberCard = ({ currentUserRole, seatsAvailable = true }: InviteMemberCardProps) => {
     const [isInviteDialogOpen, setIsInviteDialogOpen] = useState(false);
     const [isLoading, setIsLoading] = useState(false);
-    const domain = useDomain();
-    const { toast } = useToast();   
+    const { toast } = useToast();
     const router = useRouter();
     const captureEvent = useCaptureEvent();
 
@@ -54,7 +52,7 @@ export const InviteMemberCard = ({ currentUserRole, seatsAvailable = true }: Inv
 
     const onSubmit = useCallback((data: z.infer<typeof inviteMemberFormSchema>) => {
         setIsLoading(true);
-        createInvites(data.emails.map(e => e.email), domain)
+        createInvites(data.emails.map(e => e.email))
             .then((res) => {
                 if (isServiceError(res)) {
                     toast({
@@ -78,7 +76,7 @@ export const InviteMemberCard = ({ currentUserRole, seatsAvailable = true }: Inv
             .finally(() => {
                 setIsLoading(false);
             });
-    }, [domain, form, toast, router, captureEvent]);
+    }, [form, toast, router, captureEvent]);
 
     const isDisabled = !seatsAvailable || currentUserRole !== OrgRole.OWNER || isLoading;
 
diff --git a/packages/web/src/app/[domain]/settings/members/components/invitesList.tsx b/packages/web/src/app/[domain]/settings/members/components/invitesList.tsx
@@ -14,7 +14,6 @@ import { Copy, MoreVertical, Search } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
 import { cancelInvite } from "@/actions";
 import { useRouter } from "next/navigation";
-import { useDomain } from "@/hooks/useDomain";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 interface Invite {
     id: string;
@@ -34,7 +33,6 @@ export const InvitesList = ({ invites, currentUserRole }: InviteListProps) => {
     const [inviteToCancel, setInviteToCancel] = useState<Invite | null>(null)
     const { toast } = useToast();
     const router = useRouter();
-    const domain = useDomain();
     const captureEvent = useCaptureEvent();
 
     const filteredInvites = useMemo(() => {
@@ -53,7 +51,7 @@ export const InvitesList = ({ invites, currentUserRole }: InviteListProps) => {
     }, [invites, searchQuery, dateSort]);
 
     const onCancelInvite = useCallback((inviteId: string) => {
-        cancelInvite(inviteId, domain)
+        cancelInvite(inviteId)
             .then((response) => {
                 if (isServiceError(response)) {
                     toast({
@@ -70,7 +68,7 @@ export const InvitesList = ({ invites, currentUserRole }: InviteListProps) => {
                     router.refresh();
                 }
             });
-    }, [domain, toast, router, captureEvent]);
+    }, [toast, router, captureEvent]);
 
     return (
         <div className="w-full mx-auto space-y-6">
diff --git a/packages/web/src/app/[domain]/settings/members/components/requestsList.tsx b/packages/web/src/app/[domain]/settings/members/components/requestsList.tsx
@@ -13,7 +13,6 @@ import { CheckCircle, Search, XCircle } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
 import { approveAccountRequest, rejectAccountRequest } from "@/actions";
 import { useRouter } from "next/navigation";
-import { useDomain } from "@/hooks/useDomain";
 import useCaptureEvent from "@/hooks/useCaptureEvent";
 
 interface Request {
@@ -36,7 +35,6 @@ export const RequestsList = ({ requests, currentUserRole }: RequestsListProps) =
     const [requestToAction, setRequestToAction] = useState<Request | null>(null)
     const { toast } = useToast();
     const router = useRouter();
-    const domain = useDomain();
     const captureEvent = useCaptureEvent();
 
     const filteredRequests = useMemo(() => {
@@ -56,7 +54,7 @@ export const RequestsList = ({ requests, currentUserRole }: RequestsListProps) =
     }, [requests, searchQuery, dateSort]);
 
     const onApproveRequest = useCallback((requestId: string) => {
-        approveAccountRequest(requestId, domain)
+        approveAccountRequest(requestId)
             .then((response) => {
                 if (isServiceError(response)) {
                     toast({
@@ -73,10 +71,10 @@ export const RequestsList = ({ requests, currentUserRole }: RequestsListProps) =
                     router.refresh();
                 }
             });
-    }, [domain, toast, router, captureEvent]);
+    }, [toast, router, captureEvent]);
 
     const onRejectRequest = useCallback((requestId: string) => {
-        rejectAccountRequest(requestId, domain)
+        rejectAccountRequest(requestId)
             .then((response) => {
                 if (isServiceError(response)) {
                     toast({
@@ -93,7 +91,7 @@ export const RequestsList = ({ requests, currentUserRole }: RequestsListProps) =
                     router.refresh();
                 }
             });
-    }, [domain, toast, router, captureEvent]);
+    }, [toast, router, captureEvent]);
 
     return (
         <div className="w-full mx-auto space-y-6">
diff --git a/packages/web/src/app/[domain]/settings/members/page.tsx b/packages/web/src/app/[domain]/settings/members/page.tsx
@@ -56,17 +56,17 @@ export default async function MembersSettingsPage(props: MembersSettingsPageProp
         redirect(`/${domain}/settings`);
     }
 
-    const members = await getOrgMembers(domain);
+    const members = await getOrgMembers();
     if (isServiceError(members)) {
         throw new ServiceErrorException(members);
     }
 
-    const invites = await getOrgInvites(domain);
+    const invites = await getOrgInvites();
     if (isServiceError(invites)) {
         throw new ServiceErrorException(invites);
     }
 
-    const requests = await getOrgAccountRequests(domain);
+    const requests = await getOrgAccountRequests();
     if (isServiceError(requests)) {
         throw new ServiceErrorException(requests);
     }
diff --git a/packages/web/src/app/components/anonymousAccessToggle.tsx b/packages/web/src/app/components/anonymousAccessToggle.tsx
@@ -3,7 +3,6 @@
 import { useState } from "react"
 import { Switch } from "@/components/ui/switch"
 import { setAnonymousAccessStatus } from "@/actions"
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
 import { isServiceError } from "@/lib/utils"
 import { useToast } from "@/components/hooks/use-toast"
 
@@ -22,7 +21,7 @@ export function AnonymousAccessToggle({ hasAnonymousAccessEntitlement, anonymous
     const handleToggle = async (checked: boolean) => {
         setIsLoading(true)
         try {
-            const result = await setAnonymousAccessStatus(SINGLE_TENANT_ORG_DOMAIN, checked)
+            const result = await setAnonymousAccessStatus(checked)
             
             if (isServiceError(result)) {
                 toast({
diff --git a/packages/web/src/app/components/inviteLinkToggle.tsx b/packages/web/src/app/components/inviteLinkToggle.tsx
@@ -6,7 +6,6 @@ import { Input } from "@/components/ui/input"
 import { Switch } from "@/components/ui/switch"
 import { Copy, Check } from "lucide-react"
 import { useToast } from "@/components/hooks/use-toast"
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
 import { setInviteLinkEnabled } from "@/actions"
 import { isServiceError } from "@/lib/utils"
 
@@ -25,7 +24,7 @@ export function InviteLinkToggle({ inviteLinkEnabled, inviteLink }: InviteLinkTo
     const handleToggle = async (checked: boolean) => {
         setIsLoading(true)
         try {
-            const result = await setInviteLinkEnabled(SINGLE_TENANT_ORG_DOMAIN, checked)
+            const result = await setInviteLinkEnabled(checked)
             
             if (isServiceError(result)) {
                 toast({
diff --git a/packages/web/src/app/components/memberApprovalRequiredToggle.tsx b/packages/web/src/app/components/memberApprovalRequiredToggle.tsx
@@ -3,7 +3,6 @@
 import { useState } from "react"
 import { Switch } from "@/components/ui/switch"
 import { setMemberApprovalRequired } from "@/actions"
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
 import { isServiceError } from "@/lib/utils"
 import { useToast } from "@/components/hooks/use-toast"
 
@@ -21,7 +20,7 @@ export function MemberApprovalRequiredToggle({ memberApprovalRequired, onToggleC
     const handleToggle = async (checked: boolean) => {
         setIsLoading(true)
         try {
-            const result = await setMemberApprovalRequired(SINGLE_TENANT_ORG_DOMAIN, checked)
+            const result = await setMemberApprovalRequired(checked)
             
             if (isServiceError(result)) {
                 toast({
diff --git a/packages/web/src/app/invite/actions.ts b/packages/web/src/app/invite/actions.ts
@@ -1,22 +1,21 @@
 "use server";
 
-import { withAuth } from "@/actions";
 import { isServiceError } from "@/lib/utils";
 import { orgNotFound, ServiceError } from "@/lib/serviceError";
 import { sew } from "@/actions";
 import { addUserToOrganization } from "@/lib/authUtils";
-import { prisma } from "@/prisma";
+import { withAuthV2 } from "@/withAuthV2";
 import { StatusCodes } from "http-status-codes";
 import { ErrorCode } from "@/lib/errorCodes";
 
 export const joinOrganization = async (orgId: number, inviteLinkId?: string) => sew(async () =>
-    withAuth(async (userId) => {
+    withAuthV2(async ({ user, prisma }) => {
         const org = await prisma.org.findUnique({
             where: {
                 id: orgId,
             },
         });
-        
+
         if (!org) {
             return orgNotFound();
         }
@@ -40,7 +39,7 @@ export const joinOrganization = async (orgId: number, inviteLinkId?: string) =>
             }
         }
 
-        const addUserToOrgRes = await addUserToOrganization(userId, org.id);
+        const addUserToOrgRes = await addUserToOrganization(user.id, org.id);
         if (isServiceError(addUserToOrgRes)) {
             return addUserToOrgRes;
         }
diff --git a/packages/web/src/app/onboard/components/completeOnboardingButton.tsx b/packages/web/src/app/onboard/components/completeOnboardingButton.tsx
@@ -4,7 +4,6 @@ import { useState } from "react"
 import { useRouter } from "next/navigation"
 import { Button } from "@/components/ui/button"
 import { completeOnboarding } from "@/actions"
-import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
 import { isServiceError } from "@/lib/utils"
 import { useToast } from "@/components/hooks/use-toast"
 
@@ -17,7 +16,7 @@ export function CompleteOnboardingButton() {
         setIsLoading(true)
         
         try {
-            const result = await completeOnboarding(SINGLE_TENANT_ORG_DOMAIN)
+            const result = await completeOnboarding()
             
             if (isServiceError(result)) {
                 toast({
diff --git a/packages/web/src/ee/features/analytics/actions.ts b/packages/web/src/ee/features/analytics/actions.ts
diff --git a/packages/web/src/ee/features/analytics/analyticsContent.tsx b/packages/web/src/ee/features/analytics/analyticsContent.tsx

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ export const NavigationMenu = async ({`
`33`	`33`	`throw new ServiceErrorException(repoStats);`
`34`	`34`	`}`
`35`	`35`
`36`		`- const role = isAuthenticated ? await getCurrentUserRole(domain) : null;`
	`36`	`+ const role = isAuthenticated ? await getCurrentUserRole() : null;`
`37`	`37`	`if (isServiceError(role)) {`
`38`	`38`	`throw new ServiceErrorException(role);`
`39`	`39`	`}`
`@@ -43,7 +43,7 @@ export const NavigationMenu = async ({`
`43`	`43`	`return null;`
`44`	`44`	`}`
`45`	`45`
`46`		`- const joinRequests = await getOrgAccountRequests(domain);`
	`46`	`+ const joinRequests = await getOrgAccountRequests();`
`47`	`47`	`if (isServiceError(joinRequests)) {`
`48`	`48`	`throw new ServiceErrorException(joinRequests);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:`
`52`	`52`
`53`	`53`	`const repoMetadata = repoMetadataSchema.parse(repo.metadata);`
`54`	`54`
`55`		`- const userRole = await getCurrentUserRole(SINGLE_TENANT_ORG_DOMAIN);`
	`55`	`+ const userRole = await getCurrentUserRole();`
`56`	`56`	`if (isServiceError(userRole)) {`
`57`	`57`	`throw new ServiceErrorException(userRole);`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ export default async function Layout(`
`24`	`24`	`throw new ServiceErrorException(repoStats);`
`25`	`25`	`}`
`26`	`26`
`27`		`- const userRoleInOrg = await getCurrentUserRole(domain);`
	`27`	`+ const userRoleInOrg = await getCurrentUserRole();`
`28`	`28`
`29`	`29`	`return (`
`30`	`30`	`<div className="min-h-screen flex flex-col">`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export const getSidebarNavItems = async () =>`
`70`	`70`	`withAuthV2(async ({ role }) => {`
`71`	`71`	`let numJoinRequests: number \| undefined;`
`72`	`72`	`if (role === OrgRole.OWNER) {`
`73`		`- const requests = await getOrgAccountRequests(SINGLE_TENANT_ORG_DOMAIN);`
	`73`	`+ const requests = await getOrgAccountRequests();`
`74`	`74`	`if (isServiceError(requests)) {`
`75`	`75`	`throw new ServiceErrorException(requests);`
`76`	`76`	`}`