@tumbaland/backend-core 1.32.0 → 1.34.0

package/dist/oauth/tokens.js

@@ -0,0 +1,79 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseScopes = exports.verifyAccessToken = exports.mintAccessToken = void 0;
+const crypto_1 = require("crypto");
+const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
+const env_1 = require("../config/env");
+const types_1 = require("../apiKeys/types");
+/**
+ * Access tokens for the OAuth flow that lets an assistant connect to Tumbaland.
+ *
+ * These are JWTs rather than database rows so the MCP server can validate one
+ * without a query on every tool call, and because OAuth expects short-lived
+ * bearer tokens with a refresh path rather than the indefinite credentials an
+ * API key is. The trade is that a token cannot be revoked before it expires —
+ * hence the deliberately short life, with revocation applied at the refresh
+ * token, which is the thing that actually persists.
+ */
+/** Marks a token as issued by the OAuth flow, for the MCP resource specifically. */
+const TOKEN_TYPE = 'mcp_access';
+/** Short enough that a leaked token is a small window, long enough to be usable. */
+const ACCESS_TOKEN_TTL_SECONDS = 60 * 60;
+const mintAccessToken = (input) => {
+    const scope = input.scopes.join(' ');
+    const accessToken = jsonwebtoken_1.default.sign({
+        sub: input.userId,
+        aud: input.resource,
+        iss: input.issuer,
+        scope,
+        groupId: input.groupId,
+        email: input.email,
+        name: input.name,
+        typ: TOKEN_TYPE,
+        jti: (0, crypto_1.randomUUID)()
+    }, (0, env_1.requireEnv)('JWT_SECRET'), { expiresIn: ACCESS_TOKEN_TTL_SECONDS });
+    return { accessToken, expiresIn: ACCESS_TOKEN_TTL_SECONDS, scope };
+};
+exports.mintAccessToken = mintAccessToken;
+/**
+ * Check a bearer token presented to the MCP server.
+ *
+ * Two checks beyond the signature carry real weight. The audience must match
+ * this server: a token minted for one resource must not work against another,
+ * which is what RFC 8707 binding is for and what stops a token obtained for
+ * somewhere else being replayed here. And the type must be `mcp_access`, so an
+ * ordinary session JWT — same secret, same issuer, but no scopes and no tenant
+ * pin — cannot be presented as an access token and quietly get everything.
+ */
+const verifyAccessToken = (token, expectedAudience) => {
+    let claims;
+    try {
+        claims = jsonwebtoken_1.default.verify(token, (0, env_1.requireEnv)('JWT_SECRET'));
+    }
+    catch (error) {
+        const expired = error?.name === 'TokenExpiredError';
+        return { ok: false, rejection: expired ? 'expired' : 'bad-signature' };
+    }
+    if (claims.typ !== TOKEN_TYPE)
+        return { ok: false, rejection: 'wrong-type' };
+    if (claims.aud !== expectedAudience)
+        return { ok: false, rejection: 'wrong-audience' };
+    if (!claims.sub)
+        return { ok: false, rejection: 'malformed' };
+    return {
+        ok: true,
+        userId: claims.sub,
+        email: claims.email ?? '',
+        name: claims.name ?? '',
+        scopes: (claims.scope ?? '').split(' ').filter(types_1.isApiKeyScope),
+        groupId: claims.groupId ?? null
+    };
+};
+exports.verifyAccessToken = verifyAccessToken;
+/** Parse a space-separated `scope` parameter, dropping anything we do not define. */
+const parseScopes = (scope) => typeof scope === 'string' ? scope.split(/\s+/).filter(types_1.isApiKeyScope) : [];
+exports.parseScopes = parseScopes;
+//# sourceMappingURL=tokens.js.map

