mirror of
https://github.com/supabase/supabase.git
synced 2026-10-10 03:45:06 +03:00
## What kind of change does this PR introduce? UI and copywriting improvements for temporary access. ## What is the current behavior? The temporary access UI still used older JIT/ephemeral naming in some places, did not clearly explain the setup requirements, and had to infer unavailable states from Platform error message text. ## What is the new behavior? The settings UI now uses temporary access naming consistently, explains that temporary access uses short-lived tokens for manual database connections, and renders clearer unavailable states for projects that require either a Postgres upgrade or a platform migration. The Studio query now consumes Platform’s structured `unavailableReason` contract instead of parsing human-readable error strings, so the UI owns the copy while Platform owns the eligibility reason. Validation: - `pnpm eslint components/interfaces/Settings/Database/JitDatabaseAccess/JitDbAccessConfiguration.tsx data/jit-db-access/jit-db-access-query.ts` - `pnpm tsc --noEmit --pretty false` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * IP range input now supports one CIDR range per row with add/remove rows and form integration. * **Documentation** * Replaced “JIT” wording with “Temporary” / “Ephemeral token-based” access across UI, dialogs, toasts, and help links. * Added minimum PostgreSQL version requirement (17.6.1.081+). * **Improvements** * Per-row CIDR validation with precise nested error messages. * Refined layout spacing and moved the temporary-access configuration earlier in Database settings. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Etienne Stalmans <etienne@supabase.io> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
151 lines
4.2 KiB
TypeScript
151 lines
4.2 KiB
TypeScript
import dayjs from 'dayjs'
|
|
import { describe, expect, it } from 'vitest'
|
|
|
|
import type { JitUserRuleDraft } from './JitDbAccess.types'
|
|
import {
|
|
computeStatusFromGrants,
|
|
createEmptyGrant,
|
|
getInvalidIpRangeRows,
|
|
getJitMemberOptions,
|
|
getRelativeDatetimeByMode,
|
|
serializeDraftRolesForGrantMutation,
|
|
} from './JitDbAccess.utils'
|
|
import type { OrganizationMembersData } from '@/data/organizations/organization-members-query'
|
|
|
|
describe('jitDbAccess.utils', () => {
|
|
it('returns empty expiry string for never/custom-only fallback modes', () => {
|
|
expect(getRelativeDatetimeByMode('never')).toBe('')
|
|
expect(getRelativeDatetimeByMode('custom')).toBe('')
|
|
})
|
|
|
|
it('creates future datetimes for preset expiry modes', () => {
|
|
const inOneHour = dayjs(getRelativeDatetimeByMode('1h'))
|
|
expect(inOneHour.isValid()).toBe(true)
|
|
expect(inOneHour.isAfter(dayjs())).toBe(true)
|
|
})
|
|
|
|
it('computes active and expired status counts including IP counts', () => {
|
|
const activeGrant = {
|
|
...createEmptyGrant('role_active'),
|
|
enabled: true,
|
|
hasExpiry: true,
|
|
expiry: dayjs().add(1, 'day').toISOString(),
|
|
ipRanges: [{ value: '192.0.2.0/24' }],
|
|
}
|
|
|
|
const expiredGrant = {
|
|
...createEmptyGrant('role_expired'),
|
|
enabled: true,
|
|
hasExpiry: true,
|
|
expiry: dayjs().subtract(1, 'day').toISOString(),
|
|
ipRanges: [{ value: '203.0.113.0/24' }],
|
|
}
|
|
|
|
const perpetualGrant = {
|
|
...createEmptyGrant('role_never'),
|
|
enabled: true,
|
|
hasExpiry: false,
|
|
expiryMode: 'never' as const,
|
|
expiry: '',
|
|
}
|
|
|
|
expect(computeStatusFromGrants([activeGrant, expiredGrant, perpetualGrant])).toEqual({
|
|
active: 2,
|
|
expired: 1,
|
|
activeIp: 1,
|
|
expiredIp: 1,
|
|
})
|
|
})
|
|
|
|
it('returns invalid CIDRs from repeated input rows', () => {
|
|
expect(
|
|
getInvalidIpRangeRows([
|
|
{ value: '192.0.2.0/24' },
|
|
{ value: 'not-a-cidr' },
|
|
{ value: '10.0.0.1/33' },
|
|
{ value: '2001:db8::/64' },
|
|
{ value: '2001:db8::/129' },
|
|
])
|
|
).toEqual(['not-a-cidr', '10.0.0.1/33', '2001:db8::/129'])
|
|
})
|
|
})
|
|
|
|
describe('serializeDraftRolesForGrantMutation', () => {
|
|
it('serializes role expiry and IP restrictions for grant mutation payload', () => {
|
|
const expiry = '2026-06-01T12:00:00.000Z'
|
|
const draft: JitUserRuleDraft = {
|
|
memberId: 'user-1',
|
|
grants: [
|
|
{
|
|
...createEmptyGrant('postgres'),
|
|
enabled: true,
|
|
hasExpiry: true,
|
|
expiryMode: 'custom',
|
|
expiry,
|
|
ipRanges: [{ value: '192.0.2.0/24' }, { value: ' ' }, { value: '2001:db8::/64' }],
|
|
},
|
|
{
|
|
...createEmptyGrant('supabase_read_only_user'),
|
|
enabled: true,
|
|
hasExpiry: false,
|
|
expiryMode: 'never',
|
|
expiry: '',
|
|
},
|
|
{
|
|
...createEmptyGrant('ignored_disabled'),
|
|
enabled: false,
|
|
},
|
|
],
|
|
}
|
|
|
|
expect(serializeDraftRolesForGrantMutation(draft)).toEqual([
|
|
{
|
|
role: 'postgres',
|
|
expires_at: dayjs(expiry).unix(),
|
|
allowed_networks: {
|
|
allowed_cidrs: [{ cidr: '192.0.2.0/24' }],
|
|
allowed_cidrs_v6: [{ cidr: '2001:db8::/64' }],
|
|
},
|
|
},
|
|
{
|
|
role: 'supabase_read_only_user',
|
|
},
|
|
])
|
|
})
|
|
})
|
|
|
|
describe('getJitMemberOptions', () => {
|
|
it('excludes invited org members without gotrue IDs from selectable options', () => {
|
|
const organizationMembers: OrganizationMembersData = [
|
|
{
|
|
gotrue_id: 'de305d54-75b4-431b-adb2-eb6b9e546014',
|
|
primary_email: 'active@example.com',
|
|
username: 'Active User',
|
|
is_sso_user: false,
|
|
mfa_enabled: false,
|
|
metadata: {},
|
|
role_ids: [],
|
|
},
|
|
{
|
|
gotrue_id: '',
|
|
invited_id: 123,
|
|
invited_at: '2026-03-01T00:00:00.000Z',
|
|
primary_email: 'expired-invite@example.com',
|
|
username: 'e',
|
|
is_sso_user: false,
|
|
mfa_enabled: false,
|
|
metadata: {},
|
|
role_ids: [],
|
|
},
|
|
]
|
|
|
|
expect(getJitMemberOptions(organizationMembers, [])).toEqual([
|
|
{
|
|
id: 'de305d54-75b4-431b-adb2-eb6b9e546014',
|
|
email: 'active@example.com',
|
|
name: 'Active User',
|
|
},
|
|
])
|
|
})
|
|
})
|