@kelpie/server 0.4.1 → 0.5.0

package/src/modules/auth/schema.ts

@@ -19,6 +19,8 @@ export const users = pgTable('users', {
   email: citext('email').notNull().unique(),
   name: text('name').notNull(),
   passwordHash: text('password_hash').notNull(),
+  /** Null until the address is verified, either by confirming a token or by accepting a workspace invite. */
+  emailVerifiedAt: moment('email_verified_at'),
   createdAt: createdAt(),
   updatedAt: updatedAt(),
 })
@@ -75,3 +77,18 @@ export const passwordResetTokens = pgTable('password_reset_tokens', {
   usedAt: moment('used_at'),
   createdAt: createdAt(),
 })
+
+/**
+ * One-shot tokens for the sign-up verification link. Same shape and the same
+ * reasoning as `passwordResetTokens`: hashed, marked used rather than deleted.
+ */
+export const emailVerificationTokens = pgTable('email_verification_tokens', {
+  id: primaryId(),
+  userId: text('user_id')
+    .notNull()
+    .references(() => users.id, { onDelete: 'cascade' }),
+  tokenHash: text('token_hash').notNull().unique(),
+  expiresAt: moment('expires_at').notNull(),
+  usedAt: moment('used_at'),
+  createdAt: createdAt(),
+})

package/src/modules/auth/service.ts

@@ -1,3 +1,4 @@
+import { APP_LINK_PATHS, buildAppLink } from '../../lib/appUrl.ts'
 import type { EmailSender } from '../../lib/email.ts'
 import { AppError } from '../../lib/errors.ts'
 import type { IdFactory } from '../../lib/ids.ts'
@@ -22,6 +23,8 @@ import * as repository from './repository.ts'
 
 const SESSION_LIFETIME_MS = 30 * 24 * 60 * 60 * 1000
 const RESET_TOKEN_LIFETIME_MS = 60 * 60 * 1000