package/dist/oauth/tokens.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/oauth/tokens.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAoC;AACpC,gEAA+B;AAC/B,uCAA2C;AAC3C,4CAAmE;AAEnE;;;;;;;;;GASG;AAEH,oFAAoF;AACpF,MAAM,UAAU,GAAG,YAAY,CAAC;AAEhC,oFAAoF;AACpF,MAAM,wBAAwB,GAAG,EAAE,GAAG,EAAE,CAAC;AAoClC,MAAM,eAAe,GAAG,CAAC,KAA2B,EAAqB,EAAE;IAChF,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErC,MAAM,WAAW,GAAG,sBAAG,CAAC,IAAI,CAC1B;QACE,GAAG,EAAE,KAAK,CAAC,MAAM;QACjB,GAAG,EAAE,KAAK,CAAC,QAAQ;QACnB,GAAG,EAAE,KAAK,CAAC,MAAM;QACjB,KAAK;QACL,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,GAAG,EAAE,UAAU;QACf,GAAG,EAAE,IAAA,mBAAU,GAAE;KAClB,EACD,IAAA,gBAAU,EAAC,YAAY,CAAC,EACxB,EAAE,SAAS,EAAE,wBAAwB,EAAE,CACxC,CAAC;IAEF,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,wBAAwB,EAAE,KAAK,EAAE,CAAC;AACrE,CAAC,CAAC;AApBW,QAAA,eAAe,mBAoB1B;AAYF;;;;;;;;;GASG;AACI,MAAM,iBAAiB,GAAG,CAC/B,KAAa,EACb,gBAAwB,EACC,EAAE;IAC3B,IAAI,MAAyB,CAAC;IAC9B,IAAI,CAAC;QACH,MAAM,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,IAAA,gBAAU,EAAC,YAAY,CAAC,CAAsB,CAAC;IAC5E,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAI,KAAe,EAAE,IAAI,KAAK,mBAAmB,CAAC;QAC/D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IACzE,CAAC;IAED,IAAI,MAAM,CAAC,GAAG,KAAK,UAAU;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;IAC7E,IAAI,MAAM,CAAC,GAAG,KAAK,gBAAgB;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;IACvF,IAAI,CAAC,MAAM,CAAC,GAAG;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IAE9D,OAAO;QACL,EAAE,EAAE,IAAI;QACR,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;QACzB,IAAI,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE;QACvB,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,qBAAa,CAAC;QAC7D,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,IAAI;KAChC,CAAC;AACJ,CAAC,CAAC;AAxBW,QAAA,iBAAiB,qBAwB5B;AAEF,qFAAqF;AAC9E,MAAM,WAAW,GAAG,CAAC,KAAc,EAAiB,EAAE,CAC3D,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;AAD/D,QAAA,WAAW,eACoD"}

package/jest.config.js

@@ -8,7 +8,17 @@ module.exports = {
     '^.+\\.ts$': ['ts-jest', { tsconfig: { types: ['jest', 'node'] } }]
   },
   coverageProvider: 'v8',
-  collectCoverageFrom: ['src/**/*.ts', '!src/**/*.test.ts', '!src/index.ts', '!src/types/**'],
+  // Barrels are excluded, not just the root one: a file of `export { x } from
+  // './y'` has no logic to test, but Jest counts every re-exported function as
+  // an uncovered one — which is what held global function coverage at ~78%
+  // while every module underneath was thoroughly tested.
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.test.ts',
+    '!src/index.ts',
+    '!src/**/index.ts',
+    '!src/types/**'
+  ],
   coverageReporters: ['text', 'json-summary'],
   coverageThreshold: { global: { statements: 90, branches: 80, functions: 90, lines: 90 } }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tumbaland/backend-core",
-  "version": "1.32.0",
+  "version": "1.34.0",
   "description": "Core shared functionality for Tumbaland backend services",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/apiKeys/ApiKey.test.ts

