devpush 0.0.0-stage → 1.0.0-beta.4

package/src/server/api/retention.ts

@@ -0,0 +1,33 @@
+import { sql } from 'drizzle-orm'
+import { db } from '#devpush/server/db'
+import type { AtomicStore } from '#devpush/server/db/atomic'
+
+export const API_AUDIT_RETENTION_MS = 30 * 86400_000
+const batchSize = 500
+
+// Expired idempotency records may remain longer than the guaranteed replay
+// window until maintenance runs. A maintenance run always does bounded work.
+export async function pruneApiHistory(
+  store: AtomicStore = db,
+  now = Date.now(),
+) {
+  const auditBefore = now - API_AUDIT_RETENTION_MS
+  const [idempotency, audit, accessTokens, refreshTokens] = await store.batch([
+    store.all<{ id: string }>(sql`delete from api_idempotency where id in
+      (select id from api_idempotency where expires_at <= ${now} order by expires_at limit ${batchSize}) returning id`),
+    store.all<{ id: string }>(sql`delete from api_audit where id in
+      (select id from api_audit where created_at < ${auditBefore} order by created_at limit ${batchSize}) returning id`),
+    store.all<{ id: string }>(sql`delete from oauth_access_token where id in
+      (select id from oauth_access_token where expires_at <= ${now} order by expires_at limit ${batchSize}) returning id`),
+    // Preserve revoked/rotated refresh rows until expiry: their families still
+    // need reuse detection while any token in that family can be presented.
+    store.all<{ id: string }>(sql`delete from oauth_refresh_token where id in
+      (select id from oauth_refresh_token where expires_at <= ${now} order by expires_at limit ${batchSize}) returning id`),
+  ])
+  return {
+    idempotency: idempotency.length,
+    audit: audit.length,
+    accessTokens: accessTokens.length,
+    refreshTokens: refreshTokens.length,
+  }
+}

package/src/server/auth/access.ts

@@ -0,0 +1,109 @@
+import { eq, sql } from 'drizzle-orm'
+import { isValidAllowlistPattern } from '#devpush/lib/allowlist-schema'
+
+import { db } from '#devpush/server/db'
+import { allowlist, user } from '#devpush/server/db/schema'
+
+export { isValidAllowlistPattern } from '#devpush/lib/allowlist-schema'
+
+export async function assertEmailCanAuthenticate(
+  email: string | null | undefined,
+) {
+  const normalizedEmail = normalizeEmail(email)
+
+  if (!normalizedEmail) {
+    throw new Error('Email address is required.')
+  }
+
+  const [existingUsers, allowlisted] = await Promise.all([
+    db
+      .select({ status: user.status })
+      .from(user)
+      .where(sql`lower(${user.email}) = ${normalizedEmail}`)
+      .limit(1),
+    isEmailAllowlisted(normalizedEmail),
+  ])
+  const existingUser = existingUsers.at(0)
+
+  if (existingUser?.status === 'banned') {
+    throw new Error('This account has been banned.')
+  }
+
+  if (existingUser?.status === 'deleted') {
+    throw new Error('This account has been deleted.')
+  }
+
+  if (!allowlisted) {
+    throw new Error('This email address is not allowed to sign in.')
+  }
+}
+
+export async function assertUserCanCreateSession(userId: string) {
+  const [currentUsers, entries] = await Promise.all([
+    db
+      .select({ email: user.email, status: user.status })
+      .from(user)
+      .where(eq(user.id, userId))
+      .limit(1),
+    listAllowlistEntries(),
+  ])
+  const currentUser = currentUsers.at(0)
+
+  if (!currentUser || currentUser.status !== 'active') {
+    throw new Error('This account cannot sign in.')
+  }
+
+  if (!isEmailAllowedByEntries(currentUser.email, entries)) {
+    throw new Error('This email address is not allowed to sign in.')
+  }
+}
+
+export async function isEmailAllowlisted(email: string) {
+  const normalizedEmail = normalizeEmail(email)
+  if (!normalizedEmail) return false
+
+  return isEmailAllowedByEntries(normalizedEmail, await listAllowlistEntries())
+}
+
+function listAllowlistEntries() {
+  return db
+    .select({ type: allowlist.type, value: allowlist.value })
+    .from(allowlist)
+}
+
+function isEmailAllowedByEntries(
+  email: string,
+  entries: Array<{ type: 'domain' | 'email' | 'pattern'; value: string }>,
+) {
+  const normalizedEmail = normalizeEmail(email)
+  if (!normalizedEmail) return false
+
+  if (entries.length === 0) {
+    return true
+  }
+
+  const domain = normalizedEmail.split('@').at(1) ?? ''
+
+  return entries.some((entry) => {
+    const value = entry.value.trim().toLowerCase()
+
+    if (entry.type === 'email') {
+      return value === normalizedEmail
+    }
+
+    if (entry.type === 'domain') {
+      return value.replace(/^@/, '') === domain
+    }
+
+    try {
+      if (!isValidAllowlistPattern(entry.value)) return false
+      return new RegExp(`^(?:${entry.value})$`, 'i').test(normalizedEmail)
+    } catch {
+      return false
+    }
+  })
+}
+
+export function normalizeEmail(email: string | null | undefined) {
+  return email?.trim().toLowerCase() || null
+}