+/** Longer than a reset token: there is no stolen-account urgency, and an inbox is checked on its own time. */
+const EMAIL_VERIFICATION_TOKEN_LIFETIME_MS = 24 * 60 * 60 * 1000
 
 export interface AuthDependencies {
   readonly db: Database
@@ -29,6 +32,8 @@ export interface AuthDependencies {
   readonly email: EmailSender
   readonly createId: IdFactory
   readonly now: () => Date
+  /** The deployment's own base URL. Every emailed link is built from it. */
+  readonly appBaseUrl: string
   /** Injected only so tests can pin tokens. Production uses the crypto default. */
   readonly newToken?: () => string
 }
@@ -37,6 +42,7 @@ export interface AccountView {
   readonly id: string
   readonly email: string
   readonly name: string
+  readonly emailVerified: boolean
 }
 
 /** A session plus the plaintext token, which exists only in this return value. */
@@ -79,7 +85,7 @@ export interface LogInInput {
 }
 
 function toAccountView(user: repository.UserRecord): AccountView {
-  return { id: user.id, email: user.email, name: user.name }
+  return { id: user.id, email: user.email, name: user.name, emailVerified: user.emailVerifiedAt !== null }
 }
 
 function toPreferenceValues(record: repository.UserPreferencesRecord): PreferenceValues {
@@ -129,9 +135,12 @@ export interface AuthService {
   listSessions(actor: SessionActor): Promise<readonly SessionView[]>
   revokeSession(actor: SessionActor, sessionId: string): Promise<void>
   /** Resolves whether or not the address is registered. */
-  requestPasswordReset(email: string, resetUrlTemplate: string): Promise<void>
+  requestPasswordReset(email: string): Promise<void>
   confirmPasswordReset(token: string, newPassword: string): Promise<void>
   changePassword(actor: SessionActor, currentPassword: string, newPassword: string): Promise<void>
+  /** Issues a fresh verification token and emails it. A no-op once already verified. */
+  requestEmailVerification(actor: SessionActor): Promise<void>
+  confirmEmailVerification(token: string): Promise<void>
 }
 
 export function createAuthService(dependencies: AuthDependencies): AuthService {
@@ -181,6 +190,16 @@ export function createAuthService(dependencies: AuthDependencies): AuthService {
     }
   }
 
+  function sendVerificationEmail(to: string, token: string): Promise<void> {
+    const link = buildAppLink(dependencies.appBaseUrl, APP_LINK_PATHS.verifyEmail, token)
+
+    return dependencies.email.send({
+      to,
+      subject: 'Verify your Kelpie email address',
+      body: `Confirm this address to finish setting up your account:\n\n${link}\n\nThe link expires in 24 hours.`,
+    })
+  }
+
   return {
     /** Creates the account only. The first workspace comes from onboarding. */
     async signUp(input: SignUpInput): Promise<IssuedSession> {
@@ -192,8 +211,10 @@ export function createAuthService(dependencies: AuthDependencies): AuthService {
 
       const email = normaliseEmail(input.email)
       const passwordHash = await hashPassword(input.password)
+      const now = dependencies.now()
+      const verificationToken = newToken()
 
-      return dependencies.transaction(async ({ tx }) => {
+      const issued = await dependencies.transaction(async ({ tx }) => {
         let user: repository.UserRecord
 
         try {
@@ -215,8 +236,20 @@ export function createAuthService(dependencies: AuthDependencies): AuthService {
           throw error
         }
 
+        await repository.insertEmailVerificationToken(tx, {
+          id: dependencies.createId('emailVerificationToken'),
+          userId: user.id,
+          tokenHash: hashToken(verificationToken),
+          expiresAt: new Date(now.getTime() + EMAIL_VERIFICATION_TOKEN_LIFETIME_MS),
+        })
+
         return issueSession(tx, user, input.device, input.location)
       })
+
+      // Sent after commit, so a rolled-back signup never emails a token.
+      await sendVerificationEmail(email, verificationToken)
+
+      return issued
     },
 
     async logIn(input: LogInInput): Promise<IssuedSession> {
@@ -367,7 +400,7 @@ export function createAuthService(dependencies: AuthDependencies): AuthService {
      * Always resolves, whether or not the address is registered. Telling a
      * stranger which addresses have accounts is the whole attack.
      */
-    async requestPasswordReset(email: string, resetUrlTemplate: string): Promise<void> {
+    async requestPasswordReset(email: string): Promise<void> {
       const user = await repository.findUserByEmail(dependencies.db, normaliseEmail(email))
 
       if (user === undefined) {
@@ -384,10 +417,12 @@ export function createAuthService(dependencies: AuthDependencies): AuthService {
         expiresAt: new Date(now.getTime() + RESET_TOKEN_LIFETIME_MS),
       })
 
+      const link = buildAppLink(dependencies.appBaseUrl, APP_LINK_PATHS.passwordReset, token)
+
       await dependencies.email.send({
         to: user.email,
         subject: 'Reset your Kelpie password',
-        body: `Use this link within the hour to choose a new password:\n\n${resetUrlTemplate.replace('{token}', token)}\n\nIf you did not ask for this, ignore it.`,
+        body: `Use this link within the hour to choose a new password:\n\n${link}\n\nIf you did not ask for this, ignore it.`,
       })
     },
 
@@ -437,5 +472,43 @@ export function createAuthService(dependencies: AuthDependencies): AuthService {
         await repository.deleteOtherSessionsForUser(tx, user.id, actor.sessionId)
       })
     },
+
+    async requestEmailVerification(actor: SessionActor): Promise<void> {
+      const user = await requireUser(actor.userId)
+
+      if (user.emailVerifiedAt !== null) {
+        return
+      }
+
+      const now = dependencies.now()
+      const token = newToken()
+
+      await repository.insertEmailVerificationToken(dependencies.db, {
+        id: dependencies.createId('emailVerificationToken'),
+        userId: user.id,
+        tokenHash: hashToken(token),
+        expiresAt: new Date(now.getTime() + EMAIL_VERIFICATION_TOKEN_LIFETIME_MS),
+      })
+
+      await sendVerificationEmail(user.email, token)
+    },
+
+    async confirmEmailVerification(token: string): Promise<void> {
+      const now = dependencies.now()
+      const record = await repository.findUsableEmailVerificationToken(
+        dependencies.db,
+        hashToken(token),
+        now,
+      )
+
+      if (record === undefined) {
+        throw AppError.unauthorized('That verification link is invalid or has expired')
+      }
+
+      await dependencies.transaction(async ({ tx }) => {
+        await repository.markEmailVerificationTokenUsed(tx, record.id, now)
+        await repository.markEmailVerified(tx, record.userId, now)
+      })
+    },
   }
 }

package/src/modules/deals/repository.ts

@@ -44,6 +44,7 @@ function companyNameMatches(pattern: string): SQL {
     select 1
     from ${companies}
     where ${companies.id} = ${deals.companyId}
+      and ${companies.workspaceId} = ${deals.workspaceId}
       and ${companies.name} ilike ${pattern}
   )`
 }

package/src/modules/decisions/repository.ts

@@ -49,12 +49,12 @@ export interface DecisionFilters {
  * away, so a candidate-targeted decision matches on body and rationale only.
  */
 const NAMED_TARGET_TABLES = [
-  { table: people, id: people.id, name: people.name },
-  { table: companies, id: companies.id, name: companies.name },
-  { table: deals, id: deals.id, name: deals.name },
-  { table: opportunities, id: opportunities.id, name: opportunities.name },
-  { table: partnerships, id: partnerships.id, name: partnerships.name },
-  { table: raises, id: raises.id, name: raises.name },
+  { table: people, id: people.id, workspaceId: people.workspaceId, name: people.name },
+  { table: companies, id: companies.id, workspaceId: companies.workspaceId, name: companies.name },
+  { table: deals, id: deals.id, workspaceId: deals.workspaceId, name: deals.name },
+  { table: opportunities, id: opportunities.id, workspaceId: opportunities.workspaceId, name: opportunities.name },
+  { table: partnerships, id: partnerships.id, workspaceId: partnerships.workspaceId, name: partnerships.name },
+  { table: raises, id: raises.id, workspaceId: raises.workspaceId, name: raises.name },
 ]
 
 /**
@@ -64,10 +64,11 @@ const NAMED_TARGET_TABLES = [
  */
 function targetNameMatches(pattern: string): SQL[] {
   return NAMED_TARGET_TABLES.map(
-    ({ table, id, name }) => sql`exists (
+    ({ table, id, workspaceId, name }) => sql`exists (
       select 1
       from ${table}
       where ${id} = ${decisions.targetId}
+        and ${workspaceId} = ${decisions.workspaceId}
         and ${name} ilike ${pattern}
     )`,
   )

package/src/modules/forms/index.ts

@@ -41,6 +41,7 @@ export function createFormsModule(migrationsDirectory: string): KelpieModule {
           createId: context.createId,
           now: context.now,
         }),
+        entitlements: context.entitlements,
       })
 
       context.schema(schema, migrationsDirectory)
@@ -50,7 +51,11 @@ export function createFormsModule(migrationsDirectory: string): KelpieModule {
       })
 
       context.publicRoutes((router) => {
-        mountPublicFormRoutes(router, { db: context.db, submissions })
+        mountPublicFormRoutes(router, {
+          db: context.db,
+          submissions,
+          entitlements: context.entitlements,
+        })
       })
 
       registerFormsTools(context.mcp, service)

package/src/modules/forms/publicRoutes.ts

@@ -4,6 +4,9 @@ import { z } from 'zod'
 import type { Database } from '../../lib/database.ts'
 import { AppError } from '../../lib/errors.ts'
 import { PUBLIC_ROUTE_PREFIX, readJsonBody, requestOrigin } from '../../lib/http.ts'
+import { requireCapability } from '../../runtime/entitlements.ts'
+import type { EntitlementRegistry } from '../../runtime/entitlements.ts'
+import { moduleCapabilityName } from '../../runtime/moduleConfig.ts'
 import { embedContentSecurityPolicy, renderEmbedPage } from './embed.ts'
 import * as repository from './repository.ts'
 import type { FormSubmitService, SubmitOutcome } from './submission.ts'
@@ -28,17 +31,20 @@ export interface PublicFormRoutesDependencies {
   /** Injected so a test can pin the value the CSP and the tags share. */
   readonly generateNonce?: () => string
   readonly submissions: FormSubmitService
+  /** The embed of a form in a workspace that has turned the module off is refused. */
+  readonly entitlements: EntitlementRegistry
 }
 
 function submitResponse(outcome: SubmitOutcome): Record<string, unknown> {
+  // The upserted record ids stay off this response on purpose. The caller is an
+  // unauthenticated website, and a Kelpie id is a ULID whose timestamp would tell
+  // that caller whether the person or company it named was already in the CRM.
+  // The service still computes them for its own events and activities; they are
+  // simply not on the wire here.
   return {
     id: outcome.submissionId,
     form_id: outcome.formId,
     submitted_at: outcome.submittedAt.toISOString(),
-    person_id: outcome.personId,
-    company_id: outcome.companyId,
-    position_id: outcome.positionId,
-    deal_id: outcome.dealId,
     // Echoed so an embed can render the confirmation without a second request
     // for a form definition it has no other reason to fetch.
     thank_you_message: outcome.thankYouMessage,
@@ -73,6 +79,10 @@ export function mountPublicFormRoutes(
       throw AppError.notFound('Form not found')
     }
 
+    // Ungated by the runtime, like the submit route: a workspace with the forms
+    // module off does not serve its embed either.
+    await requireCapability(dependencies.entitlements, form.workspaceId, moduleCapabilityName('forms'))
+
     const nonce = generateNonce()
     const page = renderEmbedPage({
       form,

package/src/modules/forms/submission.ts

@@ -1,6 +1,9 @@
 import type { Database } from '../../lib/database.ts'
 import { AppError } from '../../lib/errors.ts'
 import type { IdFactory } from '../../lib/ids.ts'
+import { requireCapability } from '../../runtime/entitlements.ts'
+import type { EntitlementRegistry } from '../../runtime/entitlements.ts'
+import { moduleCapabilityName } from '../../runtime/moduleConfig.ts'
 import type { BufferedEvents, Transaction, TransactionScope } from '../../runtime/transaction.ts'
 import type { ActivityRecorder, SystemActor } from '../activities/recorder.ts'
 import { describeCreationVia, describeFormSubmission } from '../activities/wording.ts'
@@ -85,6 +88,8 @@ export interface SubmissionDependencies {
   readonly createId: IdFactory
   readonly now: () => Date
   readonly recordActivity: ActivityRecorder
+  /** A submit into a workspace that has turned the forms module off is refused. */
+  readonly entitlements: EntitlementRegistry
 }
 
 /** What the submit created or matched. Each id is null when the rule did not apply. */
@@ -394,6 +399,11 @@ export function createFormSubmitService(dependencies: SubmissionDependencies): F
       throw AppError.notFound('Form not found')
     }
 
+    // The public surface is ungated by the runtime (`runtime/registry.ts` gates
+    // only credentialled routes), so a workspace that has turned the forms
+    // module off is refused here, the same 403 the REST surface gives.
+    await requireCapability(dependencies.entitlements, form.workspaceId, moduleCapabilityName('forms'))
+
     if (form.status === 'paused') {
       throw AppError.conflict('This form is not accepting submissions')
     }

package/src/modules/opportunities/repository.ts

@@ -43,6 +43,7 @@ function companyNameMatches(pattern: string): SQL {
     select 1
     from ${companies}
     where ${companies.id} = ${opportunities.companyId}
+      and ${companies.workspaceId} = ${opportunities.workspaceId}
       and ${companies.name} ilike ${pattern}
   )`
 }

package/src/modules/partnerships/repository.ts

@@ -46,6 +46,7 @@ function companyNameMatches(pattern: string): SQL {
     select 1
     from ${companies}
     where ${companies.id} = ${partnerships.companyId}
+      and ${companies.workspaceId} = ${partnerships.workspaceId}
       and ${companies.name} ilike ${pattern}
   )`
 }

package/src/modules/raises/repository.ts

@@ -47,6 +47,7 @@ function companyNameMatches(pattern: string): SQL {
     select 1
     from ${companies}
     where ${companies.id} = ${raises.companyId}
+      and ${companies.workspaceId} = ${raises.workspaceId}
       and ${companies.name} ilike ${pattern}
   )`
 }

package/src/modules/rate-limit/middleware.ts

@@ -39,10 +39,25 @@ const UNAUTHENTICATED_AUTH_PATHS: ReadonlySet<string> = new Set([
   '/v1/auth/login',
   '/v1/auth/password-reset',
   '/v1/auth/password-reset/confirm',
+  '/v1/auth/verify-email/confirm',
 ])
 
-function isFormSubmitRoute(context: Context): boolean {
-  return context.req.method === 'POST' && context.req.path.endsWith('/submit')
+/** The one path in the set that also carries a per-account budget. */
+const LOGIN_PATH = '/v1/auth/login'
+
+/**
+ * The public form routes that carry the forms budget: the submit POST and the
+ * embed GET. Both do database work for an unauthenticated caller, so both are
+ * metered by IP. Every other path under the public prefix passes through.
+ */
+function isMeteredFormRoute(context: Context): boolean {
+  const path = context.req.path
+
+  if (context.req.method === 'POST' && path.endsWith('/submit')) {
+    return true
+  }
+
+  return context.req.method === 'GET' && path.endsWith('/embed')
 }
 
 /** Floors `now` to the start of its fixed window, so every caller in the same window shares one row. */
@@ -51,12 +66,45 @@ function windowStart(now: Date, windowMs: number): Date {
 }
 
 /**
- * The largest configured window across all three budgets. A bucket cannot be
- * expired before its own window elapses, so this is a safe cutoff for
- * pruning regardless of which budget created the row.
+ * The largest configured window across every budget. A bucket cannot be expired
+ * before its own window elapses, so this is a safe cutoff for pruning regardless
+ * of which budget created the row. The `login-account` window is the longest by
+ * default, so leaving it out would prune a live account bucket early.
  */
 function maxWindowMs(config: RateLimitConfig): number {
-  return Math.max(config.forms.windowMs, config.auth.windowMs, config.api.windowMs)
+  return Math.max(
+    config.forms.windowMs,
+    config.auth.windowMs,
+    config.loginAccount.windowMs,
+    config.api.windowMs,
+  )
+}
+
+/**
+ * The email a login request names, normalised the way the auth service
+ * normalises it (`modules/auth/service.ts`), or undefined when the body carries
+ * no usable one.
+ *
+ * Reads the body through Hono's cache, so the login handler's own read of it
+ * later is unaffected. A malformed body resolves to undefined here and is left
+ * for the handler to reject.
+ */
+async function readLoginEmail(context: Context): Promise<string | undefined> {
+  const body: unknown = await context.req.json().catch(() => undefined)
+
+  if (typeof body !== 'object' || body === null) {
+    return undefined
+  }
+
+  const email = (body as Record<string, unknown>).email
+
+  if (typeof email !== 'string') {
+    return undefined
+  }
+
+  const normalised = email.trim().toLowerCase()
+
+  return normalised.length === 0 ? undefined : normalised
 }
 
 /**
@@ -94,17 +142,17 @@ async function enforceBudget(
 }
 
 /**
- * Guards `POST /v1/public/forms/:key/submit`, keyed by the caller's IP.
+ * Guards the public form routes that reach the database, keyed by the caller's
+ * IP: the submit `POST` and the embed `GET`.
  *
- * Mount this **after** `PUBLIC_CORS` in `app.ts`. It only recognises the
- * submit route; every other path under the public prefix, including the embed
- * page itself, passes through untouched.
+ * Mount this **after** `PUBLIC_CORS` in `app.ts`. Every other path under the
+ * public prefix passes through untouched.
  */
 export function createFormSubmitRateLimitMiddleware(
   dependencies: RateLimitMiddlewareDependencies,
 ): MiddlewareHandler {
   return async (context, next) => {
-    if (!isFormSubmitRoute(context)) {
+    if (!isMeteredFormRoute(context)) {
       await next()
       return
     }
@@ -146,6 +194,21 @@ export function createAuthAndApiRateLimitMiddleware(
         key: dependencies.resolveClientIp(context),
         budget: dependencies.config.auth,
       })
+
+      // A second budget for login, keyed on the account rather than the IP, so a
+      // distributed attack on one address is capped whatever IPs it comes from.
+      if (path === LOGIN_PATH) {
+        const email = await readLoginEmail(context)
+
+        if (email !== undefined) {
+          await enforceBudget(dependencies, context, {
+            scope: 'login-account',
+            key: email,
+            budget: dependencies.config.loginAccount,
+          })
+        }
+      }
+
       await next()
       return
     }

package/src/modules/webhooks/delivery.ts

@@ -1,6 +1,7 @@
 import { z } from 'zod'
 
 import type { Database } from '../../lib/database.ts'
+import type { EgressGuard } from '../../lib/egress.ts'
 import { describeThrown } from '../../lib/errors.ts'
 import type { IdFactory } from '../../lib/ids.ts'
 import type { Logger } from '../../lib/logger.ts'
@@ -115,11 +116,18 @@ export function sleepFor(milliseconds: number): Promise<void> {
  * The catch is broad because this is the process boundary: `fetch` rejects with
  * anything from a DNS failure to an abort, the set is open, and turning all of
  * it into one outcome is the port's whole job. Nothing is swallowed — the
- * reason reaches the log and the delivery is recorded as failed.
+ * reason reaches the log and the delivery is recorded as failed. A blocked
+ * private address (`egress.check`) reaches the same catch and is recorded the
+ * same way, as a failed attempt rather than a crash.
  */
-export function createHttpSender(fetchImplementation: typeof fetch = fetch): SendDelivery {
+export function createHttpSender(
+  egress: EgressGuard,
+  fetchImplementation: typeof fetch = fetch,
+): SendDelivery {
   return async (request) => {
     try {
+      await egress.check(request.url)
+
       const response = await fetchImplementation(request.url, {
         method: 'POST',
         body: request.body,

package/src/modules/webhooks/index.ts

@@ -1,3 +1,4 @@
+import { createEgressGuard, egressConfigSchema } from '../../lib/egress.ts'
 import { createSecretCipher, secretEncryptionConfigSchema } from '../../lib/secrets.ts'
 import type { KelpieModule } from '../../runtime/module.ts'
 import {
@@ -49,6 +50,7 @@ export function createWebhooksModule(
       // should stop boot, not prune by the wrong window.
       const cipher = createSecretCipher(context.config(secretEncryptionConfigSchema))
       const retention = context.config(deliveryRetentionConfigSchema)
+      const egress = createEgressGuard(context.config(egressConfigSchema))
 
       const service = createWebhooksService({
         db: context.db,
@@ -64,7 +66,7 @@ export function createWebhooksModule(
         createId: context.createId,
         now: context.now,
         cipher,
-        send: options.send ?? createHttpSender(),
+        send: options.send ?? createHttpSender(egress),
         sleep: options.sleep ?? sleepFor,
         retentionDays: retention.WEBHOOK_DELIVERY_RETENTION_DAYS,
         log: context.log,

package/src/modules/workspace/idempotencyMiddleware.ts

@@ -128,7 +128,23 @@ export function createIdempotencyMiddleware(dependencies: IdempotencyMiddlewareD
       return
     }
 
-    const actor = await resolveActorFrom(dependencies.credentials, context)
+    const actor = await resolveActorFrom(dependencies.credentials, context).catch((error: unknown) => {
+      if (error instanceof AppError && error.code === 'unauthorized') {
+        // No credential to scope a key to. The unauthenticated auth endpoints
+        // (`POST /v1/auth/login`, `/signup`, the reset pair) are the case: they
+        // must answer without a credential, so a key on one of them cannot 401
+        // here. They handle their own auth; idempotency does not apply.
+        return undefined
+      }
+
+      throw error
+    })
+
+    if (actor === undefined) {
+      await next()
+      return
+    }
+
     const workspaceId = actorWorkspaceId(actor)
 
     // Between signup and a first workspace (`POST /v1/workspaces`, `POST

package/src/modules/workspace/index.ts

@@ -1,3 +1,4 @@
+import { appUrlConfigSchema } from '../../lib/appUrl.ts'
 import type { KelpieModule } from '../../runtime/module.ts'
 import { parseModuleCapability } from '../../runtime/moduleConfig.ts'
 import { SEATS_LIMIT } from './capabilities.ts'
@@ -20,6 +21,8 @@ export function createWorkspaceModule(migrationsDirectory: string): KelpieModule
     structural: true,
 
     register(context) {
+      const config = context.config(appUrlConfigSchema)
+
       context.entitlements.declare(SEATS_LIMIT)
 
       // Answers `module.<id>` for whatever a config override left undecided
@@ -44,6 +47,7 @@ export function createWorkspaceModule(migrationsDirectory: string): KelpieModule
         createId: context.createId,
         now: context.now,
         entitlements: context.entitlements,
+        appBaseUrl: config.APP_BASE_URL,
         toggleableModuleIds: context.moduleCatalog
           .filter((entry) => !entry.structural)
           .map((entry) => entry.id),

package/src/modules/workspace/repository.ts

@@ -132,21 +132,28 @@ export async function deleteMember(db: Queryable, id: string): Promise<void> {
  */
 export async function countMemberReferences(
   db: Queryable,
+  workspaceId: string,
   memberId: string,
 ): Promise<readonly { readonly type: string; readonly count: number }[]> {
   const sources = [
-    { type: 'deal', table: deals, column: deals.ownerId },
-    { type: 'opportunity', table: opportunities, column: opportunities.ownerId },
-    { type: 'partnership', table: partnerships, column: partnerships.ownerId },
-    { type: 'raise', table: raises, column: raises.ownerId },
-    { type: 'plan_item', table: planItems, column: planItems.ownerId },
-    { type: 'decision', table: decisions, column: decisions.ownerId },
-    { type: 'note', table: notes, column: notes.authorId },
+    { type: 'deal', table: deals, column: deals.ownerId, workspaceId: deals.workspaceId },
+    { type: 'opportunity', table: opportunities, column: opportunities.ownerId, workspaceId: opportunities.workspaceId },
+    { type: 'partnership', table: partnerships, column: partnerships.ownerId, workspaceId: partnerships.workspaceId },
+    { type: 'raise', table: raises, column: raises.ownerId, workspaceId: raises.workspaceId },
+    { type: 'plan_item', table: planItems, column: planItems.ownerId, workspaceId: planItems.workspaceId },
+    { type: 'decision', table: decisions, column: decisions.ownerId, workspaceId: decisions.workspaceId },
+    { type: 'note', table: notes, column: notes.authorId, workspaceId: notes.workspaceId },
   ] as const
 
   const counted = await Promise.all(
     sources.map(async (source) => {
-      const [row] = await db.select({ total: count() }).from(source.table).where(eq(source.column, memberId))
+      // A member id is globally unique, so the workspace term is defence in
+      // depth rather than the thing that scopes the count. It keeps the query
+      // safe on its own instead of by that invariant.
+      const [row] = await db
+        .select({ total: count() })
+        .from(source.table)
+        .where(and(eq(source.column, memberId), eq(source.workspaceId, workspaceId)))
 
       return { type: source.type, count: row?.total ?? 0 }
     }),

package/src/modules/workspace/routes.ts

@@ -34,11 +34,6 @@ export const updateBody = z
 export const inviteBody = z.object({
   email: z.string().min(1),
   role: z.enum(INVITABLE_ROLES),
-  invite_url_template: z.string().min(1).includes('{token}'),
-})
-
-export const resendBody = z.object({
-  invite_url_template: z.string().min(1).includes('{token}'),
 })
 
 export const memberRoleBody = z.object({ role: z.enum(MEMBER_ROLES) })
@@ -187,7 +182,6 @@ export function mountWorkspaceRoutes(router: Hono, dependencies: WorkspaceRoutes
       context.req.param('id'),
       body.email,
       body.role,
-      body.invite_url_template,
     )
 
     return context.json(inviteResponse(invite), 201)
@@ -203,12 +197,10 @@ export function mountWorkspaceRoutes(router: Hono, dependencies: WorkspaceRoutes
   })
 
   router.post('/workspaces/:id/invites/:inviteId/resend', async (context) => {
-    const body = await readBody(context, resendBody)
     const invite = await dependencies.service.resendInvite(
       await requireActor(context),
       context.req.param('id'),
       context.req.param('inviteId'),
-      body.invite_url_template,
     )
 
     return context.json(inviteResponse(invite))