feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e 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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

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 \u003e 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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

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

feat(web): JWT session versioning and credential revocation on org removal#1168

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
May 4, 2026
Merged

feat(web): JWT session versioning and credential revocation on org removal #1168

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
278ccee
feat(web): JWT session versioning and credential revocation on org re…
brendan-kellam May 2, 2026
5b9b3ed
chore: add changelog entry for #1168
brendan-kellam May 2, 2026
2d30110
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 2, 2026
10836de
Merge branch 'main' into brendan/jwt-versioning
brendan-kellam May 4, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Added
- [EE] Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added three new audit actions covering the full org membership lifecycle: `org.member_added`, `org.member_removed`, and `org.member_left`. [#1165](https://github.com/sourcebot-dev/sourcebot/pull/1165)
- Added per-user JWT session versioning so admin-driven member removals (and voluntary leaves) invalidate the removed user's active JWT cookies, personal API keys, and OAuth tokens atomically on their next request. [#1168](https://github.com/sourcebot-dev/sourcebot/pull/1168)

## [4.17.0] - 2026-04-30

Expand Down
2 changes: 2 additions & 0 deletions packages/db/prisma/migrations/20260501170139_add_user_session_version/migration.sql
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE "User" ADD COLUMN "sessionVersion" INTEGER NOT NULL DEFAULT 0;
5 changes: 5 additions & 0 deletions packages/db/prisma/schema.prisma
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,6 +375,11 @@ model User {
oauthAuthCodes OAuthAuthorizationCode[]
oauthRefreshTokens OAuthRefreshToken[]

/// Per-user JWT version. Incremented to invalidate every active session for
/// this user on their next request. Compared against the `sessionVersion`
/// claim baked into the JWT cookie at mint time.
sessionVersion Int @default(0)

createdAt DateTime @default(now())
updatedAt DateTime @updatedAt

Expand Down
1 change: 1 addition & 0 deletions packages/web/src/__mocks__/prisma.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ export const MOCK_USER_WITH_ACCOUNTS: User & { accounts: Account[] } = {
hashedPassword: null,
emailVerified: null,
image: null,
sessionVersion: 0,
accounts: [],
}

Expand Down
48 changes: 46 additions & 2 deletions packages/web/src/auth.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import 'next-auth/jwt';
import NextAuth, { DefaultSession, User as AuthJsUser } from "next-auth"
import { cache } from "react";
import NextAuth, { DefaultSession, Session, User as AuthJsUser } from "next-auth"
import Credentials from "next-auth/providers/credentials"
import EmailProvider from "next-auth/providers/nodemailer";
import { __unsafePrisma } from "@/prisma";
Expand DownExpand Up@@ -38,12 +39,17 @@ export type SessionUser = {
declare module 'next-auth' {
interface Session {
user: SessionUser;
sessionVersion?: number;
}
interface User {
sessionVersion?: number;
}
}

declare module 'next-auth/jwt' {
interface JWT {
userId: string;
sessionVersion?: number;
}
}

Expand DownExpand Up@@ -113,6 +119,7 @@ export const getProviders = () => {
const authJsUser: AuthJsUser = {
id: newUser.id,
email: newUser.email,
sessionVersion: newUser.sessionVersion,
}

onCreateUser({ user: authJsUser });
Expand All@@ -133,6 +140,7 @@ export const getProviders = () => {
email: user.email,
name: user.name ?? undefined,
image: user.image ?? undefined,
sessionVersion: user.sessionVersion,
};
}
}
Expand All@@ -143,7 +151,7 @@ export const getProviders = () => {
return providers;
}

export const { handlers, signIn, signOut, auth } = NextAuth({
const nextAuthResult = NextAuth({
secret: env.AUTH_SECRET,
adapter: EncryptedPrismaAdapter(__unsafePrisma),
session: {
Expand DownExpand Up@@ -248,6 +256,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Cache the userId in the JWT for later use.
if (user) {
token.userId = user.id;
token.sessionVersion = user.sessionVersion ?? 0;
}

// @note The following performs a lazy migration of the issuerUrl
Expand DownExpand Up@@ -288,6 +297,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
// Propagate the userId to the session.
id: token.userId,
}
session.sessionVersion = token.sessionVersion;

return session;
},
Expand All@@ -300,6 +310,40 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
}
});

export const { handlers, signIn, signOut } = nextAuthResult;

/**
* Wrapped session resolver that enforces JWT versioning at the auth layer.
*
* Every JWT cookie carries the `sessionVersion` it was minted with. This
* wrapper compares it against the user's current `sessionVersion` in the
* database; if the user's version has been bumped (e.g., they were removed
* from the org), we return null so every caller of `auth()` sees the
* session as logged out.
*/
export const auth = cache(async (): Promise<Session | null> => {
const session = await nextAuthResult.auth();
if (!session) {
return null;
}

const dbUser = await __unsafePrisma.user.findUnique({
where: { id: session.user.id },
select: { sessionVersion: true },
});

if (!dbUser) {
return null;
}

const tokenVersion = session.sessionVersion ?? 0;
if (tokenVersion !== dbUser.sessionVersion) {
return null;
}

return session;
});

/**
* Returns the issuer URL for a given auth.js account
*/
Expand Down
59 changes: 59 additions & 0 deletions packages/web/src/features/userManagement/actions.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,6 +45,10 @@ export const removeMemberFromOrg = async (memberId: string): Promise<{ success:
}
}

await invalidateAllSessionsForUser(tx, memberId);
await revokeUserOAuthTokens(tx, memberId);
await revokeUserApiKeysInOrg(tx, memberId, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -95,6 +99,10 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
}
}

await invalidateAllSessionsForUser(tx, user.id);
await revokeUserOAuthTokens(tx, user.id);
await revokeUserApiKeysInOrg(tx, user.id, org.id);

await tx.userToOrg.delete({
where: {
orgId_userId: {
Expand DownExpand Up@@ -125,3 +133,54 @@ export const leaveOrg = async (): Promise<{ success: boolean } | ServiceError> =
success: true,
}
}));

/**
* Invalidates every active JWT cookie for the given user by incrementing
* their `sessionVersion`. The next request from any of their active
* sessions will compare the cookie's baked-in version against the
* (now-bumped) value on the User row, fail, and be treated as logged out.
*/
const invalidateAllSessionsForUser = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.user.update({
where: { id: userId },
data: { sessionVersion: { increment: 1 } },
});
};

const revokeUserApiKeysInOrg = async (
prisma: Prisma.TransactionClient,
userId: string,
orgId: number,
): Promise<void> => {
await prisma.apiKey.deleteMany({
where: {
createdById: userId,
orgId,
}
});
};

const revokeUserOAuthTokens = async (
prisma: Prisma.TransactionClient,
userId: string,
): Promise<void> => {
await prisma.oAuthToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthRefreshToken.deleteMany({
where: {
userId
}
});
await prisma.oAuthAuthorizationCode.deleteMany({
where: {
userId
}
});
Comment thread
brendan-kellam marked this conversation as resolved.
};

Loading