@@ -0,0 +1,118 @@
+import { ApiKey } from './ApiKey';
+
+/** The fields the schema insists on, so each test only varies what it is about. */
+const complete = {
+  userId: 'u1',
+  userEmail: 'u1@example.com',
+  userName: 'Tester',
+  name: 'Claude Code',
+  keyId: 'abcdef123456',
+  hash: 'a'.repeat(64),
+  sealedCiphertext: 'ct',
+  sealedIv: 'iv',
+  sealedTag: 'tag'
+};
+
+describe('required fields', () => {
+  it('accepts a complete document', () => {
+    expect(new ApiKey(complete).validateSync()).toBeUndefined();
+  });
+
+  it.each([
+    'userId',
+    'userEmail',
+    'name',
+    'keyId',
+    'hash',
+    'sealedCiphertext',
+    'sealedIv',
+    'sealedTag'
+  ])('refuses a document with no %s', (field) => {
+    const doc = new ApiKey({ ...complete, [field]: undefined });
+    expect(doc.validateSync()?.errors[field]).toBeDefined();
+  });
+
+  it('will not store a key without the material needed to verify it', () => {
+    // A record missing its digest could never authenticate anything, and one
+    // missing the sealed copy could never be revealed — both are corruption,
+    // not a valid state.
+    const doc = new ApiKey({ ...complete, hash: undefined, sealedCiphertext: undefined });
+    const err = doc.validateSync();
+
+    expect(err?.errors.hash).toBeDefined();
+    expect(err?.errors.sealedCiphertext).toBeDefined();
+  });
+});
+
+describe('defaults', () => {
+  it('treats an unpinned key as personal rather than as unset', () => {
+    // `null` and "nobody set this" must not be distinguishable downstream: the
+    // middleware reads a null groupId as the owner's personal scope.
+    expect(new ApiKey(complete).groupId).toBeNull();
+  });
+
+  it('starts with no scopes, so a key grants nothing until asked', () => {
+    expect(new ApiKey(complete).scopes).toEqual([]);
+  });
+
+  it('starts the reveal counter at zero', () => {
+    expect(new ApiKey(complete).revealCount).toBe(0);
+  });
+
+  it('leaves the lifecycle timestamps unset', () => {
+    const doc = new ApiKey(complete);
+
+    expect(doc.lastUsedAt).toBeUndefined();
+    expect(doc.expiresAt).toBeUndefined();
+    expect(doc.revokedAt).toBeUndefined();
+    expect(doc.lastRevealedAt).toBeUndefined();
+  });
+});
+
+describe('name', () => {
+  it('trims surrounding whitespace', () => {
+    expect(new ApiKey({ ...complete, name: '  Claude  ' }).name).toBe('Claude');
+  });
+
+  it('caps the length so a listing stays readable', () => {
+    const doc = new ApiKey({ ...complete, name: 'x'.repeat(61) });
+    expect(doc.validateSync()?.errors.name).toBeDefined();
+  });
+
+  it('accepts a name at the cap', () => {
+    const doc = new ApiKey({ ...complete, name: 'x'.repeat(60) });
+    expect(doc.validateSync()?.errors.name).toBeUndefined();
+  });
+});
+
+describe('indexes', () => {
+  const indexes = ApiKey.schema.indexes().map(([fields]) => fields);
+
+  it('indexes keyId, which every verification looks a key up by', () => {
+    const path = ApiKey.schema.path('keyId') as unknown as { options: Record<string, unknown> };
+    expect(path.options.index).toBe(true);
+    expect(path.options.unique).toBe(true);
+  });
+
+  it('indexes a user’s keys newest first, matching how the listing reads them', () => {
+    expect(indexes).toContainEqual({ userId: 1, createdAt: -1 });
+  });
+});
+
+describe('collection', () => {
+  it('lives in api_keys', () => {
+    // Named explicitly rather than pluralised by Mongoose, so the collection a
+    // migration or a manual query targets is not a guess.
+    expect(ApiKey.collection.collectionName).toBe('api_keys');
+  });
+});
+
+describe('model registration', () => {
+  it('reuses the compiled model instead of redefining it', () => {
+    // backend-core is imported by every service, and some import it more than
+    // once through different paths; recompiling would throw OverwriteModelError.
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const again = require('./ApiKey').ApiKey;
+    expect(again).toBe(ApiKey);
+  });
+});

