tapimo 0.6.0 → 0.7.0

package/src/apps/management/routes/billing.ts

@@ -6,6 +6,7 @@ import * as ApiKeys from '../../../ApiKeys.js'
 import * as Auth from '../../../internal/Auth.js'
 import * as BillingSettings from '../../../db/tables/billingSettings.js'
 import * as Db from '../../../db/Db.js'
+import * as EnabledBillingSources from '../../../db/tables/enabledBillingSources.js'
 import * as OpenApi from '../../../internal/OpenApi.js'
 import * as Response from '../../../internal/Response.js'
 import * as Schema from '../../../internal/Schema.js'
@@ -113,6 +114,12 @@ export namespace schema {
   /** An organization's billing state. */
   export const Billing = Schema.describe(
     z.object({
+      enabledSources: z
+        .array(z.enum(EnabledBillingSources.sources))
+        .check(
+          z.describe('Billing sources this organization may set up.'),
+          z.meta({ examples: [['stripe']] }),
+        ),
       spend: z
         .optional(
           z.object({
@@ -234,7 +241,7 @@ export namespace schema {
 }
 
 /**
- * Mounts billing routes. Reads require membership or scoped API key access; organizations without Stripe state return `none`.
+ * Mounts billing routes. Reads require membership or scoped API key access; organizations without provider state return `none`.
  */
 export function billing() {
   return new Hono<Environment>()
@@ -255,7 +262,6 @@ export function billing() {
         responses: OpenApi.responses({
           errors: {
             404: 'No accessible organization was found for this id.',
-            501: 'Billing is not configured on this deployment.',
           },
           success: { description: "The organization's billing state.", schema: schema.Billing },
         }),
@@ -276,10 +282,7 @@ export function billing() {
             message: 'Check the query parameters and try again.',
           })
 
-        const billing = c.get('billing')
-        if (!billing) return billingUnconfigured(c)
         const environment = c.req.valid('query').environment
-        if (!stripeFor(billing, environment)) return billingUnconfigured(c)
 
         try {
           return c.json(
@@ -313,7 +316,6 @@ export function billing() {
           errors: {
             403: 'Requires the owner role.',
             404: 'No accessible organization was found for this id.',
-            501: 'Billing is not configured on this deployment.',
           },
           success: {
             description: "The organization's updated billing state.",
@@ -342,10 +344,7 @@ export function billing() {
             message: 'Check the request body and try again.',
           })
 
-        const billing = c.get('billing')
-        if (!billing) return billingUnconfigured(c)
         const environment = c.req.valid('query').environment
-        if (!stripeFor(billing, environment)) return billingUnconfigured(c)
 
         const body = c.req.valid('json')
         const org = Auth.org(c)
@@ -380,7 +379,7 @@ export function billing() {
     )
     .post(
       '/v1/orgs/:orgId{org_[A-Za-z0-9_-]+}/billing/stripe/checkout',
-      Auth.policy({ apiKey: { scopes: ['management:write'] }, session: true, tmp_earlyAccess: true }), // prettier-ignore
+      Auth.policy({ apiKey: { scopes: ['management:write'] }, session: true }),
       Auth.ensureOrg({ role: 'owner' }),
       OpenApi.validate('param', schema.Params, {
         code: 'param_invalid',
@@ -395,8 +394,8 @@ export function billing() {
         responses: OpenApi.responses({
           errors: {
             403: {
-              codes: ['api_key_forbidden', 'early_access_required', 'forbidden'],
-              description: 'Requires the owner role and early access.',
+              codes: ['api_key_forbidden', 'billing_source_disabled', 'forbidden'],
+              description: 'Requires the owner role and Stripe billing enabled.',
             },
             404: 'No accessible organization was found for this id.',
             501: 'Billing is not configured on this deployment.',
@@ -413,7 +412,6 @@ export function billing() {
         if (Auth.narrowAccess) return Auth.accessError(c)
         if (Auth.narrowScope) return Auth.ensureOrgError(c)
         if (Auth.narrowOrgRole) return Auth.ensureOrgRoleError(c)
-        if (Auth.tmp_narrowEarlyAccess) return Auth.tmp_ensureEarlyAccessError(c)
         if (OpenApi.narrowValidation)
           return OpenApi.validationError(c, {
             code: 'param_invalid',
@@ -425,16 +423,19 @@ export function billing() {
             message: 'Check the query parameters and try again.',
           })
 
-        const billing = c.get('billing')
-        if (!billing) return billingUnconfigured(c)
-        const environment = c.req.valid('query').environment
-        const source = stripeFor(billing, environment)
-        if (!source) return billingUnconfigured(c)
-
-        const { client } = source
         const org = Auth.org(c)
         const db = Db.get(c.get('db'))
         try {
+          if (!(await EnabledBillingSources.isEnabled(db, { orgId: org.id, source: 'stripe' })))
+            return billingSourceDisabled(c)
+
+          const billing = c.get('billing')
+          if (!billing) return billingUnconfigured(c)
+          const environment = c.req.valid('query').environment
+          const source = stripeFor(billing, environment)
+          if (!source) return billingUnconfigured(c)
+
+          const { client } = source
           const existing = await StripeCustomers.get(db, org.id, environment)
           const customerId = existing
             ? existing.stripeCustomerId
@@ -885,7 +886,8 @@ async function billingBody(
   environment: ResourceEnvironment,
 ) {
   const db = Db.get(c.get('db'))
-  const [record, settings] = await Promise.all([
+  const [enabledSources, record, settings] = await Promise.all([
+    EnabledBillingSources.listByOrg(db, orgId),
     StripeCustomers.get(db, orgId, environment),
     BillingSettings.get(db, orgId, environment),
   ])
@@ -900,6 +902,7 @@ async function billingBody(
     since: core_Billing.periodStart(period),
   })
   return {
+    enabledSources: enabledSources.map((record) => record.source),
     spend: { amount: core_Billing.fromBaseUnits(spend), currency, period },
     ...(settings?.spendLimit != null
       ? { spendLimit: { amount: settings.spendLimit, currency, period } }
@@ -959,6 +962,14 @@ function billingNotFound(c: Context<Environment>) {
   })
 }
 
+function billingSourceDisabled(c: Context<Environment>) {
+  return Response.error(c, {
+    code: 'billing_source_disabled',
+    message: 'Stripe billing is not enabled for this organization',
+    status: 403,
+  })
+}
+
 function billingUnconfigured(c: Context<Environment>) {
   return Response.error(c, {
     code: 'billing_unconfigured',

package/src/apps/management/routes/faucet.test.ts

@@ -43,9 +43,17 @@ describe('faucet', () => {
     expect(funded.status).toBe(200)
     const result = await TestApp.json(funded, Faucet.schema.FundResponse)
     expect(result.tokens.length).toBeGreaterThan(0)
-    expect(result.tokens.every((token) => token.symbol.length > 0)).toBe(true)
-    expect(result.tokens.every((token) => BigInt(token.amount) > 0n)).toBe(true)
-    expect(result.transactionHashes).toEqual(result.tokens.map((token) => token.transactionHash))
+    expect(
+      result.tokens.every(
+        (entry) =>
+          entry.token.symbol.length > 0 &&
+          BigInt(entry.amount.baseUnits) > 0n &&
+          entry.amount.currency === entry.token.currency &&
+          entry.amount.decimals === entry.token.decimals &&
+          /^\d+(\.\d+)?$/.test(entry.amount.formatted),
+      ),
+    ).toBe(true)
+    expect(result.transactionHashes).toEqual(result.tokens.map((entry) => entry.transactionHash))
 
     const repeated = await app.request(`/v1/orgs/${org.id}/faucet`, {
       body: JSON.stringify({ address: recipient }),

package/src/apps/management/routes/faucet.ts

@@ -6,6 +6,7 @@ import * as OpenApi from '../../../internal/OpenApi.js'
 import * as RateLimit from '../../../internal/RateLimit.js'
 import * as Response from '../../../internal/Response.js'
 import * as Schema from '../../../internal/Schema.js'
+import * as Value from '../../../internal/Value.js'
 import * as Viem from '../../../internal/Viem.js'
 import type { Environment } from '../App.js'
 
@@ -14,6 +15,37 @@ const userRateLimit = { perMinute: 3 } satisfies RateLimit.Limit
 
 /** OpenAPI schemas owned by the sandbox faucet. */
 export namespace schema {
+  const Token = Schema.describe(
+    z.object({
+      address: Schema.TokenAddress.check(z.describe('The test token contract that minted funds.')),
+      currency: z
+        .string()
+        .check(z.describe('The token’s currency label.'), z.meta({ examples: ['USD'] })),
+      decimals: z
+        .number()
+        .check(
+          z.int(),
+          z.nonnegative(),
+          z.describe('The decimal places used by the token.'),
+          z.meta({ examples: [6] }),
+        ),
+      name: z
+        .string()
+        .check(z.describe('The token’s human-readable name.'), z.meta({ examples: ['Test USD'] })),
+      symbol: z.string().check(z.describe('The token’s symbol.'), z.meta({ examples: ['TUSD'] })),
+    }),
+    'A test token minted by the faucet.',
+  )
+
+  const FundedToken = Schema.describe(
+    z.object({
+      amount: Schema.TokenAmount.check(z.describe('Amount minted by the faucet.')),
+      token: Token,
+      transactionHash: Schema.Hash.check(z.describe('The transaction that minted this token.')),
+    }),
+    'One token amount minted by the faucet.',
+  )
+
   /** Faucet request body. */
   export const FundBody = Schema.describe(
     z.object({ address: Schema.Address }),
@@ -24,29 +56,7 @@ export namespace schema {
   export const FundResponse = Schema.describe(
     z.object({
       tokens: z
-        .array(
-          z.object({
-            address: Schema.TokenAddress.check(
-              z.describe('The test token contract that minted funds.'),
-            ),
-            amount: Schema.DecimalString.check(
-              z.describe('The minted amount in the token’s smallest units.'),
-            ),
-            currency: z.string().check(z.describe('The token’s currency label.')),
-            decimals: z
-              .number()
-              .check(
-                z.int(),
-                z.nonnegative(),
-                z.describe('The number of decimal places the token uses.'),
-              ),
-            name: z.string().check(z.describe('The token’s human-readable name.')),
-            symbol: z.string().check(z.describe('The token’s symbol.')),
-            transactionHash: Schema.Hash.check(
-              z.describe('The transaction that minted this token.'),
-            ),
-          }),
-        )
+        .array(FundedToken)
         .check(z.describe('The configured test tokens minted to the account.')),
       transactionHashes: z
         .array(Schema.Hash)
@@ -124,17 +134,23 @@ export function faucet() {
             const event = client.token.mint.extractEvent(receipt.logs)
             const metadata = await client.token.getMetadata({ token: event.address })
             return {
-              address: event.address,
-              amount: event.args.amount.toString(),
-              currency: metadata.currency,
-              decimals: metadata.decimals,
-              name: metadata.name,
-              symbol: metadata.symbol,
+              amount: Value.tokenAmount({
+                baseUnits: event.args.amount,
+                currency: metadata.currency,
+                decimals: metadata.decimals,
+              }),
+              token: {
+                address: event.address,
+                currency: metadata.currency,
+                decimals: metadata.decimals,
+                name: metadata.name,
+                symbol: metadata.symbol,
+              },
               transactionHash: receipt.transactionHash,
             }
           }),
         )
-        const transactionHashes = tokens.map((token) => token.transactionHash)
+        const transactionHashes = tokens.map((entry) => entry.transactionHash)
         return c.json(Response.validated(schema.FundResponse, { tokens, transactionHashes }), 200)
       } catch (cause) {
         return Response.upstream(c, cause)

package/src/apps/management/routes/invitations.test.ts

@@ -2,7 +2,6 @@ import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts'
 
 import * as App from '../App.js'
 import * as TestApp from '../../../../test/App.js'
-import * as EarlyAccess from '../../../db/tables/earlyAccess.js'
 import * as Invitations from '../../../db/tables/invitations.js'
 import * as InvitationsApp from './invitations.js'
 import * as Memberships from '../../../db/tables/memberships.js'
@@ -51,7 +50,6 @@ function createApp(
     db?: ReturnType<typeof TestApp.database>
     email?: App.Email
     kv?: { store: ReturnType<typeof TestApp.kvStore> }
-    tmp_earlyAccess?: boolean
   } = {},
 ) {
   return TestApp.create({
@@ -60,7 +58,6 @@ function createApp(
     ...(options.email ? { email: options.email } : {}),
     ...(options.kv ? { kv: options.kv } : {}),
     session: { wallet: { origin } },
-    ...(options.tmp_earlyAccess === undefined ? {} : { tmp_earlyAccess: options.tmp_earlyAccess }),
   })
 }
 
@@ -349,7 +346,6 @@ describe('invitations', () => {
     const expired = await Invitations.create(db, {
       email: 'dev@example.com',
       expiresAt: '2020-01-01T00:00:00.000Z',
-      grantsEarlyAccess: false,
       invitedBy: owner.userId,
       orgId: org.id,
       role: 'member',
@@ -512,171 +508,3 @@ describe('invitations', () => {
     )
   })
 })
-
-describe('early access stamping', () => {
-  test('does not persist a dormant gate bypass', async () => {
-    const db = TestApp.database()
-    const app = createApp({ db })
-    const owner = await session(app)
-    await Users.setEmail(db, owner.userId, 'owner@example.net')
-    const created = await app.request('/v1/orgs', json('POST', owner.cookie, { name: 'Acme' }))
-    const org = await TestApp.json(created, Orgs.schema.Organization)
-
-    const invited = await app.request(
-      `/v1/orgs/${org.id}/invitations`,
-      json('POST', owner.cookie, { email: 'owner@example.net', role: 'member' }),
-    )
-    const invitation = await TestApp.json(invited, InvitationsApp.schema.Invitation)
-
-    expect((await Invitations.get(db, invitation.id))?.grantsEarlyAccess).toBe(false)
-  })
-
-  test('stamps grants_early_access from the session inviter', async () => {
-    const db = TestApp.database()
-    const app = createApp({ db, tmp_earlyAccess: true })
-    await EarlyAccess.add(db, { createdBy: 'test', entry: 'example.org' })
-
-    // A non-early-access inviter stamps no grant.
-    const plain = await session(app)
-    const createdPlain = await app.request('/v1/orgs', json('POST', plain.cookie, { name: 'Plain' })) // prettier-ignore
-    const orgPlain = await TestApp.json(createdPlain, Orgs.schema.Organization)
-    const invitedPlain = await app.request(
-      `/v1/orgs/${orgPlain.id}/invitations`,
-      json('POST', plain.cookie, { email: 'a@example.net', role: 'member' }),
-    )
-    const invitationPlain = await TestApp.json(invitedPlain, InvitationsApp.schema.Invitation)
-    expect((await Invitations.get(db, invitationPlain.id))?.grantsEarlyAccess).toBe(false)
-
-    // An early-access inviter stamps the grant.
-    const granted = await session(app)
-    await Users.setEmail(db, granted.userId, 'owner@example.org')
-    const createdGranted = await app.request('/v1/orgs', json('POST', granted.cookie, { name: 'Granted' })) // prettier-ignore
-    const orgGranted = await TestApp.json(createdGranted, Orgs.schema.Organization)
-    const invitedGranted = await app.request(
-      `/v1/orgs/${orgGranted.id}/invitations`,
-      json('POST', granted.cookie, { email: 'b@example.net', role: 'member' }),
-    )
-    const invitationGranted = await TestApp.json(invitedGranted, InvitationsApp.schema.Invitation)
-    expect((await Invitations.get(db, invitationGranted.id))?.grantsEarlyAccess).toBe(true)
-  })
-
-  test('stamps grants_early_access true for API-key and super-admin inviters', async () => {
-    const db = TestApp.database()
-    await Organizations.create(db, { id: management.orgId, name: 'Acme' })
-    const app = createApp({
-      db,
-      tmp_earlyAccess: true,
-      kv: { store: TestApp.kvStore({ keys: [management] }) },
-    })
-
-    const viaKey = await app.request(`/v1/orgs/${management.orgId}/invitations`, {
-      body: JSON.stringify({ email: 'key@example.net', role: 'member' }),
-      headers: { 'content-type': 'application/json', 'tempo-api-key': management.token },
-      method: 'POST',
-    })
-    expect(viaKey.status).toBe(200)
-    const keyInvitation = await TestApp.json(viaKey, InvitationsApp.schema.Invitation)
-    expect((await Invitations.get(db, keyInvitation.id))?.grantsEarlyAccess).toBe(true)
-
-    const created = await app.request('/v1/orgs', {
-      body: JSON.stringify({ name: 'Provisioned' }),
-      headers: { 'content-type': 'application/json', 'tempo-api-key': secret },
-      method: 'POST',
-    })
-    const org = await TestApp.json(created, Orgs.schema.Organization)
-    const viaAdmin = await app.request(`/v1/orgs/${org.id}/invitations`, {
-      body: JSON.stringify({ email: 'admin@example.net', role: 'owner' }),
-      headers: { 'content-type': 'application/json', 'tempo-api-key': secret },
-      method: 'POST',
-    })
-    expect(viaAdmin.status).toBe(200)
-    const adminInvitation = await TestApp.json(viaAdmin, InvitationsApp.schema.Invitation)
-    expect((await Invitations.get(db, adminInvitation.id))?.grantsEarlyAccess).toBe(true)
-  })
-
-  test('re-invites upgrade the grant and never downgrade it', async () => {
-    const db = TestApp.database()
-    const app = createApp({ db, tmp_earlyAccess: true })
-    await EarlyAccess.add(db, { createdBy: 'test', entry: 'example.org' })
-    const owner = await session(app)
-    const created = await app.request('/v1/orgs', json('POST', owner.cookie, { name: 'Acme' }))
-    const org = await TestApp.json(created, Orgs.schema.Organization)
-    const admin = await session(app)
-    await Users.setEmail(db, admin.userId, 'admin@example.org')
-    await Memberships.create(db, { orgId: org.id, role: 'admin', userId: admin.userId })
-
-    const first = await app.request(
-      `/v1/orgs/${org.id}/invitations`,
-      json('POST', owner.cookie, { email: 'x@example.net', role: 'member' }),
-    )
-    const firstInvite = await TestApp.json(first, InvitationsApp.schema.Invitation)
-    expect((await Invitations.get(db, firstInvite.id))?.grantsEarlyAccess).toBe(false)
-
-    // An early-access re-invite upgrades the same pending row.
-    const second = await app.request(
-      `/v1/orgs/${org.id}/invitations`,
-      json('POST', admin.cookie, { email: 'x@example.net', role: 'member' }),
-    )
-    const secondInvite = await TestApp.json(second, InvitationsApp.schema.Invitation)
-    expect(secondInvite.id).toBe(firstInvite.id)
-    expect((await Invitations.get(db, firstInvite.id))?.grantsEarlyAccess).toBe(true)
-
-    // A later non-early-access re-invite never withdraws the grant.
-    const third = await app.request(
-      `/v1/orgs/${org.id}/invitations`,
-      json('POST', owner.cookie, { email: 'x@example.net', role: 'member' }),
-    )
-    expect(third.status).toBe(200)
-    expect((await Invitations.get(db, firstInvite.id))?.grantsEarlyAccess).toBe(true)
-  })
-
-  test('hasEarlyAccessGrant survives acceptance and expiry, dies on revoke', async () => {
-    const db = TestApp.database()
-    const app = createApp({ db, tmp_earlyAccess: true })
-    await EarlyAccess.add(db, { createdBy: 'test', entry: 'example.org' })
-    const owner = await session(app)
-    await Users.setEmail(db, owner.userId, 'owner@example.org')
-    const created = await app.request('/v1/orgs', json('POST', owner.cookie, { name: 'Acme' }))
-    const org = await TestApp.json(created, Orgs.schema.Organization)
-
-    // Acceptance settles the invitation but keeps the grant.
-    const invited = await app.request(
-      `/v1/orgs/${org.id}/invitations`,
-      json('POST', owner.cookie, { email: 'z@example.net', role: 'member' }),
-    )
-    const invitation = await TestApp.json(invited, InvitationsApp.schema.Invitation)
-    const invitee = await session(app)
-    await Users.setEmail(db, invitee.userId, 'z@example.net')
-    const accepted = await app.request(`/v1/invitations/${invitation.id}/accept`, {
-      headers: { cookie: invitee.cookie },
-      method: 'POST',
-    })
-    expect(accepted.status).toBe(200)
-    expect(await Invitations.hasEarlyAccessGrant(db, 'z@example.net')).toBe(true)
-
-    // Expiry is ignored by the grant lookup.
-    await Invitations.create(db, {
-      email: 'e@example.net',
-      expiresAt: '2020-01-01T00:00:00.000Z',
-      grantsEarlyAccess: true,
-      invitedBy: owner.userId,
-      orgId: org.id,
-      role: 'member',
-    })
-    expect(await Invitations.hasEarlyAccessGrant(db, 'e@example.net')).toBe(true)
-
-    // Revocation withdraws the grant.
-    const pending = await app.request(
-      `/v1/orgs/${org.id}/invitations`,
-      json('POST', owner.cookie, { email: 'r@example.net', role: 'member' }),
-    )
-    const pendingInvite = await TestApp.json(pending, InvitationsApp.schema.Invitation)
-    expect(await Invitations.hasEarlyAccessGrant(db, 'r@example.net')).toBe(true)
-    const revoked = await app.request(`/v1/orgs/${org.id}/invitations/${pendingInvite.id}`, {
-      headers: { cookie: owner.cookie },
-      method: 'DELETE',
-    })
-    expect(revoked.status).toBe(200)
-    expect(await Invitations.hasEarlyAccessGrant(db, 'r@example.net')).toBe(false)
-  })
-})

package/src/apps/management/routes/invitations.ts

@@ -261,15 +261,12 @@ export function invitations() {
         const principal = Auth.getPrincipal(c)
         const invitedBy =
           principal?.type === 'api_key' ? principal.id : (caller?.userId ?? 'super_admin')
-        // Elevation transfers only from inviters who themselves have early access.
-        const grantsEarlyAccess = await Auth.tmp_earlyAccessGrant(c)
 
         const db = Db.get(c.get('db'))
         try {
           const record = await Invitations.create(db, {
             email: body.email,
             expiresAt: new Date(Date.now() + ttlDays * 86_400_000).toISOString(),
-            grantsEarlyAccess,
             invitedBy,
             orgId: Auth.org(c).id,
             role: body.role,