Merge remote-tracking branch 'origin/dev'
This commit is contained in:
commit
1706a906f0
12 files changed
+557
-100
No files matched your search
+72
-19
@@ -1,3 +1,6 @@
|
||||
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 +989,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 +2209,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 +2954,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 +3005,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 +3151,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 +3205,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);
|
||||
}
|
||||
@@ -3963,7 +4016,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);
|
||||
|
||||
|
||||
Reference in new issue
Block a user