package/src/server/auth/auth-methods.ts

@@ -0,0 +1,28 @@
+import { config } from '#devpush/server/config'
+
+export type AuthMethods = {
+  email: boolean
+  github: boolean
+  google: boolean
+}
+
+export function getGitHubOAuthCredentials() {
+  const clientId = config.GITHUB_APP_CLIENT_ID
+  const clientSecret = config.GITHUB_APP_CLIENT_SECRET
+
+  if (!clientId || !clientSecret) {
+    return null
+  }
+
+  return { clientId, clientSecret }
+}
+
+export function getAuthMethods(): AuthMethods {
+  const githubCredentials = getGitHubOAuthCredentials()
+
+  return {
+    email: Boolean(config.EMAIL_FROM && config.RESEND_API_KEY),
+    github: Boolean(githubCredentials),
+    google: Boolean(config.GOOGLE_CLIENT_ID && config.GOOGLE_CLIENT_SECRET),
+  }
+}

package/src/server/auth/better-auth.ts

@@ -0,0 +1,518 @@
+import { fetchGitHub, readGitHubJson } from '#devpush/server/github/http'
+import { readProviderToken, storeProviderToken } from './provider-tokens'
+import { drizzleAdapter } from '@better-auth/drizzle-adapter'
+import { betterAuth } from 'better-auth'
+import { emailOTP } from 'better-auth/plugins/email-otp'
+import { tanstackStartCookies } from 'better-auth/tanstack-start'
+import { and, eq, gt, sql } from 'drizzle-orm'
+import { decodeJwt } from 'jose'
+import type { GithubProfile, GoogleProfile } from 'better-auth/social-providers'
+
+import {
+  getAuthMethods,
+  getGitHubOAuthCredentials,
+} from '#devpush/server/auth/auth-methods'
+import { db } from '#devpush/server/db'
+import { replacePendingIdentity } from '#devpush/server/auth/provider-identity'
+import * as schema from '#devpush/server/db/schema'
+import {
+  assertEmailCanAuthenticate,
+  assertUserCanCreateSession,
+} from '#devpush/server/auth/access'
+import {
+  sendEmailChangeEmail,
+  sendEmailVerificationEmail,
+  sendOtpEmail,
+} from '#devpush/server/email/service'
+import { config } from '#devpush/server/config'
+import { requireAuthEmailDelivery } from '#devpush/server/auth/email-delivery'
+import {
+  assertAllowedAuthEmailChange,
+  requireAllowedEmailChanges,
+} from '#devpush/server/auth/email-change'
+import { ensureUserBootstrap } from '#devpush/server/teams/service'
+import { decryptSecret, encryptSecret } from '#devpush/server/secrets/crypto'
+import { mcpOAuthPlugins } from '#devpush/server/mcp/oauth-provider'
+
+export const authMethods = getAuthMethods()
+const githubCredentials = getGitHubOAuthCredentials()
+
+type ProviderIdentity = {
+  name?: string | null
+  email?: string | null
+  username?: string | null
+  image?: string | null
+}
+
+type OAuthTokens = {
+  accessToken?: string
+  idToken?: string
+}
+
+type GitHubProfile = GithubProfile
+
+type GitHubEmail = {
+  email: string
+  primary: boolean
+  verified: boolean
+}
+
+const pendingProviderIdentityTtlMs = 5 * 60 * 1000
+
+function createAuth() {
+  return betterAuth({
+    appName: 'devpush',
+    secret: config.BETTER_AUTH_SECRET,
+    baseURL: config.BETTER_AUTH_URL,
+    basePath: '/api/auth',
+    // This server-only bridge is called directly by the MCP handler. OAuth
+    // protocol endpoints remain served by Better Auth.
+    disabledPaths: ['/mcp/verify', '/token', '/update-user'],
+    advanced: {
+      cookiePrefix: 'devpush',
+    },
+    database: drizzleAdapter(db, {
+      provider: 'sqlite',
+      schema,
+    }),
+    session: {
+      cookieCache: {
+        enabled: true,
+        maxAge: 60,
+      },
+    },
+    user: {
+      additionalFields: {
+        defaultTeamId: {
+          type: 'string',
+          required: false,
+          input: false,
+        },
+        username: {
+          type: 'string',
+          required: false,
+          input: false,
+        },
+      },
+      changeEmail: {
+        enabled: true,
+        sendChangeEmailConfirmation: async ({ newEmail, url, user }) => {
+          await sendEmailChangeEmail({
+            currentEmail: user.email,
+            newEmail,
+            verifyUrl: url,
+          })
+        },
+      },
+    },
+    emailVerification: {
+      sendVerificationEmail: async ({ url, user }) => {
+        await sendEmailVerificationEmail({
+          email: user.email,
+          verifyUrl: url,
+        })
+      },
+    },
+    databaseHooks: {
+      account: {
+        update: {
+          before: async (updatedAccount) => ({
+            data: {
+              ...updatedAccount,
+              ...(updatedAccount.idToken
+                ? { idToken: await storeProviderToken(updatedAccount.idToken) }
+                : {}),
+            },
+          }),
+        },
+        create: {
+          before: async (createdAccount) => {
+            const identity = await readPendingProviderIdentity(
+              getProviderIdentityKey(
+                createdAccount.providerId,
+                createdAccount.accountId,
+              ),
+            )
+
+            const idToken = createdAccount.idToken
+              ? await storeProviderToken(createdAccount.idToken)
+              : createdAccount.idToken
+            if (!identity) return { data: { idToken } }
+
+            return {
+              data: {
+                idToken,
+                providerAccountName: identity.name ?? undefined,
+                providerAccountEmail: identity.email ?? undefined,
+                providerAccountUsername: identity.username ?? undefined,
+                providerAccountImage: identity.image ?? undefined,
+              },
+            }
+          },
+          after: async (createdAccount) => {
+            await clearPendingProviderIdentity(
+              getProviderIdentityKey(
+                createdAccount.providerId,
+                createdAccount.accountId,
+              ),
+            )
+          },
+        },
+      },
+      session: {
+        create: {
+          before: async (createdSession) => {
+            await assertUserCanCreateSession(createdSession.userId)
+          },
+        },
+      },
+      user: {
+        update: {
+          before: async (updatedUser) => {
+            if (updatedUser.email)
+              await assertAllowedAuthEmailChange(updatedUser.email)
+          },
+        },
+        create: {
+          before: async (createdUser) => {
+            await assertEmailCanAuthenticate(createdUser.email)
+
+            return {
+              data: {
+                username: await getAvailableUsername(
+                  createdUser.name || createdUser.email,
+                ),
+              },
+            }
+          },
+          after: async (createdUser) => {
+            try {
+              await ensureUserBootstrap(createdUser.id)
+            } catch (error) {
+              console.error('Failed to bootstrap user', error)
+            }
+          },
+        },
+      },
+    },
+    socialProviders: {
+      ...(githubCredentials
+        ? {
+            github: {
+              clientId: githubCredentials.clientId,
+              clientSecret: githubCredentials.clientSecret,
+              getUserInfo: getGitHubUserInfo,
+            },
+          }
+        : {}),
+      ...(authMethods.google
+        ? {
+            google: {
+              clientId: config.GOOGLE_CLIENT_ID as string,
+              clientSecret: config.GOOGLE_CLIENT_SECRET as string,
+              getUserInfo: getGoogleUserInfo,
+            },
+          }
+        : {}),
+    },
+    account: {
+      encryptOAuthTokens: true,
+      additionalFields: {
+        providerAccountName: {
+          type: 'string',
+          required: false,
+          input: false,
+        },
+        providerAccountEmail: {
+          type: 'string',
+          required: false,
+          input: false,
+        },
+        providerAccountUsername: {
+          type: 'string',
+          required: false,
+          input: false,
+        },
+        providerAccountImage: {
+          type: 'string',
+          required: false,
+          input: false,
+        },
+      },
+      accountLinking: {
+        allowDifferentEmails: false,
+        enabled: true,
+        trustedProviders: ['github', 'google'],
+      },
+    },
+    plugins: [
+      ...mcpOAuthPlugins(),
+      requireAllowedEmailChanges(),
+      requireAuthEmailDelivery(),
+      ...(authMethods.email
+        ? [
+            emailOTP({
+              allowedAttempts: 5,
+              expiresIn: 300,
+              resendStrategy: 'reuse',
+              storeOTP: 'encrypted',
+              sendVerificationOTP: async ({ email, otp, type }) => {
+                if (type !== 'sign-in') {
+                  return
+                }
+
+                await assertEmailCanAuthenticate(email)
+                await sendOtpEmail(email, otp)
+              },
+            }),
+          ]
+        : []),
+      tanstackStartCookies(),
+    ],
+  })
+}
+
+type Auth = ReturnType<typeof createAuth>
+let initializedAuth: Auth | undefined
+// Better Auth plugin initialization may seed provider resources. Defer that I/O
+// until a request uses the auth API; Workers cannot perform it at module scope.
+export const auth = new Proxy({} as Auth, {
+  get(_target, property) {
+    const instance = (initializedAuth ??= createAuth())
+    const value: unknown = Reflect.get(instance, property, instance)
+    return typeof value === 'function' ? value.bind(instance) : value
+  },
+})
+
+function getProviderIdentityKey(providerId: string, accountId: string) {
+  return `${providerId}:${accountId}`
+}
+
+async function rememberProviderIdentity({
+  accountId,
+  providerId,
+  identity,
+}: {
+  accountId: string
+  providerId: string
+  identity: ProviderIdentity
+}) {
+  const key = getProviderIdentityKey(providerId, accountId)
+  const identifier = pendingProviderIdentityIdentifier(key)
+
+  await replacePendingIdentity(db, {
+    identifier,
+    value: encryptSecret(JSON.stringify(identity)),
+    expiresAt: new Date(Date.now() + pendingProviderIdentityTtlMs),
+  })
+}
+
+async function readPendingProviderIdentity(key: string) {
+  const identifier = pendingProviderIdentityIdentifier(key)
+  const rows = await db
+    .select({ value: schema.verification.value })
+    .from(schema.verification)
+    .where(
+      and(
+        eq(schema.verification.identifier, identifier),
+        gt(schema.verification.expiresAt, new Date()),
+      ),
+    )
+    .limit(1)
+  const value = rows[0]?.value
+
+  if (!value) {
+    return null
+  }
+
+  try {
+    const identity = JSON.parse(decryptSecret(value)) as unknown
+    return isProviderIdentity(identity) ? identity : null
+  } catch {
+    await clearPendingProviderIdentity(key)
+    return null
+  }
+}
+
+async function clearPendingProviderIdentity(key: string) {
+  await db
+    .delete(schema.verification)
+    .where(
+      eq(
+        schema.verification.identifier,
+        pendingProviderIdentityIdentifier(key),
+      ),
+    )
+}
+
+function pendingProviderIdentityIdentifier(key: string) {
+  return `devpush:provider-identity:${key}`
+}
+
+function isProviderIdentity(value: unknown): value is ProviderIdentity {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return false
+  }
+
+  return ['name', 'email', 'username', 'image'].every((field) => {
+    const item = (value as Record<string, unknown>)[field]
+    return item === undefined || item === null || typeof item === 'string'
+  })
+}
+
+export async function getGitHubUserInfo(token: OAuthTokens) {
+  if (!token.accessToken) {
+    return null
+  }
+
+  const headers = {
+    Accept: 'application/vnd.github+json',
+    Authorization: `Bearer ${token.accessToken}`,
+    'User-Agent': 'devpush',
+  }
+  const [userResponse, emailsResponse] = await Promise.all([
+    fetchGitHub('https://api.github.com/user', { headers }),
+    fetchGitHub('https://api.github.com/user/emails', { headers }),
+  ])
+
+  if (!userResponse.ok) {
+    return null
+  }
+
+  const profile = await readGitHubJson<GitHubProfile>(userResponse)
+  if (!emailsResponse.ok) return null
+  const emails = await readGitHubJson<Array<GitHubEmail | null>>(emailsResponse)
+  if (!Array.isArray(emails)) return null
+  const verified = emails.filter(
+    (candidate): candidate is GitHubEmail =>
+      candidate?.verified === true && typeof candidate.email === 'string',
+  )
+  const email = (
+    verified.find((candidate) => candidate.primary === true) ??
+    verified.find((candidate) => candidate.email === profile.email) ??
+    verified.at(0)
+  )?.email
+  if (!email) return null
+
+  await assertEmailCanAuthenticate(email)
+
+  const accountId = String(profile.id)
+
+  await rememberProviderIdentity({
+    accountId,
+    providerId: 'github',
+    identity: {
+      name: profile.name,
+      email,
+      username: profile.login,
+      image: profile.avatar_url,
+    },
+  })
+
+  return {
+    user: {
+      name: profile.name || profile.login || '',
+      email,
+      image: profile.avatar_url,
+      emailVerified: true,
+    },
+    data: profile,
+  }
+}
+
+export async function getGoogleUserInfo(token: OAuthTokens) {
+  if (!token.idToken) {
+    return null
+  }
+
+  const claims = decodeJwt(await readProviderToken(token.idToken))
+  const accountId = getStringClaim(claims.sub)
+  const email = getStringClaim(claims.email)
+  const name = getStringClaim(claims.name)
+  const image = getStringClaim(claims.picture)
+
+  if (!accountId || !email || claims.email_verified !== true) {
+    return null
+  }
+
+  await assertEmailCanAuthenticate(email)
+
+  await rememberProviderIdentity({
+    accountId,
+    providerId: 'google',
+    identity: {
+      name,
+      email,
+      username: email,
+      image,
+    },
+  })
+
+  return {
+    user: {
+      name,
+      email,
+      image,
+      emailVerified: true,
+    },
+    data: claims as unknown as GoogleProfile,
+  }
+}
+
+function getStringClaim(value: unknown) {
+  return typeof value === 'string' && value.length > 0 ? value : undefined
+}
+
+async function getAvailableUsername(value: string) {
+  const base = normalizeUsername(value)
+  const existingRows = await db
+    .select({ username: schema.user.username })
+    .from(schema.user)
+    .where(
+      and(
+        sql`lower(${schema.user.username}) = ${base}`,
+        eq(schema.user.status, 'active'),
+      ),
+    )
+    .limit(1)
+
+  if (existingRows.length === 0) {
+    return base
+  }
+
+  for (let attempt = 0; attempt < 10; attempt += 1) {
+    const suffix = crypto.randomUUID().slice(0, 8)
+    const candidate = `${base.slice(0, 41)}-${suffix}`
+    const rows = await db
+      .select({ id: schema.user.id })
+      .from(schema.user)
+      .where(
+        and(
+          eq(schema.user.username, candidate),
+          eq(schema.user.status, 'active'),
+        ),
+      )
+      .limit(1)
+
+    if (rows.length === 0) {
+      return candidate
+    }
+  }
+
+  return `user-${crypto.randomUUID().slice(0, 12)}`
+}
+
+function normalizeUsername(value: string) {
+  const username = value
+    .split('@')[0]
+    ?.toLowerCase()
+    .replace(/[\s]+/g, '-')
+    .replace(/[^a-z0-9._-]/g, '')
+    .replace(/^[._-]+|[._-]+$/g, '')
+    .slice(0, 50)
+    .replace(/[._-]+$/g, '')
+
+  return username && username.length >= 2
+    ? username
+    : `user-${crypto.randomUUID().slice(0, 12)}`
+}

package/src/server/auth/context.ts

@@ -0,0 +1,28 @@
+import { createServerFn } from '@tanstack/react-start'
+import { getAuthMethods } from '#devpush/server/auth/auth-methods'
+import { getAuthSession } from '#devpush/server/auth/session.server'
+import { getUserContext } from '#devpush/server/teams/service'
+
+export type AuthUserContext = Awaited<ReturnType<typeof getUserContext>>
+export const getLoginContext = createServerFn({ method: 'GET' }).handler(
+  async () => {
+    const session = await getAuthSession()
+
+    return {
+      authMethods: getAuthMethods(),
+      userContext: session ? await getUserContext(session.user.id) : null,
+    }
+  },
+)
+
+export const getCurrentUserContext = createServerFn({ method: 'GET' }).handler(
+  async () => {
+    const session = await getAuthSession()
+
+    if (!session) {
+      return null
+    }
+
+    return getUserContext(session.user.id)
+  },
+)