chore: merge main, resolve biome formatting conflicts

Merge origin/main into feat/external-2fa-codes. Resolve formatting
conflicts caused by biome rollout; preserve both feature streams:
PR's external 2FA token + signing-session 2FA proof additions plus
main's RateLimit/RecipientExpired/signingReminders/date-auto-insert.

In complete-document-with-token.ts, drop the duplicate early
field-fetching block introduced when main moved that logic later
with date auto-insert support; keep the EXTERNAL_TWO_FACTOR_AUTH
check using derivedRecipientActionAuth.
This commit is contained in:
ephraimduncan
2026-05-12 11:46:11 +00:00
parent 9194884fbe
commit 138d663c25
1959 changed files with 93488 additions and 47038 deletions
@@ -1,8 +1,7 @@
import { prisma } from '@documenso/prisma';
import type { Envelope, TemplateDirectLink } from '@prisma/client';
import { EnvelopeType, type TeamProfile, TemplateType } from '@prisma/client';
import { prisma } from '@documenso/prisma';
import { AppError, AppErrorCode } from '../../errors/app-error';
export type GetPublicProfileByUrlOptions = {
@@ -29,12 +29,7 @@ export type SetAvatarImageOptions = {
/**
* Pretty nasty but will do for now.
*/
export const setAvatarImage = async ({
userId,
target,
bytes,
requestMetadata,
}: SetAvatarImageOptions) => {
export const setAvatarImage = async ({ userId, target, bytes, requestMetadata }: SetAvatarImageOptions) => {
let oldAvatarImageId: string | null = null;
if (target.type === 'team') {