Foundational work for the upcoming group-scoped sharing feature.
Schema (migration 0003_groups.sql + drizzle schema):
- memory_access enum ('ro' | 'rw') reserved for Agent B's project_shares
- groups (id, oidc_iss, name, display_name, …) keyed by (oidc_iss, name)
so different IdPs can both have e.g. "platform" without colliding
- user_groups (user_id, group_id, synced_at) PK (user_id, group_id)
Auth (auth.ts + lib/auth/sync-groups.ts):
- jwt callback now syncs `profile.groups` after upserting the user
- syncUserGroupsFromClaim runs in a single tx: upserts each group,
inserts new memberships, deletes ones no longer in the claim
- missing/empty claim → user has zero groups (wipe memberships)
- EntraID GUID-vs-name edge case: we treat whatever strings the claim
emits as names verbatim; groups overage (>200 groups → no claim)
is documented as unsupported in v1
UserContext + JWT (lib/mcp/context.ts, lib/auth/jwt.ts):
- AuthenticatedClaims.groups surfaced from verified JWT payload
- UserContext.groups: string[] — live from OIDC token claim, falls
back to DB snapshot for CLI (HMAC) tokens which carry no claim
- UserContext.defaultProjectKey: optional, set from header
MCP route (app/api/mcp/route.ts):
- reads X-Project-Key header, validates against ProjectKey Zod schema,
400 on invalid; empty/missing leaves defaultProjectKey undefined
- auto-upserts the header-supplied project so first-use works without
a separate project.identify call
Tools (lib/mcp/tools.ts):
- withDefaultProject helper injects ctx.defaultProjectKey when the
caller omits `project`. Per-tool defaultScope hint avoids breaking
snippet.put (user-scope default) while making memory.write
(project-scope default) honor the header
- applied to memory.write/list/search/update and all snippet.* tools
Web UI:
- /settings/groups debug page lists current memberships with synced_at
and a clear empty state pointing at README troubleshooting
- /settings/tokens grows a "Pin to project" dropdown; selected key is
baked into the generated `claude mcp add` snippet as
`--header "X-Project-Key: <key>"`. The JWT itself stays
identity-only — pinning is purely a UX shortcut
- settings landing page links to /settings/groups
- README troubleshooting bullet covers the empty-groups path for
Authentik / EntraID / Keycloak
Refactor:
- extracted resolveProjectId + upsertProject from memory-actions.ts
into lib/projects.ts so the MCP route can reuse upsertProject
Verification:
- pnpm typecheck clean
- SKIP_ENV_VALIDATION=true pnpm build clean; /settings/groups in route table
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
105 lines
3.5 KiB
TypeScript
105 lines
3.5 KiB
TypeScript
import NextAuth from "next-auth";
|
|
import { env } from "@/lib/env";
|
|
import { db } from "@/lib/db/client";
|
|
import { users } from "@/lib/db/schema";
|
|
import { syncUserGroupsFromClaim } from "@/lib/auth/sync-groups";
|
|
|
|
/**
|
|
* NextAuth (Auth.js v5) configuration.
|
|
*
|
|
* Uses a generic OIDC provider so any compliant identity provider works —
|
|
* Authentik (the example we run in dev), EntraID, Keycloak, Okta, Auth0,
|
|
* Zitadel, etc. The provider id is "oidc", which makes the callback URL
|
|
* `/api/auth/callback/oidc`. Whichever IdP you're using needs that URL
|
|
* registered as a redirect URI on its OAuth client.
|
|
*
|
|
* We store the user's OIDC `sub` + `iss` on first sign-in, upserting a row
|
|
* in `users`. The internal user UUID lives on the JWT/session so
|
|
* downstream code never has to re-resolve it.
|
|
*/
|
|
export const { auth, handlers, signIn, signOut } = NextAuth({
|
|
providers: [
|
|
{
|
|
id: "oidc",
|
|
name: "OIDC",
|
|
type: "oidc",
|
|
issuer: env().OIDC_ISSUER,
|
|
clientId: env().OIDC_CLIENT_ID_WEB,
|
|
clientSecret: env().OIDC_CLIENT_SECRET_WEB,
|
|
},
|
|
],
|
|
secret: env().NEXTAUTH_SECRET,
|
|
session: { strategy: "jwt" },
|
|
// No custom `pages.signIn`: Auth.js serves its default provider-picker UI
|
|
// at /api/auth/signin. Setting it to that exact path causes a redirect
|
|
// loop because Auth.js redirects to the configured page → which is itself.
|
|
callbacks: {
|
|
async jwt({ token, account, profile }) {
|
|
// On first call after sign-in, `account` + `profile` are populated.
|
|
if (account && profile) {
|
|
const sub = profile.sub;
|
|
const iss = (profile.iss as string | undefined) ?? env().OIDC_ISSUER;
|
|
if (!sub) throw new Error("OIDC profile missing `sub` claim");
|
|
|
|
const row = await db
|
|
.insert(users)
|
|
.values({
|
|
oidcSub: sub,
|
|
oidcIss: iss,
|
|
email: profile.email ?? null,
|
|
name: profile.name ?? null,
|
|
picture: (profile.picture as string | undefined) ?? null,
|
|
})
|
|
.onConflictDoUpdate({
|
|
target: [users.oidcIss, users.oidcSub],
|
|
set: {
|
|
email: profile.email ?? null,
|
|
name: profile.name ?? null,
|
|
picture: (profile.picture as string | undefined) ?? null,
|
|
lastSeenAt: new Date(),
|
|
},
|
|
})
|
|
.returning({ id: users.id });
|
|
|
|
const userId = row[0]?.id;
|
|
token.userId = userId;
|
|
token.sub = sub;
|
|
token.iss = iss;
|
|
|
|
// Sync group memberships from the OIDC `groups` claim. Missing or
|
|
// empty claim is treated as "user is in zero groups" — that path
|
|
// wipes the user's existing memberships, which is the conservative
|
|
// choice (don't keep stale grants alive if the IdP stopped
|
|
// asserting them).
|
|
if (userId) {
|
|
// `profile.groups` is untyped at the next-auth boundary — coerce.
|
|
const claimGroups = (profile as { groups?: unknown }).groups;
|
|
await syncUserGroupsFromClaim(userId, iss, claimGroups);
|
|
}
|
|
}
|
|
return token;
|
|
},
|
|
async session({ session, token }) {
|
|
if (token.userId && typeof token.userId === "string") {
|
|
session.user = { ...session.user, id: token.userId };
|
|
}
|
|
return session;
|
|
},
|
|
},
|
|
});
|
|
|
|
// ---------- module augmentation: typed session.user.id ----------
|
|
|
|
declare module "next-auth" {
|
|
interface Session {
|
|
user: {
|
|
id: string;
|
|
name?: string | null;
|
|
email?: string | null;
|
|
image?: string | null;
|
|
};
|
|
}
|
|
}
|
|
|
|
export type { Session } from "next-auth";
|