package/src/apiKeys/index.test.ts

@@ -0,0 +1,72 @@
+import * as core from '../index';
+import * as apiKeys from './index';
+
+/**
+ * The package's public surface, as the services actually consume it.
+ *
+ * Services install this lib from npm, so an export dropped in a refactor does
+ * not fail here — it fails inside a Docker build as "has no exported member X",
+ * against a registry that genuinely has the code. That is a slow and confusing
+ * loop, and it is entirely preventable by naming the surface once.
+ */
+const PUBLIC_SURFACE = [
+  // middleware the services mount
+  'authenticateAgent',
+  'requireScope',
+  'denyApiKeys',
+  // key lifecycle, used by auth-service
+  'createApiKey',
+  'listApiKeys',
+  'revealApiKey',
+  'revokeApiKey',
+  'deleteApiKey',
+  'verifyApiKey',
+  // configuration and vocabulary
+  'isEncryptionConfigured',
+  'API_KEY_SCOPES',
+  'isApiKeyScope',
+  'ApiKey',
+  // helpers
+  'looksLikeApiKey',
+  'displayPrefix',
+  'resetEncryptionKeyCache'
+] as const;
+
+describe('the apiKeys barrel', () => {
+  it.each(PUBLIC_SURFACE)('exports %s', (name) => {
+    expect(apiKeys).toHaveProperty(name);
+    expect((apiKeys as Record<string, unknown>)[name]).toBeDefined();
+  });
+});
+
+describe('the package root', () => {
+  it.each(PUBLIC_SURFACE)('re-exports %s, which is how services import it', (name) => {
+    expect((core as Record<string, unknown>)[name]).toBeDefined();
+  });
+
+  it('exposes the same binding through both paths', () => {
+    for (const name of PUBLIC_SURFACE) {
+      expect((core as Record<string, unknown>)[name]).toBe((apiKeys as Record<string, unknown>)[name]);
+    }
+  });
+
+  it('still exports the session middleware the key work sits alongside', () => {
+    // `authenticateToken` stays JWT-only and is what auth-service and
+    // payment-service rely on to refuse keys outright.
+    expect(core.authenticateToken).toBeDefined();
+    expect(core.optionalAuth).toBeDefined();
+  });
+});
+
+describe('the scope vocabulary', () => {
+  it('is the same list the services and the UI are written against', () => {
+    expect([...core.API_KEY_SCOPES]).toEqual([
+      'relationship:read',
+      'relationship:write',
+      'album:read',
+      'album:write',
+      'finance:read',
+      'finance:write'
+    ]);
+  });
+});

package/src/apiKeys/middleware.test.ts

