refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Apr 2, 2026
Merged

refactor(web): rename withAuthV2 to withAuth #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
285c7ed
refactor(web): rename withAuthV2 to withAuth and move to middleware/
brendan-kellam Apr 2, 2026
22d9269
fix(web): update mock paths in listCommitsApi.test.ts
brendan-kellam Apr 2, 2026
088001c
fix(web): use auth context prisma instead of global import in audit a…
brendan-kellam Apr 2, 2026
f642933
feedback
brendan-kellam Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions CLAUDE.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
// user is guaranteed to be defined
// prisma is scoped to the user
return { success: true };
})
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
// user may be undefined for anonymous access
return { success: true };
})
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
const result = await withAuthV2(async ({ org, user, prisma }) => {
const result = await withAuth(async ({ org, user, prisma }) => {
// ... your logic
return data;
});
Expand Down
78 changes: 29 additions & 49 deletions packages/web/src/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
* "Service Error Wrapper".
*
* Captures any thrown exceptions, logs them to the console and Sentry,
* and returns a generic unexpected service error.
*/
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
try {
return await fn();
} catch (e) {
Sentry.captureException(e);
logger.error(e);

if (e instanceof ServiceErrorException) {
return e.serviceError;
}

return unexpectedError(`An unexpected error occurred. Please try again later.`);
}
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
await prisma.org.update({
where: { id: org.id },
data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
}));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
const apiKey = await prisma.apiKey.findFirst({
where: {
name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
}));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
const apiKeys = await prisma.apiKey.findMany({
where: {
orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
where?: Prisma.RepoWhereInput,
take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
const repos = await prisma.repo.findMany({
where: {
orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
* Returns a set of aggregated stats about the repos in the org
*/
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
const [
// Total number of repos.
numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
const [
numberOfConnections,
numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
// @note: repo names are represented by their remote url
// on the code host. E.g.,:
// - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
}));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
return {
statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
}));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
return role;
}));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const failAuditCallback = async (error: string) => {
await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const invite = await prisma.invite.findUnique({
where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
const userWithOrgs = await prisma.user.findUnique({
where: {
id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
}));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
const invite = await prisma.invite.findUnique({
where: {
id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
}));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
const invite = await prisma.invite.findUnique({
where: {
id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
}));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
const members = await prisma.userToOrg.findMany({
where: {
orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
}));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
const invites = await prisma.invite.findMany({
where: {
orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
}));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
const requests = await prisma.accountRequest.findMany({
where: {
orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
await prisma.org.update({
where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
await prisma.org.update({
where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const failAuditCallback = async (error: string) => {
await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const request = await prisma.accountRequest.findUnique({
where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
const searchContexts = await prisma.searchContext.findMany({
where: {
orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
}));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
return await withOptionalAuthV2(async ({ org, prisma }) => {
return await withOptionalAuth(async ({ org, prisma }) => {
const repo = await prisma.repo.findUnique({
where: {
id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
return await withAuthV2(async ({ org, role, prisma }) => {
return await withAuth(async ({ org, role, prisma }) => {
return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
if (!hasAnonymousAccessEntitlement) {
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
const repo = await prisma.repo.findUnique({
where: { id: repoId },
include: {
Expand Down
7 changes: 4 additions & 3 deletions packages/web/src/app/[domain]/repos/[id]/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

const repo = await prisma.repo.findUnique({
where: {
Expand Down
6 changes: 3 additions & 3 deletions packages/web/src/app/[domain]/repos/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
const whereClause: Prisma.RepoWhereInput = {
...(search ? {
displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor(web): rename withAuthV2 to withAuth#1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

brendan-kellam
merged 4 commits into

from

Apr 2, 2026
 Merged


refactor(web): rename withAuthV2 to withAuth
#1073
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
285c7ed

refactor(web): rename withAuthV2 to withAuth and move to middleware/


brendan-kellam Apr 2, 2026
22d9269

fix(web): update mock paths in listCommitsApi.test.ts


brendan-kellam Apr 2, 2026
088001c

fix(web): use auth context prisma instead of global import in audit a…


brendan-kellam Apr 2, 2026
f642933

feedback


brendan-kellam Apr 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


20 changes: 10 additions & 10 deletions
CLAUDE.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -155,11 +155,11 @@ Server actions should be used for mutations (POST/PUT/DELETE operations), not fo

## Authentication

Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server actions and API routes.
Use `withAuth` or `withOptionalAuth` from `@/middleware/withAuth` to protect server actions and API routes.

- **`withAuthV2`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuthV2`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`).
- **`withAuth`** - Requires authentication. Returns `notAuthenticated()` if user is not logged in.
- **`withOptionalAuth`** - Allows anonymous access if the org has anonymous access enabled. `user` may be `undefined`.
- **`withMinimumOrgRole`** - Wrap inside auth context to require a minimum role (e.g., `OrgRole.OWNER`). Import from `@/middleware/withMinimumOrgRole`.

**Important:** Always use the `prisma` instance provided by the auth context. This instance has `userScopedPrismaClientExtension` applied, which enforces repository visibility rules (e.g., filtering repos based on user permissions). Do NOT import `prisma` directly from `@/prisma` in actions or routes that return data to the client.

Expand All@@ -168,19 +168,19 @@ Use `withAuthV2` or `withOptionalAuthV2` from `@/withAuthV2` to protect server a
```ts
'use server';

import { sew } from "@/actions";
import { withAuthV2 } from "@/withAuthV2";
import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";

export const myProtectedAction = async ({ id }: { id: string }) => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 // user is guaranteed to be defined
 // prisma is scoped to the user
 return { success: true };
 })
);

export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
withOptionalAuthV2(async ({ org, user, prisma }) => {
withOptionalAuth(async ({ org, user, prisma }) => {
 // user may be undefined for anonymous access
 return { success: true };
 })
Expand All@@ -192,10 +192,10 @@ export const myPublicAction = async ({ id }: { id: string }) => sew(() =>
```ts
import { serviceErrorResponse } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withAuthV2 } from "@/withAuthV2";
import { withAuth } from "@/middleware/withAuth";

export const GET = apiHandler(async (request: NextRequest) => {
 const result = await withAuthV2(async ({ org, user, prisma }) => {
 const result = await withAuth(async ({ org, user, prisma }) => {
 // ... your logic
 return data;
 });
Expand Down

78 changes: 29 additions & 49 deletions
packages/web/src/actions.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,11 +4,10 @@ import { getAuditService } from "@/ee/features/audit/factory";
import { env, getSMTPConnectionURL } from "@sourcebot/shared";
import { addUserToOrganization, orgHasAvailability } from "@/lib/authUtils";
import { ErrorCode } from "@/lib/errorCodes";
import { notFound, orgNotFound, ServiceError, ServiceErrorException, unexpectedError } from "@/lib/serviceError";
import { notFound, orgNotFound, ServiceError } from "@/lib/serviceError";
import { getOrgMetadata, isHttpError, isServiceError } from "@/lib/utils";
import { prisma } from "@/prisma";
import { render } from "@react-email/components";
import * as Sentry from '@sentry/nextjs';
import { generateApiKey, getTokenFromConfig, hashSecret } from "@sourcebot/shared";
import { ApiKey, ConnectionSyncJobStatus, OrgRole, Prisma, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db";
import { createLogger } from "@sourcebot/shared";
Expand All@@ -26,36 +25,17 @@ import JoinRequestApprovedEmail from "./emails/joinRequestApprovedEmail";
import JoinRequestSubmittedEmail from "./emails/joinRequestSubmittedEmail";
import { AGENTIC_SEARCH_TUTORIAL_DISMISSED_COOKIE_NAME, MOBILE_UNSUPPORTED_SPLASH_SCREEN_DISMISSED_COOKIE_NAME, SOURCEBOT_SUPPORT_EMAIL } from "./lib/constants";
import { ApiKeyPayload, RepositoryQuery } from "./lib/types";
import { withAuthV2, withOptionalAuthV2, withMinimumOrgRole, withAuthV2_skipOrgMembershipCheck } from "./withAuthV2";
import { withAuth, withOptionalAuth, withAuth_skipOrgMembershipCheck } from "./middleware/withAuth";
import { withMinimumOrgRole } from "./middleware/withMinimumOrgRole";
import { getBrowsePath } from "./app/[domain]/browse/hooks/utils";
import { sew } from "@/middleware/sew";

const logger = createLogger('web-actions');
const auditService = getAuditService();

/**
 * "Service Error Wrapper".
 * 
 * Captures any thrown exceptions, logs them to the console and Sentry,
 * and returns a generic unexpected service error.
 */
export const sew = async <T>(fn: () => Promise<T>): Promise<T | ServiceError> => {
 try {
 return await fn();
 } catch (e) {
 Sentry.captureException(e);
 logger.error(e);

 if (e instanceof ServiceErrorException) {
 return e.serviceError;
 }

 return unexpectedError(`An unexpected error occurred. Please try again later.`);
 }
}

////// Actions ///////
export const completeOnboarding = async (): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 await prisma.org.update({
 where: { id: org.id },
 data: {
Expand DownExpand Up@@ -122,7 +102,7 @@ export const verifyApiKey = async (apiKeyPayload: ApiKeyPayload): Promise<{ apiK


export const createApiKey = async (name: string): Promise<{ key: string } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) => {
withAuth(async ({ org, user, role, prisma }) => {
 if ((env.DISABLE_API_KEY_CREATION_FOR_NON_OWNER_USERS === 'true' || env.DISABLE_API_KEY_USAGE_FOR_NON_OWNER_USERS === 'true') && role !== OrgRole.OWNER) {
 logger.error(`API key creation is disabled for non-admin users. User ${user.id} is not an owner.`);
 return {
Expand DownExpand Up@@ -192,7 +172,7 @@ export const createApiKey = async (name: string): Promise<{ key: string } | Serv
 }));

export const deleteApiKey = async (name: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKey = await prisma.apiKey.findFirst({
 where: {
 name,
Expand DownExpand Up@@ -252,7 +232,7 @@ export const deleteApiKey = async (name: string): Promise<{ success: boolean } |
 }));

export const getUserApiKeys = async (): Promise<{ name: string; createdAt: Date; lastUsedAt: Date | null }[] | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, prisma }) => {
withAuth(async ({ org, user, prisma }) => {
 const apiKeys = await prisma.apiKey.findMany({
 where: {
 orgId: org.id,
Expand All@@ -277,7 +257,7 @@ export const getRepos = async ({
 where?: Prisma.RepoWhereInput,
 take?: number
} = {}) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const repos = await prisma.repo.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -313,7 +293,7 @@ export const getRepos = async ({
 * Returns a set of aggregated stats about the repos in the org
 */
export const getReposStats = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const [
 // Total number of repos.
 numberOfRepos,
Expand DownExpand Up@@ -364,7 +344,7 @@ export const getReposStats = async () => sew(() =>
)

export const getConnectionStats = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const [
 numberOfConnections,
 numberOfConnectionsWithFirstTimeSyncJobsInProgress,
Expand DownExpand Up@@ -400,7 +380,7 @@ export const getConnectionStats = async () => sew(() =>
);

export const getRepoInfoByName = async (repoName: string) => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 // @note: repo names are represented by their remote url
 // on the code host. E.g.,:
 // - github.com/sourcebot-dev/sourcebot
Expand DownExpand Up@@ -459,7 +439,7 @@ export const getRepoInfoByName = async (repoName: string) => sew(() =>
 }));

export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: string): Promise<{ connectionId: number } | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 if (env.EXPERIMENT_SELF_SERVE_REPO_INDEXING_ENABLED !== 'true') {
 return {
 statusCode: StatusCodes.BAD_REQUEST,
Expand DownExpand Up@@ -595,12 +575,12 @@ export const experimental_addGithubRepositoryByUrl = async (repositoryUrl: strin
 }));

export const getCurrentUserRole = async (): Promise<OrgRole | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ role }) => {
withOptionalAuth(async ({ role }) => {
 return role;
 }));

export const createInvites = async (emails: string[]): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -776,7 +756,7 @@ export const createInvites = async (emails: string[]): Promise<{ success: boolea
 ));

export const cancelInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const invite = await prisma.invite.findUnique({
 where: {
Expand All@@ -802,7 +782,7 @@ export const cancelInvite = async (inviteId: string): Promise<{ success: boolean
 ));

export const getMe = async () => sew(() =>
withAuthV2(async ({ user, prisma }) => {
withAuth(async ({ user, prisma }) => {
 const userWithOrgs = await prisma.user.findUnique({
 where: {
 id: user.id,
Expand DownExpand Up@@ -835,7 +815,7 @@ export const getMe = async () => sew(() =>
 }));

export const redeemInvite = async (inviteId: string): Promise<{ success: boolean } | ServiceError> => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -909,7 +889,7 @@ export const redeemInvite = async (inviteId: string): Promise<{ success: boolean
 }));

export const getInviteInfo = async (inviteId: string) => sew(() =>
withAuthV2_skipOrgMembershipCheck(async ({ user, prisma }) => {
withAuth_skipOrgMembershipCheck(async ({ user, prisma }) => {
 const invite = await prisma.invite.findUnique({
 where: {
 id: inviteId,
Expand DownExpand Up@@ -946,7 +926,7 @@ export const getInviteInfo = async (inviteId: string) => sew(() =>
 }));

export const getOrgMembers = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const members = await prisma.userToOrg.findMany({
 where: {
 orgId: org.id,
Expand All@@ -970,7 +950,7 @@ export const getOrgMembers = async () => sew(() =>
 }));

export const getOrgInvites = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const invites = await prisma.invite.findMany({
 where: {
 orgId: org.id,
Expand All@@ -985,7 +965,7 @@ export const getOrgInvites = async () => sew(() =>
 }));

export const getOrgAccountRequests = async () => sew(() =>
withAuthV2(async ({ org, prisma }) => {
withAuth(async ({ org, prisma }) => {
 const requests = await prisma.accountRequest.findMany({
 where: {
 orgId: org.id,
Expand DownExpand Up@@ -1122,7 +1102,7 @@ export const getMemberApprovalRequired = async (domain: string): Promise<boolean
});

export const setMemberApprovalRequired = async (required: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1137,7 +1117,7 @@ export const setMemberApprovalRequired = async (required: boolean): Promise<{ su
);

export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success: boolean } | ServiceError> => sew(async () =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 await prisma.org.update({
 where: { id: org.id },
Expand All@@ -1152,7 +1132,7 @@ export const setInviteLinkEnabled = async (enabled: boolean): Promise<{ success:
);

export const approveAccountRequest = async (requestId: string) => sew(async () =>
withAuthV2(async ({ org, user, role, prisma }) =>
withAuth(async ({ org, user, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const failAuditCallback = async (error: string) => {
 await auditService.createAudit({
Expand DownExpand Up@@ -1242,7 +1222,7 @@ export const approveAccountRequest = async (requestId: string) => sew(async () =
 ));

export const rejectAccountRequest = async (requestId: string) => sew(() =>
withAuthV2(async ({ org, role, prisma }) =>
withAuth(async ({ org, role, prisma }) =>
 withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const request = await prisma.accountRequest.findUnique({
 where: {
Expand All@@ -1268,7 +1248,7 @@ export const rejectAccountRequest = async (requestId: string) => sew(() =>


export const getSearchContexts = async () => sew(() =>
withOptionalAuthV2(async ({ org, prisma }) => {
withOptionalAuth(async ({ org, prisma }) => {
 const searchContexts = await prisma.searchContext.findMany({
 where: {
 orgId: org.id,
Expand All@@ -1287,7 +1267,7 @@ export const getSearchContexts = async () => sew(() =>
 }));

export const getRepoImage = async (repoId: number): Promise<ArrayBuffer | ServiceError> => sew(async () => {
 return await withOptionalAuthV2(async ({ org, prisma }) => {
 return await withOptionalAuth(async ({ org, prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: {
 id: repoId,
Expand DownExpand Up@@ -1383,7 +1363,7 @@ export const getAnonymousAccessStatus = async (domain: string): Promise<boolean
});

export const setAnonymousAccessStatus = async (enabled: boolean): Promise<ServiceError | boolean> => sew(async () => {
 return await withAuthV2(async ({ org, role, prisma }) => {
 return await withAuth(async ({ org, role, prisma }) => {
 return await withMinimumOrgRole(role, OrgRole.OWNER, async () => {
 const hasAnonymousAccessEntitlement = hasEntitlement("anonymous-access");
 if (!hasAnonymousAccessEntitlement) {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/askgh/[owner]/[repo]/api.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
import 'server-only';

import { sew } from '@/actions';
import { sew } from "@/middleware/sew";
import { notFound, ServiceError } from '@/lib/serviceError';
import { withOptionalAuthV2 } from '@/withAuthV2';
import { withOptionalAuth } from '@/middleware/withAuth';
import { RepoInfo } from './types';

export const getRepoInfo = async (repoId: number): Promise<RepoInfo | ServiceError> => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const repo = await prisma.repo.findUnique({
 where: { id: repoId },
 include: {
Expand Down

7 changes: 4 additions & 3 deletions
packages/web/src/app/[domain]/repos/[id]/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import { getCurrentUserRole, sew } from "@/actions"
import { getCurrentUserRole } from "@/actions"
import { sew } from "@/middleware/sew"
import { Badge } from "@/components/ui/badge"
import { Button } from "@/components/ui/button"
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card"
Expand All@@ -8,7 +9,7 @@ import { env } from "@sourcebot/shared"
import { SINGLE_TENANT_ORG_DOMAIN } from "@/lib/constants"
import { ServiceErrorException } from "@/lib/serviceError"
import { cn, getCodeHostInfoForRepo, isServiceError } from "@/lib/utils"
import { withOptionalAuthV2 } from "@/withAuthV2"
import { withOptionalAuth } from "@/middleware/withAuth"
import { getConfigSettings, repoMetadataSchema } from "@sourcebot/shared"
import { ExternalLink, Info } from "lucide-react"
import Image from "next/image"
Expand DownExpand Up@@ -190,7 +191,7 @@ export default async function RepoDetailPage({ params }: { params: Promise<{ id:
}

const getRepoWithJobs = async (repoId: number) => sew(() =>
withOptionalAuthV2(async ({ prisma, org }) => {
withOptionalAuth(async ({ prisma, org }) => {

 const repo = await prisma.repo.findUnique({
 where: {
Expand Down

6 changes: 3 additions & 3 deletions
packages/web/src/app/[domain]/repos/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
import { sew } from "@/actions";
import { sew } from "@/middleware/sew";
import { ServiceErrorException } from "@/lib/serviceError";
import { isServiceError } from "@/lib/utils";
import { withOptionalAuthV2 } from "@/withAuthV2";
import { withOptionalAuth } from "@/middleware/withAuth";
import { ReposTable } from "./components/reposTable";
import { RepoIndexingJobStatus, Prisma } from "@sourcebot/db";
import z from "zod";
Expand DownExpand Up@@ -96,7 +96,7 @@ interface GetReposParams {
}

const getRepos = async ({ skip, take, search, status, sortBy, sortOrder }: GetReposParams) => sew(() =>
withOptionalAuthV2(async ({ prisma }) => {
withOptionalAuth(async ({ prisma }) => {
 const whereClause: Prisma.RepoWhereInput = {
 ...(search ? {
 displayName: { contains: search, mode: 'insensitive' },
Expand Down
Loading
Loading