Merge remote-tracking branch 'origin/main'
Deploy / deploy-dev (push) Skipped
Deploy / deploy-prod (push) Successful in 4m3s

This commit is contained in:
blaisadmin committed 2026-10-09 23:42:16 -04:00
commit c8eb9bc862
17 files changed
+750 -105

No files matched your search

+77 -21
View File
@@ -1,3 +1,7 @@
import { photoCacheControl } from './storage/photoCache.js';
import { canUpdateWorkspaceSettings, subscriptionAllowsWrite } from './workspaceAccess.js';
import { buildWorkspaceInviteEmail } from './emails/workspaceInviteEmail.js';
import { exportFlock } from './repositories/flockExportRepository.js';
import { unassignedBirdMatchSchema, claimBirdSchema } from './birdMembershipSchemas.js';
import { hasUnassignedBird, removeBirdFromFlock, claimUnassignedBird } from './repositories/birdMembershipRepository.js';
import { behaviorTypeSchema, behaviorOccurrenceSchema, behaviorRangeSchema } from './behaviorSchemas.js';
@@ -986,14 +990,6 @@ const normalizeWorkspaceMembershipList = async (userId: string) =>
const isAdminUser = (user: UserRow) => adminEmails.has(normalizeEmail(user.email));
const subscriptionAllowsWrite = (workspace: WorkspaceRow) => {
if (workspace.workspace_type === 'rescue') {
return workspace.rescue_verification_status === 'approved';
}
return workspace.subscription_status === 'active' || workspace.subscription_status === 'trialing';
};
const mapStripeSubscriptionStatus = (status: Stripe.Subscription.Status): SubscriptionStatus => {
if (status === 'active' || status === 'trialing' || status === 'past_due' || status === 'canceled' || status === 'unpaid') {
return status;
@@ -2214,11 +2210,6 @@ const writeBirdTimelineEvent = async ({
}
};
const isBillingOnlyWorkspaceUpdate = (
workspace: WorkspaceRow,
payload: z.infer<typeof workspaceSchema>,
) => workspace.workspace_type === 'standard' && payload.workspaceType === 'standard' && payload.name === workspace.name;
app.get('/api/health', (_req: Request, res: Response) => {
res.json({ ok: true });
});
@@ -2964,6 +2955,40 @@ app.post('/api/workspaces', requireAuth, requireSessionAuth, async (req: Request
}
});
app.get('/api/workspace/export', requireAuth, requireSessionAuth, async (req: Request, res: Response, next: NextFunction) => {
try {
const parsed = z.object({ birdId: z.string().uuid().optional() }).safeParse(req.query);
if (!parsed.success) {
res.status(400).json({ error: 'Invalid bird selection.' });
return;
}
const { birdId } = parsed.data;
const data = await exportFlock(req.auth!.workspace.id, birdId);
if (birdId && data.birds.length === 0) {
res.status(404).json({ error: 'Bird not found in this flock.' });
return;
}
for (const bird of data.birds) {
if (bird.photo_object_key) {
const config = getS3ImageStorageConfig();
if (!config) throw new Error('Image storage is not configured. Unable to export flock photos.');
const response = await fetch(getSignedS3ObjectUrl({ config, objectKey: bird.photo_object_key, expiresInSeconds: 300 }), {
signal: AbortSignal.timeout(30_000),
});
if (!response.ok) throw new Error('Unable to export a flock photo. Please try again.');
const contentType = bird.photo_content_type || response.headers.get('content-type') || 'application/octet-stream';
bird.photo_data_url = `data:${contentType};base64,${Buffer.from(await response.arrayBuffer()).toString('base64')}`;
}
delete bird.photo_object_key;
}
res.setHeader('Cache-Control', 'no-store');
res.attachment(`flockpal-${birdId ? `bird-${birdId}` : `flock-${req.auth!.workspace.id}`}-${new Date().toISOString().slice(0, 10)}.json`);
res.json(data);
} catch (error) {
next(error);
}
});
app.get('/api/workspace', requireAuth, async (req: Request, res: Response) => {
res.json({ workspace: normalizeWorkspace(req.auth!.workspace) });
});
@@ -2981,10 +3006,7 @@ app.put('/api/workspace', requireAuth, requireSessionAuth, requireWorkspaceRole(
const billingPlan = resolveBillingPlan(parsed.data.workspaceType, parsed.data.billingPlan ?? currentWorkspace.billing_plan);
const billingInterval = parsed.data.workspaceType === 'rescue' ? 'monthly' : (parsed.data.billingInterval ?? currentWorkspace.billing_interval);
const isConvertingToRescue = currentWorkspace.workspace_type !== 'rescue' && parsed.data.workspaceType === 'rescue';
const canUpdateWorkspace =
isAdminUser(req.auth!.user) ||
subscriptionAllowsWrite(currentWorkspace) ||
isBillingOnlyWorkspaceUpdate(currentWorkspace, parsed.data);
const canUpdateWorkspace = canUpdateWorkspaceSettings(currentWorkspace, parsed.data, isAdminUser(req.auth!.user));
if (!canUpdateWorkspace) {
res.status(402).json({
@@ -3130,6 +3152,37 @@ app.get('/api/workspace/members', requireAuth, async (req: Request, res: Respons
}
});
const sendWorkspaceInvitation = async (auth: AuthContext, member: WorkspaceMemberRow) => {
if (!mailTransport) return { sent: false, message: 'Access is saved, but email delivery is not configured. Share the sign-in instructions directly.' };
try {
const result = await mailTransport.sendMail({
from: smtpFromName ? `"${smtpFromName}" <${smtpFromEmail}>` : smtpFromEmail,
to: member.invite_email,
...await buildWorkspaceInviteEmail({
name: member.name, email: member.invite_email, inviterName: auth.user.name,
flockName: auth.workspace.name, role: member.role, frontendUrl: frontendBaseUrl,
}),
});
if (!result.accepted?.length) throw new Error('Invitation email was not accepted.');
return { sent: true, message: 'Invitation email sent. Access is ready when they sign in with the invited email address.' };
} catch {
return { sent: false, message: 'Access is saved, but the invitation email could not be sent. Use Resend invitation to try again.' };
}
};
app.post('/api/workspace/members/:memberId/invitation', requireAuth, requireSessionAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant']), async (req: Request, res: Response, next: NextFunction) => {
try {
const member = (await listWorkspaceMembers(req.auth!.workspace.id)).find((entry) => entry.id === req.params.memberId);
if (!member) {
res.status(404).json({ error: 'Flock member not found.' });
return;
}
const invitation = await sendWorkspaceInvitation(req.auth!, member);
await writeAuditLog(req.auth!, 'workspace_member.invitation_resent', 'workspace_member', member.id, member.name, { sent: invitation.sent });
res.json({ invitation });
} catch (error) { next(error); }
});
app.post('/api/workspace/members', requireAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant']), async (req: Request, res: Response, next: NextFunction) => {
const parsed = workspaceMemberSchema.safeParse(req.body);
@@ -3153,7 +3206,8 @@ app.post('/api/workspace/members', requireAuth, requireWriteAccess, requireWorks
inviteEmail: member!.invite_email,
role: member!.role,
});
res.status(201).json({ member: normalizeWorkspaceMember(member!) });
const invitation = await sendWorkspaceInvitation(req.auth!, member!);
res.status(201).json({ member: normalizeWorkspaceMember(member!), invitation });
} catch (error) {
next(error);
}
@@ -3443,6 +3497,8 @@ app.post(
);
app.get('/api/birds/:birdId/photo', async (req: Request, res: Response, next: NextFunction) => {
// Invalid tokens, missing photos and upstream failures must never be cached.
res.setHeader('Cache-Control', 'no-store');
try {
const token = typeof req.query.token === 'string' ? req.query.token : '';
const photoAccess = verifyBirdPhotoAccessToken(token);
@@ -3472,9 +3528,8 @@ app.get('/api/birds/:birdId/photo', async (req: Request, res: Response, next: Ne
expiresInSeconds: 5 * 60,
});
res.setHeader('Cache-Control', 'private, max-age=900');
if (photoDeliveryMode === 'redirect') {
res.setHeader('Cache-Control', photoCacheControl('redirect', photoAccess.expiresAt));
res.redirect(302, signedUrl);
return;
}
@@ -3490,6 +3545,7 @@ app.get('/api/birds/:birdId/photo', async (req: Request, res: Response, next: Ne
const contentLength = imageResponse.headers.get('content-length');
const imageBuffer = Buffer.from(await imageResponse.arrayBuffer());
res.setHeader('Cache-Control', photoCacheControl('proxy', photoAccess.expiresAt));
res.setHeader('Content-Type', contentType);
if (contentLength) {
@@ -3963,7 +4019,7 @@ app.put('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceR
}
});
app.delete('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant', 'caregiver']), async (req: Request, res: Response, next: NextFunction) => {
app.delete('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant']), async (req: Request, res: Response, next: NextFunction) => {
try {
const bird = await getBirdById(req.params.birdId, req.auth!.workspace.id);
+17
View File
@@ -115,3 +115,20 @@ test('Swagger UI, initialization, assets and specification are served locally wi
assert.equal(redirect.status, 301);
assert.equal(redirect.headers.get('location'), '/api/docs/');
});
test('bird removal is restricted to owners and assistants in the API and its documentation', () => {
const route = ast.statements.find((statement) =>
ts.isExpressionStatement(statement) && ts.isCallExpression(statement.expression) &&
statement.expression.expression.getText(ast) === 'app.delete' &&
statement.expression.arguments[0]?.getText(ast) === "'/api/birds/:birdId'"
);
assert.ok(route && ts.isExpressionStatement(route) && ts.isCallExpression(route.expression));
const guard = route.expression.arguments.find((arg) =>
ts.isCallExpression(arg) && arg.expression.getText(ast) === 'requireWorkspaceRole'
);
assert.ok(guard && ts.isCallExpression(guard));
assert.equal(guard.arguments[0].getText(ast), "['owner', 'assistant']");
const description = customerOpenApi.paths['/birds/{birdId}']!.delete!.description!;
assert.match(description, /Allowed roles: owner, assistant\./);
assert.doesNotMatch(description, /caregiver/);
});
+2 -2
View File
@@ -63,7 +63,7 @@ const one = (name: string, model: z.ZodTypeAny) => z.object({ [name]: model });
const many = (name: string, model: z.ZodTypeAny) => one(name, z.array(model));
endpoint({ method: 'get', path: '/workspace', summary: 'Get the token’s workspace', tag: 'Workspace', response: one('workspace', models.workspaceResponse) });
endpoint({ method: 'get', path: '/workspace/members', summary: 'List workspace members', tag: 'Workspace', response: many('members', models.memberResponse) });
endpoint({ method: 'post', path: '/workspace/members', summary: 'Add or update a workspace member', tag: 'Workspace', body: registry.register('MemberInput', workspaceMemberSchema), response: one('member', models.memberResponse), roles: ['owner', 'assistant'] });
endpoint({ method: 'post', path: '/workspace/members', summary: 'Add or update a workspace member', tag: 'Workspace', body: registry.register('MemberInput', workspaceMemberSchema), response: z.object({ member: models.memberResponse, invitation: z.object({ sent: z.boolean(), message: z.string() }) }), roles: ['owner', 'assistant'], description: 'Saves access and attempts to send a branded invitation email. Check invitation.sent for email submission status; access remains saved if email delivery fails.' });
endpoint({ method: 'put', path: '/workspace/members/{memberId}', summary: 'Change a member’s role', tag: 'Workspace', body: z.object({ role: workspaceRoleSchema }), response: one('member', models.memberResponse), roles: ['owner', 'assistant'], errors: [404], description: 'Only the billing owner can promote collaborators to owner. Additional protections apply to changing your own or the billing owner’s membership.' });
endpoint({ method: 'delete', path: '/workspace/members/{memberId}', summary: 'Remove a workspace member', tag: 'Workspace', roles: ['owner', 'assistant'], errors: [404], description: 'Protected memberships cannot be removed.' });
endpoint({ method: 'get', path: '/notes', summary: 'List flock notes', tag: 'Notes', response: many('notes', models.noteResponse) });
@@ -77,7 +77,7 @@ const birdInput = registry.register('BirdInput', birdSchema);
const birdDescription = 'motivators and demotivators each allow up to three non-empty lines. hatchDay takes precedence over the legacy dateOfBirth field. photoDataUrl accepts an image data URL or HTTP(S) URL; returned photo links may expire.';
endpoint({ method: 'post', path: '/birds', summary: 'Create a bird', tag: 'Birds', body: birdInput, response: one('bird', models.birdResponse), errors: [409], description: birdDescription, example: { name: 'Yoda', species: 'African grey' } });
endpoint({ method: 'put', path: '/birds/{birdId}', summary: 'Update a bird', tag: 'Birds', body: birdInput, response: one('bird', models.birdResponse), errors: [404, 409], description: `Submit the full editable profile: omitted optional fields may be cleared or reset. ${birdDescription}` });
endpoint({ method: 'delete', path: '/birds/{birdId}', summary: 'Remove a bird from its flock', tag: 'Birds', errors: [404, 409], description: 'Unassigns the bird without deleting its profile, photo, or care history. Bird-specific notes follow the bird; flock-wide notes and workspace audit logs stay in the old flock. Public sharing is disabled and pending transfers are revoked. An exact band ID match can later bring the bird and its history into a flock.' });
endpoint({ method: 'delete', path: '/birds/{birdId}', summary: 'Remove a bird from its flock', roles: ['owner', 'assistant'], tag: 'Birds', errors: [404, 409], description: 'Unassigns the bird without deleting its profile, photo, or care history. Bird-specific notes follow the bird; flock-wide notes and workspace audit logs stay in the old flock. Public sharing is disabled and pending transfers are revoked. An exact band ID match can later bring the bird and its history into a flock.' });
endpoint({ method: 'get', path: '/birds/{birdId}/timeline', summary: 'List bird timeline events', tag: 'Birds', response: many('events', models.timelineResponse), errors: [404] });
for (const resource of [
{ path: 'weights', single: 'weight', plural: 'weights', id: 'weightId', tag: 'Weights', input: weightSchema, model: models.weightResponse },
@@ -0,0 +1,29 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { buildWorkspaceInviteEmail } from './workspaceInviteEmail.js';
const input = { name: '<Pat>', email: 'pat@example.test', inviterName: 'Alex & Sam', flockName: '<Rescue>', role: 'caregiver' as const, frontendUrl: 'https://flockpal.test/' };
test('invitation uses branded layout, escaped copy, and email-specific sign-in instructions', async () => {
const mail = await buildWorkspaceInviteEmail(input);
assert.match(String(mail.html), /&lt;Pat&gt;/);
assert.match(String(mail.html), /Alex &amp; Sam/);
assert.match(String(mail.html), /&lt;Rescue&gt;/);
assert.match(String(mail.html), /cid:flockpal-logo/);
assert.equal(mail.attachments?.length, 1);
assert.match(mail.text, /Sign in to FlockPal using pat@example.test/);
assert.match(mail.text, /cannot remove birds/);
assert.match(mail.text, /flock switcher/);
assert.match(String(mail.html), /href="https:\/\/flockpal.test\/"/);
});
test('invitation describes each assigned role and prevents multiline subjects', async () => {
for (const role of ['viewer', 'caregiver', 'assistant', 'owner'] as const) {
const mail = await buildWorkspaceInviteEmail({ ...input, role, flockName: 'Rescue\r\nFlock' });
assert.doesNotMatch(mail.subject, /[\r\n]/);
assert.ok(mail.text.includes(role.charAt(0).toUpperCase() + role.slice(1)));
if (role === 'viewer') assert.match(mail.text, /cannot edit records/);
if (role === 'assistant') assert.match(mail.text, /remove and transfer birds/);
if (role === 'owner') assert.match(mail.text, /does not change the billing owner/);
}
});
@@ -0,0 +1,26 @@
import { buildEmailLayout, escapeHtml } from './emailLayout.js';
import type { WorkspaceRole } from '../types.js';
const permissions: Record<WorkspaceRole, string> = {
viewer: 'You can view all birds and care histories, and export flock data. You cannot edit records.',
caregiver: 'You can view and export flock data, add and edit birds, log daily care, and delete supported care records. You cannot remove birds or manage sharing, billing, or transfers.',
assistant: 'You can manage birds and care records, remove and transfer birds, manage collaborators, flock settings and billing, and view the audit log.',
owner: 'You have full flock control, including bird removal, transfers, sharing, billing management, memorializing birds, and deleting an empty flock. This does not change the billing owner.',
};
export const buildWorkspaceInviteEmail = async ({ name, email, inviterName, flockName, role, frontendUrl }: {
name: string; email: string; inviterName: string; flockName: string; role: WorkspaceRole; frontendUrl: string;
}) => {
const roleLabel = role.charAt(0).toUpperCase() + role.slice(1);
const instructions = `Sign in to FlockPal using ${email}. If you do not have an account, use that email to get started. After signing in, choose ${flockName} in the flock switcher in the navigation or Settings → Flock profile. If you are already signed in and the flock is missing, sign out and sign back in.`;
return {
subject: `You’re invited to ${flockName.replace(/[\r\n]+/g, ' ')} on FlockPal`,
text: `Hi ${name},\n\n${inviterName} has invited you to ${flockName} as a ${roleLabel}.\n\n${permissions[role]}\n\n${instructions}\n\nOpen FlockPal: ${frontendUrl}\n\nIf you were not expecting this invitation, you can ignore this email.`,
...await buildEmailLayout({
eyebrow: 'Shared flock invitation', headline: `You’re invited to ${flockName}`,
contentHtml: `<p>Hi ${escapeHtml(name)},</p><p>${escapeHtml(inviterName)} has invited you to <strong>${escapeHtml(flockName)}</strong> as a <strong>${roleLabel}</strong>.</p><p>${escapeHtml(permissions[role])}</p><p>${escapeHtml(instructions)}</p>`,
action: { url: frontendUrl, label: 'Open FlockPal' },
footer: 'If you were not expecting this invitation, you can ignore this email.',
}),
};
};
@@ -0,0 +1,31 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { exportFlock } from './flockExportRepository.js';
import { mockDb } from '../test/mockDb.js';
test('export scopes every history to the selected flock without date or memorial filters', async () => {
const data = { formatVersion: 1, birds: [], workspace: { id: 42, name: 'Flock' } };
const { calls } = mockDb({ rows: [{ data }] });
assert.deepEqual(await exportFlock(42), data);
assert.equal(calls.length, 1);
const { text, params } = calls[0];
assert.deepEqual(params, [42, null]);
assert.match(text, /SELECT \* FROM birds WHERE workspace_id = \$1/);
for (const table of ['weight_records', 'vet_visits', 'medications', 'medication_administrations', 'behavior_occurrences', 'bird_timeline_events']) {
assert.ok(text.includes(`FROM ${table} r JOIN flock_birds b ON b.id = r.bird_id`));
}
assert.match(text, /FROM flock_notes n WHERE n.workspace_id = \$1/);
assert.doesNotMatch(text, /LIMIT|memorialized_at IS NULL|INTERVAL/);
assert.doesNotMatch(text, /auth_sessions|integration_tokens|stripe|magic_link/);
});
test('single member export restricts profiles, notes, and behavior types to the selected bird', async () => {
const birdId = 'd0ab1d12-7859-4a64-a354-dd58bf738b94';
const data = { birds: [{ id: birdId }] };
const { calls } = mockDb({ rows: [{ data }] });
assert.deepEqual(await exportFlock(42, birdId), data);
assert.deepEqual(calls[0].params, [42, birdId]);
assert.ok(calls[0].text.includes('workspace_id = $1 AND ($2::uuid IS NULL OR id = $2)'));
assert.ok(calls[0].text.includes('AND ($2::uuid IS NULL OR n.bird_id IN (SELECT id FROM flock_birds))'));
assert.ok(calls[0].text.includes('WHERE ($2::uuid IS NULL AND (t.is_default OR t.workspace_id = $1)) OR EXISTS'));
});
@@ -0,0 +1,48 @@
import { db } from '../db/client.js';
type ExportBird = Record<string, unknown> & {
photo_object_key?: string | null;
photo_content_type?: string | null;
photo_data_url?: string | null;
};
export type FlockExport = {
formatVersion: number;
exportedAt: string;
workspace: { id: number; name: string };
birds: ExportBird[];
[key: string]: unknown;
};
// A single statement provides a consistent snapshot, including all dates and memorialized birds.
export const exportFlock = async (workspaceId: number, birdId?: string): Promise<FlockExport> => {
const birdTables = {
weights: 'weight_records',
vetVisits: 'vet_visits',
medications: 'medications',
medicationAdministrations: 'medication_administrations',
behaviors: 'behavior_occurrences',
timeline: 'bird_timeline_events',
};
const histories = Object.entries(birdTables).map(([key, table]) =>
`'${key}', (SELECT COALESCE(jsonb_agg(to_jsonb(r) ORDER BY r.id), '[]'::jsonb)
FROM ${table} r JOIN flock_birds b ON b.id = r.bird_id)`
);
const result = await db.query<{ data: FlockExport }>(`
WITH flock_birds AS (SELECT * FROM birds WHERE workspace_id = $1 AND ($2::uuid IS NULL OR id = $2))
SELECT jsonb_build_object(
'formatVersion', 1,
'exportedAt', CURRENT_TIMESTAMP,
'workspace', (SELECT jsonb_build_object('id', id, 'name', name) FROM workspaces WHERE id = $1),
'birds', (SELECT COALESCE(jsonb_agg(to_jsonb(b) ORDER BY b.id), '[]'::jsonb) FROM flock_birds b),
'notes', (SELECT COALESCE(jsonb_agg(to_jsonb(n) ORDER BY n.id), '[]'::jsonb)
FROM flock_notes n WHERE n.workspace_id = $1
AND ($2::uuid IS NULL OR n.bird_id IN (SELECT id FROM flock_birds))),
'behaviorTypes', (SELECT COALESCE(jsonb_agg(to_jsonb(t) - 'workspace_id' ORDER BY t.id), '[]'::jsonb)
FROM behavior_types t WHERE ($2::uuid IS NULL AND (t.is_default OR t.workspace_id = $1)) OR EXISTS (
SELECT 1 FROM behavior_occurrences o JOIN flock_birds b ON b.id = o.bird_id
WHERE o.behavior_type_id = t.id)),
${histories.join(',\n')}
) AS data`, [workspaceId, birdId ?? null]);
return result.rows[0].data;
};
+13
View File
@@ -0,0 +1,13 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { photoCacheControl } from './photoCache.js';
test('storage redirects cannot be cached beyond the signed destination lifetime', () => {
assert.equal(photoCacheControl('redirect', 1900, 1000), 'no-store');
});
test('proxy caching is bounded by the remaining app token lifetime', () => {
assert.equal(photoCacheControl('proxy', 1900, 1000), 'private, max-age=900, must-revalidate');
assert.equal(photoCacheControl('proxy', 1050, 1000), 'private, max-age=50, must-revalidate');
assert.equal(photoCacheControl('proxy', 999, 1000), 'private, max-age=0, must-revalidate');
});
+4
View File
@@ -0,0 +1,4 @@
// Never cache a redirect to a signed storage URL: its lifetime is independent of
// the app token. Successful proxy responses cannot outlive the app token.
export const photoCacheControl = (mode: 'proxy' | 'redirect', expiresAt: number, now = Math.floor(Date.now() / 1000)) =>
mode === 'redirect' ? 'no-store' : `private, max-age=${Math.max(0, Math.min(900, expiresAt - now))}, must-revalidate`;
+30
View File
@@ -0,0 +1,30 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { canUpdateWorkspaceSettings, subscriptionAllowsWrite } from '../workspaceAccess.js';
import type { WorkspaceRow } from '../types.js';
type Access = Pick<WorkspaceRow, 'name' | 'workspace_type' | 'subscription_status' | 'rescue_verification_status'>;
const household: Access = { name: 'Our flock', workspace_type: 'standard', subscription_status: 'none', rescue_verification_status: 'not_required' };
test('unsubscribed households can request rescue verification, including a new flock name', () => {
for (const subscription_status of ['none', 'past_due', 'canceled', 'unpaid', 'active', 'trialing'] as const) {
assert.equal(canUpdateWorkspaceSettings({ ...household, subscription_status }, { name: 'Our rescue', workspaceType: 'rescue' }, false), true);
}
});
test('conversion does not make unverified rescues writable, even with an active subscription', () => {
for (const rescue_verification_status of ['pending', 'rejected', 'not_required'] as const) {
const rescue: Access = { ...household, workspace_type: 'rescue', subscription_status: 'active', rescue_verification_status };
assert.equal(subscriptionAllowsWrite(rescue), false);
assert.equal(canUpdateWorkspaceSettings(rescue, { name: rescue.name, workspaceType: 'rescue' }, false), false);
}
assert.equal(subscriptionAllowsWrite({ ...household, workspace_type: 'rescue', rescue_verification_status: 'approved' }), true);
});
test('household edits remain subscription gated while billing recovery and admin access still work', () => {
assert.equal(subscriptionAllowsWrite(household), false);
assert.equal(canUpdateWorkspaceSettings(household, { name: 'Renamed', workspaceType: 'standard' }, false), false);
assert.equal(canUpdateWorkspaceSettings(household, { name: household.name, workspaceType: 'standard' }, false), true);
assert.equal(canUpdateWorkspaceSettings(household, { name: 'Renamed', workspaceType: 'standard' }, true), true);
assert.equal(subscriptionAllowsWrite({ ...household, subscription_status: 'active' }), true);
});
+22
View File
@@ -0,0 +1,22 @@
import type { WorkspaceRow, WorkspaceType } from './types.js';
type WorkspaceAccess = Pick<WorkspaceRow, 'name' | 'workspace_type' | 'subscription_status' | 'rescue_verification_status'>;
export const subscriptionAllowsWrite = (workspace: WorkspaceAccess) => {
if (workspace.workspace_type === 'rescue') {
return workspace.rescue_verification_status === 'approved';
}
return workspace.subscription_status === 'active' || workspace.subscription_status === 'trialing';
};
export const canUpdateWorkspaceSettings = (
workspace: WorkspaceAccess,
payload: { name: string; workspaceType: WorkspaceType },
isAdmin: boolean,
) => {
// Requesting rescue verification must not require buying a household subscription.
// The route still validates onboarding and the repository marks the rescue pending.
const requestingRescue = workspace.workspace_type === 'standard' && payload.workspaceType === 'rescue';
const billingOnly = workspace.workspace_type === 'standard' && payload.workspaceType === 'standard' && payload.name === workspace.name;
return isAdmin || subscriptionAllowsWrite(workspace) || requestingRescue || billingOnly;
};