0ff1b05553
* feat(entitlements): partition the self-host bypass so connector capabilities fall through to grants; capability_grants.source accepts 'connector' Sovereign plan WS3 PR3: ships dark, nothing changes for hosted. - lib/entitlements/keys.ts: CONNECTOR_CAPABILITIES = bank_sync, skatteverket, org_lookup, migration (services Accounted operates that a self-hosted instance cannot provide itself) + isConnectorCapability(). Separate from PAID_CAPABILITIES and outside the trial-seed trigger on purpose: a hosted company can never hold a connector grant. - lib/entitlements/has-capability.ts: isPaywallBypassed() -> isBypassedFor(key). Hosted: byte-identical (dev / DISABLE_PAYWALL bypass, FORCE_PAYWALL wins, else the grant lookup). Self-host: local capabilities always on (FORCE_PAYWALL included, as the existing test demands); connector capabilities behave like hosted, i.e. dev bypass, FORCE_PAYWALL, else the grant lookup where the connector sync will write source='connector' rows. getCompanyEntitlements on a self-host: local paid keys + active connector keys, state 'paid' with an active connector grant else 'none' (never the hosted trial copy). - Migration 20260820122000: capability_grants.source CHECK gains 'connector', found through pg_constraint (the CHECK was declared inline and auto-named; Postgres stores IN as = ANY, matched accordingly). pg-real test: connector accepted, unknown source rejected, upsert on the (scope, key, source) identity, trial seed writes no connector rows. - Tests: self-hosted connector matrix (local all-on without DB, connector gated by grant/expiry, dev bypass all-on, FORCE_PAYWALL gates connector keys only, bulk resolution, entitlements shape); two pre-existing tests that asserted the old "self-host holds connector keys" contract updated to the new one. Verified: full unit suite green, pg-real suite for lib/entitlements green against a local supabase/postgres with every migration applied, lint ratchet, guards. Deferred to the instance-wiring PR: adding the connector extensions to the self-host Docker preset (dead-end upsells until a key can be issued). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * refactor(entitlements): fold the self-host branch into the existing grants query One .or(scopeFilter), not two: the duplicated helper pushed the no-phantom-columns unresolvable-expression count to 380/379. Behaviour is unchanged; the self-host matrix tests still pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * feat(connect): hosted connector-key registry + validate RPC + entitlements endpoint; instance sync writes connector grants hourly Sovereign plan WS3 PR4 ("key infra enabling manual sales"), stacked on the entitlement partition (#1747). Nothing is purchasable yet; this is the plumbing both ends need before the first manually issued key. Hosted side: - Migration 20260820123000: connector_keys (SHA-256 key_hash, prefix, org_number, pinned instance_url, scopes, status, Stripe ids, current_period_end, per-minute rate limit, active_company_count, last_seen/synced) and connector_usage_events (per-request metering, separate from metered_events whose company_id references hosted companies). RLS on, NO policies: service role only. RPC validate_and_increment_connector_key copies the api_keys pattern (FOR UPDATE, minute window, suspended reported not counted, revoked = no row) and is REVOKEd from PUBLIC/anon/authenticated, GRANTed to service_role. pg-real test covers validate/count, unknown+revoked, suspended, rate limit, execute privileges per role, RLS invisibility, usage cascade. - lib/connect/contract.ts (shared wire types), lib/connect/hosted/keys.ts (generate/hash/validate -> 401/403/429 mapping), with-connector-auth.ts (Bearer or X-Connector-Key, one usage row per request, 500 envelope on handler throw), /api/connect/entitlements GET + POST (records active_company_count, pins instance_url on first report, never moves a pinned one), scripts/issue-connector-key.ts (dry run unless --confirm, prints the key once + the .env lines). Instance side: - lib/connect/instance/config.ts (GNUBOK_CONNECTOR_KEY, GNUBOK_CONNECT_URL default https://app.gnubok.se), sync.ts: reports the active company count and writes source='connector' grants for every company x covered scope, expires_at = min(now+72h, period_end+3d); 401/403 or a non-active status deletes them (freeze-and-retain); network/5xx/429 leave them alone. /api/connector/sync/cron (hourly) runs it; not_configured without a key. - Crontab generator gains EXTRA_JOBS (variant-only jobs not in vercel.json, with reasons) + drift tests; docker/crontab.self-hosted regenerated with the hourly sync. Docs (SELF-HOSTING connector section, env templates), DECISIONS. Tests: 52 new unit tests (keys, auth wrapper, route, config, sync outcomes and grant arithmetic, cron route, crontab EXTRA_JOBS) + 7 pg-real tests run locally against supabase/postgres with every migration applied. no-phantom-columns ceiling +1 with a reason (the bulk grant upsert). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * chore(connect): update pg test to re-versioned migration 20260831190000 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb * fix(connect): RPC errors answer 503 not 401; X-Connector-Key wins over Authorization A hosted DB error mapped to 401 made the instance sync treat a pooler blip as key revocation and delete its entire connector grant cache, zeroing the 72h offline grace. 503 lands in the sync's keep-grants branch (already test-pinned). Bearer-first extraction hashed the upstream token on dual-header proxied calls, 401ing the exact shape X-Connector-Key exists for. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb * fix(connect): sync deletes grants only on a body-proven connector rejection, never bare 401/403 A WAF challenge page, edge deployment protection, or an egress proxy answers 401/403 without the hosted app ever running; trusting status alone wiped the instance's 72h offline grant cache within the hour. Deletion now requires the hosted route's own rejection code in the JSON body; codeless 401/403 keeps grants (server_error branch). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb * fix(connect): PR #1748 review batch: https-only connect URL, atomic pin, prefix-gated Bearer, deferred metering, entitlements validation, integer months - GNUBOK_CONNECT_URL must be https (http only for loopback); invalid or plaintext URLs disable the connector instead of sending the key. - instance_url pin update filters on IS NULL; a lost race re-reads and reports the winner's pin. - extractConnectorKey: a Bearer is the connector credential only with the gnubok_ck_ prefix; upstream Bearer falls through to X-Connector-Key. - Usage metering runs via after() off the response path (inline outside a request scope). - Sync validates entitlements shape: unknown status or malformed current_period_end keeps grants (server_error), never deletes. - issue-connector-key rejects fractional --months. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01UzNkSsR18pLFitJdYn8QEb --------- Co-authored-by: Jakob Wennberg <311770904+jakobwennberg-oss@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: Emil <emilmattsson14@gmail.com>
115 lines
4.5 KiB
TypeScript
115 lines
4.5 KiB
TypeScript
#!/usr/bin/env npx tsx
|
|
/**
|
|
* Issue a connector key for a self-hosted instance (manual sales, v1).
|
|
*
|
|
* Writes a connector_keys row through the service role and prints the key
|
|
* ONCE together with the .env lines the operator pastes into their instance.
|
|
* The key is never stored: only its SHA-256.
|
|
*
|
|
* Usage:
|
|
* npx tsx scripts/issue-connector-key.ts --org 5561234567 --name "Byrå AB" \
|
|
* --instance https://bokforing.byra.se [--months 12] \
|
|
* [--scopes bank_sync,skatteverket,org_lookup,migration] [--notes "..."] --confirm
|
|
*
|
|
* Reads .env.local (which points at PRODUCTION in this repo: the script
|
|
* refuses to write without --confirm and prints the target host first).
|
|
*/
|
|
|
|
import { config } from 'dotenv'
|
|
import { resolve } from 'node:path'
|
|
config({ path: resolve(process.cwd(), '.env.local') })
|
|
|
|
import { createServiceRoleClient } from '../lib/supabase/service-client'
|
|
import { CONNECTOR_CAPABILITIES } from '../lib/entitlements/keys'
|
|
import { generateConnectorKey } from '../lib/connect/hosted/keys'
|
|
|
|
function arg(name: string): string | undefined {
|
|
const idx = process.argv.indexOf(`--${name}`)
|
|
if (idx === -1) return undefined
|
|
const value = process.argv[idx + 1]
|
|
return value && !value.startsWith('--') ? value : ''
|
|
}
|
|
function flag(name: string): boolean {
|
|
return process.argv.includes(`--${name}`)
|
|
}
|
|
|
|
async function main(): Promise<void> {
|
|
const org = (arg('org') ?? '').replace(/\D/g, '')
|
|
const name = arg('name') ?? ''
|
|
const instance = arg('instance') ?? ''
|
|
const months = Number(arg('months') ?? '12')
|
|
const scopes = (arg('scopes') ?? CONNECTOR_CAPABILITIES.join(',')).split(',').map((s) => s.trim()).filter(Boolean)
|
|
const notes = arg('notes') ?? null
|
|
|
|
const problems: string[] = []
|
|
if (!/^\d{10}$/.test(org)) problems.push('--org must be a 10-digit Swedish organisation number')
|
|
if (!name) problems.push('--name is required (licensee name)')
|
|
try {
|
|
const u = new URL(instance)
|
|
if (u.protocol !== 'https:') problems.push('--instance must be an https:// origin')
|
|
} catch {
|
|
problems.push('--instance must be a valid https:// URL')
|
|
}
|
|
if (!Number.isInteger(months) || months <= 0 || months > 120) problems.push('--months must be an integer 1..120')
|
|
const unknown = scopes.filter((s) => !(CONNECTOR_CAPABILITIES as readonly string[]).includes(s))
|
|
if (unknown.length) problems.push(`unknown scopes: ${unknown.join(', ')} (allowed: ${CONNECTOR_CAPABILITIES.join(', ')})`)
|
|
if (problems.length) {
|
|
console.error(problems.map((p) => ` x ${p}`).join('\n'))
|
|
process.exit(2)
|
|
}
|
|
|
|
const url = process.env.NEXT_PUBLIC_SUPABASE_URL
|
|
const serviceKey = process.env.SUPABASE_SERVICE_ROLE_KEY
|
|
if (!url || !serviceKey) {
|
|
console.error('NEXT_PUBLIC_SUPABASE_URL and SUPABASE_SERVICE_ROLE_KEY are required (.env.local)')
|
|
process.exit(2)
|
|
}
|
|
const periodEnd = new Date()
|
|
periodEnd.setUTCMonth(periodEnd.getUTCMonth() + months)
|
|
|
|
console.log(`Target: ${new URL(url).host}`)
|
|
console.log(`Licensee: ${name} (${org})`)
|
|
console.log(`Instance: ${new URL(instance).origin}`)
|
|
console.log(`Scopes: ${scopes.join(', ')}`)
|
|
console.log(`Period: until ${periodEnd.toISOString().slice(0, 10)} (${months} months)`)
|
|
if (!flag('confirm')) {
|
|
console.log('\nDry run. Re-run with --confirm to issue the key.')
|
|
return
|
|
}
|
|
|
|
const { key, hash, prefix } = generateConnectorKey()
|
|
const supabase = createServiceRoleClient(url, serviceKey)
|
|
const { data, error } = await supabase
|
|
.from('connector_keys')
|
|
.insert({
|
|
key_hash: hash,
|
|
key_prefix: prefix,
|
|
org_number: org,
|
|
licensee_name: name,
|
|
instance_url: new URL(instance).origin,
|
|
scopes,
|
|
status: 'active',
|
|
current_period_end: periodEnd.toISOString(),
|
|
notes,
|
|
})
|
|
.select('id')
|
|
.single()
|
|
if (error || !data) {
|
|
console.error('insert failed:', error?.message)
|
|
process.exit(1)
|
|
}
|
|
|
|
console.log(`\nIssued connector key ${prefix}… (id ${(data as { id: string }).id}). Shown ONCE, not stored:\n`)
|
|
console.log(` ${key}\n`)
|
|
console.log('Paste into the instance .env, then restart the app and cron containers:')
|
|
console.log(` GNUBOK_CONNECTOR_KEY=${key}`)
|
|
console.log(' # GNUBOK_CONNECT_URL=https://app.gnubok.se (default)')
|
|
console.log('\nThe hourly connector sync writes the capability grants; run it once by hand to check:')
|
|
console.log(' curl -sf -H "Authorization: Bearer $CRON_SECRET" http://localhost:3000/api/connector/sync/cron')
|
|
}
|
|
|
|
main().catch((err) => {
|
|
console.error(err instanceof Error ? err.message : String(err))
|
|
process.exit(1)
|
|
})
|