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
+39 -43
View File
@@ -24,18 +24,16 @@ export const profileRouter = router({
});
}),
updateProfile: authenticatedProcedure
.input(ZUpdateProfileMutationSchema)
.mutation(async ({ input, ctx }) => {
const { name, signature } = input;
updateProfile: authenticatedProcedure.input(ZUpdateProfileMutationSchema).mutation(async ({ input, ctx }) => {
const { name, signature } = input;
await updateProfile({
userId: ctx.user.id,
name,
signature,
requestMetadata: ctx.metadata.requestMetadata,
});
}),
await updateProfile({
userId: ctx.user.id,
name,
signature,
requestMetadata: ctx.metadata.requestMetadata,
});
}),
deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => {
await deleteUser({
@@ -43,43 +41,41 @@ export const profileRouter = router({
});
}),
setProfileImage: authenticatedProcedure
.input(ZSetProfileImageMutationSchema)
.mutation(async ({ input, ctx }) => {
const { bytes, teamId, organisationId } = input;
setProfileImage: authenticatedProcedure.input(ZSetProfileImageMutationSchema).mutation(async ({ input, ctx }) => {
const { bytes, teamId, organisationId } = input;
ctx.logger.info({
input: {
teamId,
organisationId,
},
});
ctx.logger.info({
input: {
teamId,
organisationId,
},
});
let target: SetAvatarImageOptions['target'] = {
type: 'user',
let target: SetAvatarImageOptions['target'] = {
type: 'user',
};
if (teamId) {
target = {
type: 'team',
teamId,
};
}
if (teamId) {
target = {
type: 'team',
teamId,
};
}
if (organisationId) {
target = {
type: 'organisation',
organisationId,
};
}
if (organisationId) {
target = {
type: 'organisation',
organisationId,
};
}
return await setAvatarImage({
userId: ctx.user.id,
target,
bytes,
requestMetadata: ctx.metadata,
});
}),
return await setAvatarImage({
userId: ctx.user.id,
target,
bytes,
requestMetadata: ctx.metadata,
});
}),
submitSupportTicket: authenticatedProcedure
.input(ZSubmitSupportTicketMutationSchema)
@@ -1,3 +1,4 @@
import { ZNameSchema } from '@documenso/lib/constants/auth';
import { z } from 'zod';
export const ZFindUserSecurityAuditLogsSchema = z.object({
@@ -8,7 +9,7 @@ export const ZFindUserSecurityAuditLogsSchema = z.object({
export type TFindUserSecurityAuditLogsSchema = z.infer<typeof ZFindUserSecurityAuditLogsSchema>;
export const ZUpdateProfileMutationSchema = z.object({
name: z.string().min(1),
name: ZNameSchema,
signature: z.string(),
});