@@ -8,7 +8,7 @@ jest.mock('../logging/logger', () => ({
 
 import jwt from 'jsonwebtoken';
 import { verifyApiKey } from './service';
-import { authenticateAgent, denyApiKeys } from './middleware';
+import { authenticateAgent, requireScope, denyApiKeys } from './middleware';
 
 const mockedVerify = verifyApiKey as jest.Mock;
 const ORIGINAL_ENV = process.env;
@@ -157,6 +157,37 @@ describe('authenticateAgent — API keys', () => {
   });
 });
 
+it('authenticates a key stored before the owner snapshot existed', async () => {
+  // Records written by an earlier version carry no userEmail/userName. Such a
+  // key must still work — the id is what every handler actually reads — rather
+  // than 500 on a missing field.
+  mockedVerify.mockResolvedValue({
+    ok: true,
+    userId: 'u1',
+    keyId: 'k1',
+    scopes: ['relationship:read'],
+    groupId: null
+  });
+  const request = withKey();
+  const next = jest.fn();
+
+  await authenticateAgent('relationship:read')(request, mockRes(), next);
+
+  expect(next).toHaveBeenCalled();
+  expect(request.user).toEqual({ id: 'u1', email: '', name: '' });
+});
+
+it('treats a verification result with no scopes as granting nothing', async () => {
+  mockedVerify.mockResolvedValue({ ok: true, userId: 'u1', keyId: 'k1', groupId: null });
+  const res = mockRes();
+  const next = jest.fn();
+
+  await authenticateAgent('relationship:read')(withKey(), res, next);
+
+  expect(res.status).toHaveBeenCalledWith(403);
+  expect(next).not.toHaveBeenCalled();
+});
+
 describe('authenticateAgent — tenant pinning', () => {
   it('grants a personal key no groups at all', async () => {
     mockedVerify.mockResolvedValue(okVerification({ groupId: null }));
@@ -231,6 +262,74 @@ describe('authenticateAgent — tenant pinning', () => {
   });
 });
 
+describe('requireScope', () => {
+  const keyReq = (scopes: string[]) =>
+    req({ apiKey: { keyId: 'k1', scopes, groupId: null } } as Partial<Request>);
+
+  it('lets a session through unconditionally', () => {
+    // Scopes narrow what software may do on a person's behalf, not what the
+    // person may do themselves — a session carries no apiKey context at all.
+    const next = jest.fn();
+    requireScope('relationship:write')(req(), mockRes(), next);
+    expect(next).toHaveBeenCalled();
+  });
+
+  it('lets a key with the required scope through', () => {
+    const next = jest.fn();
+    requireScope('relationship:read')(keyReq(['relationship:read']), mockRes(), next);
+    expect(next).toHaveBeenCalled();
+  });
+
+  it('refuses a key without it, naming what is missing', () => {
+    const res = mockRes();
+    const next = jest.fn();
+
+    requireScope('relationship:write')(keyReq(['relationship:read']), res, next);
+
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenCalledWith(
+      expect.objectContaining({ message: expect.stringContaining('relationship:write') })
+    );
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it('does not let a read scope stand in for a write', () => {
+    const next = jest.fn();
+    requireScope('album:write')(keyReq(['album:read']), mockRes(), next);
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it('does not let one area’s scope stand in for another’s', () => {
+    const next = jest.fn();
+    requireScope('finance:read')(keyReq(['relationship:read', 'album:read']), mockRes(), next);
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it('requires every named scope, not just one of them', () => {
+    const res = mockRes();
+    const next = jest.fn();
+
+    requireScope('relationship:read', 'album:write')(keyReq(['relationship:read']), res, next);
+
+    expect(next).not.toHaveBeenCalled();
+    expect(res.json).toHaveBeenCalledWith(
+      expect.objectContaining({ message: expect.stringContaining('album:write') })
+    );
+  });
+
+  it('refuses a key with no scopes at all', () => {
+    const next = jest.fn();
+    requireScope('relationship:read')(keyReq([]), mockRes(), next);
+    expect(next).not.toHaveBeenCalled();
+  });
+
+  it('lets any authenticated caller through when no scope is named', () => {
+    const next = jest.fn();
+    requireScope()(keyReq([]), mockRes(), next);
+    expect(next).toHaveBeenCalled();
+  });
+});
+
 describe('denyApiKeys', () => {
   it('lets a session through', () => {
     const next = jest.fn();

package/src/apiKeys/types.test.ts

@@ -0,0 +1,41 @@
+import { API_KEY_SCOPES, isApiKeyScope } from './types';
+
+describe('API_KEY_SCOPES', () => {
+  it('has no duplicates', () => {
+    expect(new Set(API_KEY_SCOPES).size).toBe(API_KEY_SCOPES.length);
+  });
+
+  it('offers a read and a write for every area it covers', () => {
+    for (const area of ['relationship', 'album', 'finance']) {
+      expect(API_KEY_SCOPES).toContain(`${area}:read`);
+      expect(API_KEY_SCOPES).toContain(`${area}:write`);
+    }
+  });
+
+  it('grants nothing over auth or payment, which stay a person’s to do', () => {
+    // A key that could mint keys could not be revoked, and one that could change
+    // a subscription has no ceiling on what it can cost.
+    for (const scope of API_KEY_SCOPES) {
+      expect(scope.startsWith('auth:')).toBe(false);
+      expect(scope.startsWith('payment:')).toBe(false);
+    }
+  });
+});
+
+describe('isApiKeyScope', () => {
+  it.each([...API_KEY_SCOPES])('accepts %s', (scope) => {
+    expect(isApiKeyScope(scope)).toBe(true);
+  });
+
+  it.each([
+    ['an invented area', 'admin:everything'],
+    ['an invented verb', 'relationship:delete'],
+    ['a bare area', 'relationship'],
+    ['an empty string', ''],
+    ['a non-string', 42],
+    ['null', null],
+    ['undefined', undefined]
+  ])('rejects %s', (_label, value) => {
+    expect(isApiKeyScope(value)).toBe(false);
+  });
+});

package/src/index.ts

@@ -33,6 +33,9 @@ export * from './groups';
 // API keys (non-browser clients: MCP servers, scripts, agents)
 export * from './apiKeys';
 
+// OAuth 2.1 authorization server, for assistants connecting over MCP
+export * from './oauth';
+
 // Middleware
 export { authenticateToken, optionalAuth } from './middleware/authMiddleware';
 export {

package/src/oauth/index.ts

@@ -0,0 +1,23 @@
+export { OAuthClient, AuthorizationCode, RefreshToken } from './models';
+export type { IOAuthClient, IAuthorizationCode, IRefreshToken } from './models';
+export {
+  registerClient,
+  findClient,
+  isRegisteredRedirect,
+  issueAuthorizationCode,
+  redeemAuthorizationCode,
+  issueRefreshToken,
+  redeemRefreshToken,
+  revokeRefreshTokensForUser,
+  listConnections
+} from './service';
+export type {
+  RegisterClientInput,
+  RegisteredClient,
+  IssueCodeInput,
+  CodeRedemption,
+  CodeRejection,
+  RefreshRedemption
+} from './service';
+export { mintAccessToken, verifyAccessToken, parseScopes } from './tokens';
+export type { AccessTokenClaims, MintAccessTokenInput, MintedAccessToken, AccessTokenVerification } from './tokens';

package/src/oauth/models.ts

@@ -0,0 +1,134 @@
+import mongoose, { Document, Schema } from 'mongoose';
+
+/**
+ * A client registered through RFC 7591 Dynamic Client Registration.
+ *
+ * Assistants register themselves — nobody is going to pre-provision Claude,
+ * ChatGPT and Gemini by hand, and the MCP spec expects a server to accept
+ * registrations. Clients are public (no secret): the caller is a browser-driven
+ * flow that cannot keep one, which is exactly why PKCE is mandatory here.
+ */
+export interface IOAuthClient extends Document {
+  clientId: string;
+  clientName: string;
+  redirectUris: string[];
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+const OAuthClientSchema = new Schema<IOAuthClient>(
+  {
+    clientId: { type: String, required: true, unique: true, index: true },
+    clientName: { type: String, required: true, maxlength: 200 },
+    redirectUris: { type: [String], required: true }
+  },
+  { timestamps: true, collection: 'oauth_clients' }
+);
+
+export const OAuthClient = mongoose.models.OAuthClient
+  ? (mongoose.models.OAuthClient as mongoose.Model<IOAuthClient>)
+  : mongoose.model<IOAuthClient>('OAuthClient', OAuthClientSchema);
+
+/**
+ * A one-time authorization code, alive for the seconds between the user
+ * approving and the client exchanging it.
+ *
+ * Everything the token will assert is fixed here, at the moment consent is
+ * given: which scopes, which tenant, which resource. The exchange cannot widen
+ * any of it, so a client that asks for more at the token endpoint than the user
+ * agreed to gets what the user agreed to.
+ */
+export interface IAuthorizationCode extends Document {
+  code: string;
+  clientId: string;
+  userId: string;
+  userEmail: string;
+  userName: string;
+  redirectUri: string;
+  scopes: string[];
+  groupId: string | null;
+  /** RFC 8707: the MCP server this will be minted for */
+  resource: string;
+  /** PKCE, always S256 — the spec does not allow `plain` */
+  codeChallenge: string;
+  /** set once the code is exchanged, so a replay is detectable rather than silent */
+  usedAt?: Date;
+  expiresAt: Date;
+  createdAt: Date;
+}
+
+const AuthorizationCodeSchema = new Schema<IAuthorizationCode>(
+  {
+    code: { type: String, required: true, unique: true, index: true },
+    clientId: { type: String, required: true },
+    userId: { type: String, required: true },
+    userEmail: { type: String, required: true },
+    userName: { type: String, default: '' },
+    redirectUri: { type: String, required: true },
+    scopes: { type: [String], default: [] },
+    groupId: { type: String, default: null },
+    resource: { type: String, required: true },
+    codeChallenge: { type: String, required: true },
+    usedAt: { type: Date },
+    expiresAt: { type: Date, required: true }
+  },
+  { timestamps: { createdAt: true, updatedAt: false }, collection: 'oauth_authorization_codes' }
+);
+
+// Codes are short-lived and never read after expiry; let Mongo sweep them so a
+// replay cannot be attempted against a record nobody is cleaning up.
+AuthorizationCodeSchema.index({ expiresAt: 1 }, { expireAfterSeconds: 0 });
+
+export const AuthorizationCode = mongoose.models.AuthorizationCode
+  ? (mongoose.models.AuthorizationCode as mongoose.Model<IAuthorizationCode>)
+  : mongoose.model<IAuthorizationCode>('AuthorizationCode', AuthorizationCodeSchema);
+
+/**
+ * A refresh token: the part that actually persists, and therefore the part
+ * revocation acts on.
+ *
+ * Access tokens are unrevokable JWTs by design, kept short so that matters
+ * little. Cutting off an assistant means deleting its refresh token, after
+ * which it can obtain nothing new.
+ */
+export interface IRefreshToken extends Document {
+  tokenHash: string;
+  clientId: string;
+  userId: string;
+  scopes: string[];
+  groupId: string | null;
+  resource: string;
+  /**
+   * When the user actually connected this assistant.
+   *
+   * Distinct from `createdAt`, which rotation resets on every refresh — showing
+   * that in the UI would tell someone they connected Claude an hour ago when
+   * they did it in March.
+   */
+  grantedAt: Date;
+  revokedAt?: Date;
+  lastUsedAt?: Date;
+  createdAt: Date;
+  updatedAt: Date;
+}
+
+const RefreshTokenSchema = new Schema<IRefreshToken>(
+  {
+    tokenHash: { type: String, required: true, unique: true, index: true },
+    clientId: { type: String, required: true },
+    userId: { type: String, required: true, index: true },
+    scopes: { type: [String], default: [] },
+    groupId: { type: String, default: null },
+    resource: { type: String, required: true },
+    grantedAt: { type: Date, default: Date.now },
+    revokedAt: { type: Date },
+    lastUsedAt: { type: Date }
+  },
+  { timestamps: true, collection: 'oauth_refresh_tokens' }
+);
+
+RefreshTokenSchema.index({ userId: 1, createdAt: -1 });
+
+export const RefreshToken = mongoose.models.RefreshToken
+  ? (mongoose.models.RefreshToken as mongoose.Model<IRefreshToken>)
+  : mongoose.model<IRefreshToken>('RefreshToken', RefreshTokenSchema);