Ryan/documenso
1
0
Fork 1
mirror of https://github.com/documenso/documenso.git synced 2025-11-15 01:01:49 +10:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge main

Browse Source
This commit is contained in:
Catalin Pit
2025-07-03 12:47:37 +03:00
parent 338965325d 9917def0ca
commit 15d0be17d7
95 changed files with 2448 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/trpc/server/admin-router/create-admin-organisation.ts
View File

@ -12,9 +12,15 @@ import {
export const createAdminOrganisationRoute = adminProcedure
.input(ZCreateAdminOrganisationRequestSchema)
.output(ZCreateAdminOrganisationResponseSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { ownerUserId, data } = input;
ctx.logger.info({
input: {
ownerUserId,
},
});
const organisation = await createOrganisation({
userId: ownerUserId,
name: data.name,

8
packages/trpc/server/admin-router/create-stripe-customer.ts
View File

@ -11,9 +11,15 @@ import {
export const createStripeCustomerRoute = adminProcedure
.input(ZCreateStripeCustomerRequestSchema)
.output(ZCreateStripeCustomerResponseSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { organisationId } = input;
ctx.logger.info({
input: {
organisationId,
},
});
const organisation = await prisma.organisation.findUnique({
where: {
id: organisationId,

6
packages/trpc/server/admin-router/create-subscription-claim.ts
View File

@ -9,9 +9,13 @@ import {
export const createSubscriptionClaimRoute = adminProcedure
.input(ZCreateSubscriptionClaimRequestSchema)
.output(ZCreateSubscriptionClaimResponseSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { name, teamCount, memberCount, flags } = input;
ctx.logger.info({
input,
});
await prisma.subscriptionClaim.create({
data: {
name,

8
packages/trpc/server/admin-router/delete-subscription-claim.ts
View File

@ -10,9 +10,15 @@ import {
export const deleteSubscriptionClaimRoute = adminProcedure
.input(ZDeleteSubscriptionClaimRequestSchema)
.output(ZDeleteSubscriptionClaimResponseSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { id } = input;
ctx.logger.info({
input: {
id,
},
});
const existingClaim = await prisma.subscriptionClaim.findFirst({
where: {
id,

8
packages/trpc/server/admin-router/get-admin-organisation.ts
View File

@ -10,9 +10,15 @@ import {
export const getAdminOrganisationRoute = adminProcedure
.input(ZGetAdminOrganisationRequestSchema)
.output(ZGetAdminOrganisationResponseSchema)
.query(async ({ input }) => {
.query(async ({ input, ctx }) => {
const { organisationId } = input;
ctx.logger.info({
input: {
organisationId,
},
});
return await getAdminOrganisation({
organisationId,
});

108
packages/trpc/server/admin-router/router.ts
View File

@ -61,17 +61,30 @@ export const adminRouter = router({
updateUser: adminProcedure
.input(ZAdminUpdateProfileMutationSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { id, name, email, roles } = input;
ctx.logger.info({
input: {
id,
roles,
},
});
return await updateUser({ id, name, email, roles });
}),
updateRecipient: adminProcedure
.input(ZAdminUpdateRecipientMutationSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { id, name, email } = input;
ctx.logger.info({
input: {
id,
},
});
return await updateRecipient({ id, name, email });
}),
@ -80,6 +93,12 @@ export const adminRouter = router({
.mutation(async ({ ctx, input }) => {
const { id, enabled, data } = input;
ctx.logger.info({
input: {
id,
},
});
return await upsertSiteSetting({
id,
enabled,
@ -90,9 +109,15 @@ export const adminRouter = router({
resealDocument: adminProcedure
.input(ZAdminResealDocumentMutationSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { id } = input;
ctx.logger.info({
input: {
id,
},
});
const document = await getEntireDocument({ id });
const isResealing = isDocumentCompleted(document.status);
@ -100,44 +125,75 @@ export const adminRouter = router({
return await sealDocument({ documentId: id, isResealing });
}),
enableUser: adminProcedure.input(ZAdminEnableUserMutationSchema).mutation(async ({ input }) => {
const { id } = input;
enableUser: adminProcedure
.input(ZAdminEnableUserMutationSchema)
.mutation(async ({ input, ctx }) => {
const { id } = input;
const user = await getUserById({ id }).catch(() => null);
if (!user) {
throw new AppError(AppErrorCode.NOT_FOUND, {
message: 'User not found',
ctx.logger.info({
input: {
id,
},
});
}
return await enableUser({ id });
}),
const user = await getUserById({ id }).catch(() => null);
disableUser: adminProcedure.input(ZAdminDisableUserMutationSchema).mutation(async ({ input }) => {
const { id } = input;
if (!user) {
throw new AppError(AppErrorCode.NOT_FOUND, {
message: 'User not found',
});
}
const user = await getUserById({ id }).catch(() => null);
return await enableUser({ id });
}),
if (!user) {
throw new AppError(AppErrorCode.NOT_FOUND, {
message: 'User not found',
disableUser: adminProcedure
.input(ZAdminDisableUserMutationSchema)
.mutation(async ({ input, ctx }) => {
const { id } = input;
ctx.logger.info({
input: {
id,
},
});
}
return await disableUser({ id });
}),
const user = await getUserById({ id }).catch(() => null);
deleteUser: adminProcedure.input(ZAdminDeleteUserMutationSchema).mutation(async ({ input }) => {
const { id } = input;
if (!user) {
throw new AppError(AppErrorCode.NOT_FOUND, {
message: 'User not found',
});
}
return await deleteUser({ id });
}),
return await disableUser({ id });
}),
deleteUser: adminProcedure
.input(ZAdminDeleteUserMutationSchema)
.mutation(async ({ input, ctx }) => {
const { id } = input;
ctx.logger.info({
input: {
id,
},
});
return await deleteUser({ id });
}),
deleteDocument: adminProcedure
.input(ZAdminDeleteDocumentMutationSchema)
.mutation(async ({ ctx, input }) => {
const { id, reason } = input;
ctx.logger.info({
input: {
id,
},
});
await sendDeleteEmail({ documentId: id, reason });
return await superDeleteDocument({

8
packages/trpc/server/admin-router/update-admin-organisation.ts
View File

@ -10,9 +10,15 @@ import {
export const updateAdminOrganisationRoute = adminProcedure
.input(ZUpdateAdminOrganisationRequestSchema)
.output(ZUpdateAdminOrganisationResponseSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { organisationId, data } = input;
ctx.logger.info({
input: {
organisationId,
},
});
const organisation = await prisma.organisation.findUnique({
where: {
id: organisationId,

6
packages/trpc/server/admin-router/update-subscription-claim.ts
View File

@ -12,9 +12,13 @@ import {
export const updateSubscriptionClaimRoute = adminProcedure
.input(ZUpdateSubscriptionClaimRequestSchema)
.output(ZUpdateSubscriptionClaimResponseSchema)
.mutation(async ({ input }) => {
.mutation(async ({ input, ctx }) => {
const { id, data } = input;
ctx.logger.info({
input,
});
const existingClaim = await prisma.subscriptionClaim.findUnique({
where: { id },
});

13
packages/trpc/server/api-token-router/router.ts
View File

@ -15,6 +15,12 @@ export const apiTokenRouter = router({
.mutation(async ({ input, ctx }) => {
const { tokenName, teamId, expirationDate } = input;
ctx.logger.info({
input: {
teamId,
},
});
return await createApiToken({
userId: ctx.user.id,
teamId,
@ -28,6 +34,13 @@ export const apiTokenRouter = router({
.mutation(async ({ input, ctx }) => {
const { id, teamId } = input;
ctx.logger.info({
input: {
id,
teamId,
},
});
return await deleteTokenById({
id,
teamId,

12
packages/trpc/server/auth-router/router.ts
View File

@ -66,6 +66,12 @@ export const authRouter = router({
.mutation(async ({ ctx, input }) => {
const { passkeyId } = input;
ctx.logger.info({
input: {
passkeyId,
},
});
await deletePasskey({
userId: ctx.user.id,
passkeyId,
@ -91,6 +97,12 @@ export const authRouter = router({
.mutation(async ({ ctx, input }) => {
const { passkeyId, name } = input;
ctx.logger.info({
input: {
passkeyId,
},
});
await updatePasskey({
userId: ctx.user.id,
passkeyId,

7
packages/trpc/server/billing/create-subscription.ts
View File

@ -14,6 +14,13 @@ export const createSubscriptionRoute = authenticatedProcedure
.mutation(async ({ ctx, input }) => {
const { organisationId, priceId } = input;
ctx.logger.info({
input: {
organisationId,
priceId,
},
});
const userId = ctx.user.id;
if (!IS_BILLING_ENABLED()) {

6
packages/trpc/server/billing/get-invoices.ts
View File

@ -13,6 +13,12 @@ export const getInvoicesRoute = authenticatedProcedure
.query(async ({ ctx, input }) => {
const { organisationId } = input;
ctx.logger.info({
input: {
organisationId,
},
});
const userId = ctx.user.id;
if (!IS_BILLING_ENABLED()) {

6
packages/trpc/server/billing/get-subscription.ts
View File

@ -11,6 +11,12 @@ export const getSubscriptionRoute = authenticatedProcedure
.query(async ({ ctx, input }) => {
const { organisationId } = input;
ctx.logger.info({
input: {
organisationId,
},
});
const userId = ctx.user.id;
if (!IS_BILLING_ENABLED()) {

6
packages/trpc/server/billing/manage-subscription.ts
View File

@ -14,6 +14,12 @@ export const manageSubscriptionRoute = authenticatedProcedure
.mutation(async ({ ctx, input }) => {
const { organisationId } = input;
ctx.logger.info({
input: {
organisationId,
},
});
const userId = ctx.user.id;
if (!IS_BILLING_ENABLED()) {

22
packages/trpc/server/context.ts
View File

@ -1,14 +1,19 @@
import type { Session } from '@prisma/client';
import type { Context } from 'hono';
import type { Logger } from 'pino';
import { z } from 'zod';
import type { SessionUser } from '@documenso/auth/server/lib/session/session';
import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
import type { RootApiLog } from '@documenso/lib/types/api-logs';
import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
import { alphaid } from '@documenso/lib/universal/id';
import { logger } from '@documenso/lib/utils/logger';
// This is a bit nasty. Todo: Extract
import type { HonoEnv } from '@documenso/remix/server/router';
type CreateTrpcContextOptions = {
c: Context;
c: Context<HonoEnv>;
requestSource: 'app' | 'apiV1' | 'apiV2';
};
@ -20,14 +25,22 @@ export const createTrpcContext = async ({
const req = c.req.raw;
const requestMetadata = c.get('context').requestMetadata;
const metadata: ApiRequestMetadata = {
requestMetadata: extractRequestMetadata(req),
requestMetadata,
source: requestSource,
auth: null,
};
const rawTeamId = req.headers.get('x-team-id') || undefined;
const trpcLogger = logger.child({
ipAddress: requestMetadata.ipAddress,
userAgent: requestMetadata.userAgent,
requestId: alphaid(),
} satisfies RootApiLog);
const teamId = z.coerce
.number()
.optional()
@ -36,6 +49,7 @@ export const createTrpcContext = async ({
if (!session || !user) {
return {
logger: trpcLogger,
session: null,
user: null,
teamId,
@ -45,6 +59,7 @@ export const createTrpcContext = async ({
}
return {
logger: trpcLogger,
session,
user,
teamId,
@ -66,4 +81,5 @@ export type TrpcContext = (
teamId: number | undefined;
req: Request;
metadata: ApiRequestMetadata;
logger: Logger;
};

72
packages/trpc/server/document-router/router.ts
View File

@ -62,6 +62,7 @@ export const documentRouter = router({
find: findInboxRoute,
getCount: getInboxCountRoute,
},
updateDocument: updateDocumentRoute,
/**
* @private
@ -72,6 +73,12 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await getDocumentById({
userId: ctx.user.id,
teamId,
@ -231,6 +238,13 @@ export const documentRouter = router({
const { teamId, user } = ctx;
const { documentId, folderId } = input;
ctx.logger.info({
input: {
documentId,
folderId,
},
});
return await getDocumentWithDetailsById({
userId: user.id,
teamId,
@ -332,6 +346,12 @@ export const documentRouter = router({
const { user, teamId } = ctx;
const { title, documentDataId, timezone, folderId } = input;
ctx.logger.info({
input: {
folderId,
},
});
const { remaining } = await getServerLimits({ userId: user.id, teamId });
if (remaining.documents <= 0) {
@ -353,8 +373,6 @@ export const documentRouter = router({
});
}),
updateDocument: updateDocumentRoute,
/**
* @public
*/
@ -373,6 +391,12 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId } = input;
ctx.logger.info({
input: {
documentId,
},
});
const userId = ctx.user.id;
await deleteDocument({
@ -396,6 +420,13 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId, signingOrder } = input;
ctx.logger.info({
input: {
documentId,
signingOrder,
},
});
return await upsertDocumentMeta({
userId: ctx.user.id,
teamId,
@ -427,6 +458,12 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId, meta = {} } = input;
ctx.logger.info({
input: {
documentId,
},
});
if (Object.values(meta).length > 0) {
await upsertDocumentMeta({
userId: ctx.user.id,
@ -474,6 +511,13 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId, recipients } = input;
ctx.logger.info({
input: {
documentId,
recipients,
},
});
await resendDocument({
userId: ctx.user.id,
teamId,
@ -503,6 +547,12 @@ export const documentRouter = router({
const { teamId, user } = ctx;
const { documentId } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await duplicateDocument({
userId: user.id,
teamId,
@ -544,6 +594,12 @@ export const documentRouter = router({
orderByDirection,
} = input;
ctx.logger.info({
input: {
documentId,
},
});
return await findDocumentAuditLogs({
userId: ctx.user.id,
teamId,
@ -565,6 +621,12 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId } = input;
ctx.logger.info({
input: {
documentId,
},
});
const document = await getDocumentById({
documentId,
userId: ctx.user.id,
@ -597,6 +659,12 @@ export const documentRouter = router({
const { teamId } = ctx;
const { documentId } = input;
ctx.logger.info({
input: {
documentId,
},
});
const document = await getDocumentById({
documentId,
userId: ctx.user.id,

6
packages/trpc/server/document-router/update-document.ts
View File

@ -19,6 +19,12 @@ export const updateDocumentRoute = authenticatedProcedure
const { teamId } = ctx;
const { documentId, data, meta = {} } = input;
ctx.logger.info({
input: {
documentId,
},
});
const userId = ctx.user.id;
if (Object.values(meta).length > 0) {

6
packages/trpc/server/embedding-router/update-embedding-document.ts
View File

@ -16,6 +16,12 @@ export const updateEmbeddingDocumentRoute = procedure
.input(ZUpdateEmbeddingDocumentRequestSchema)
.output(ZUpdateEmbeddingDocumentResponseSchema)
.mutation(async ({ input, ctx }) => {
ctx.logger.info({
input: {
documentId: input.documentId,
},
});
try {
const authorizationHeader = ctx.req.headers.get('authorization');

6
packages/trpc/server/embedding-router/update-embedding-template.ts
View File

@ -15,6 +15,12 @@ export const updateEmbeddingTemplateRoute = procedure
.input(ZUpdateEmbeddingTemplateRequestSchema)
.output(ZUpdateEmbeddingTemplateResponseSchema)
.mutation(async ({ input, ctx }) => {
ctx.logger.info({
input: {
templateId: input.templateId,
},
});
try {
const authorizationHeader = ctx.req.headers.get('authorization');

96
packages/trpc/server/field-router/router.ts
View File

@ -62,6 +62,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { fieldId } = input;
ctx.logger.info({
input: {
fieldId,
},
});
return await getFieldById({
userId: ctx.user.id,
teamId,
@ -88,6 +94,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { documentId, field } = input;
ctx.logger.info({
input: {
documentId,
},
});
const createdFields = await createDocumentFields({
userId: ctx.user.id,
teamId,
@ -118,6 +130,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { documentId, fields } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await createDocumentFields({
userId: ctx.user.id,
teamId,
@ -146,6 +164,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { documentId, field } = input;
ctx.logger.info({
input: {
documentId,
},
});
const updatedFields = await updateDocumentFields({
userId: ctx.user.id,
teamId,
@ -176,6 +200,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { documentId, fields } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await updateDocumentFields({
userId: ctx.user.id,
teamId,
@ -203,6 +233,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { fieldId } = input;
ctx.logger.info({
input: {
fieldId,
},
});
await deleteDocumentField({
userId: ctx.user.id,
teamId,
@ -225,6 +261,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { documentId, fields } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await setFieldsForDocument({
documentId,
userId: ctx.user.id,
@ -263,6 +305,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { templateId, field } = input;
ctx.logger.info({
input: {
templateId,
},
});
const createdFields = await createTemplateFields({
userId: ctx.user.id,
teamId,
@ -293,6 +341,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { fieldId } = input;
ctx.logger.info({
input: {
fieldId,
},
});
return await getFieldById({
userId: ctx.user.id,
teamId,
@ -319,6 +373,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { templateId, fields } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await createTemplateFields({
userId: ctx.user.id,
teamId,
@ -346,6 +406,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { templateId, field } = input;
ctx.logger.info({
input: {
templateId,
},
});
const updatedFields = await updateTemplateFields({
userId: ctx.user.id,
teamId,
@ -375,6 +441,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { templateId, fields } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await updateTemplateFields({
userId: ctx.user.id,
teamId,
@ -401,6 +473,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { fieldId } = input;
ctx.logger.info({
input: {
fieldId,
},
});
await deleteTemplateField({
userId: ctx.user.id,
teamId,
@ -422,6 +500,12 @@ export const fieldRouter = router({
const { teamId } = ctx;
const { templateId, fields } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await setFieldsForTemplate({
templateId,
userId: ctx.user.id,
@ -448,6 +532,12 @@ export const fieldRouter = router({
.mutation(async ({ input, ctx }) => {
const { token, fieldId, value, isBase64, authOptions } = input;
ctx.logger.info({
input: {
fieldId,
},
});
return await signFieldWithToken({
token,
fieldId,
@ -467,6 +557,12 @@ export const fieldRouter = router({
.mutation(async ({ input, ctx }) => {
const { token, fieldId } = input;
ctx.logger.info({
input: {
fieldId,
},
});
return await removeSignedFieldWithToken({
token,
fieldId,

78
packages/trpc/server/folder-router/router.ts
View File

@ -42,6 +42,13 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { parentId, type } = input;
ctx.logger.info({
input: {
parentId,
type,
},
});
const folders = await findFolders({
userId: user.id,
teamId,
@ -75,6 +82,13 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { parentId, type } = input;
ctx.logger.info({
input: {
parentId,
type,
},
});
const folders = await findFolders({
userId: user.id,
teamId,
@ -107,6 +121,13 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { name, parentId, type } = input;
ctx.logger.info({
input: {
parentId,
type,
},
});
if (parentId) {
try {
await getFolderById({
@ -146,6 +167,12 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { id, name, visibility } = input;
ctx.logger.info({
input: {
id,
},
});
const currentFolder = await getFolderById({
userId: user.id,
teamId,
@ -177,6 +204,12 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { id } = input;
ctx.logger.info({
input: {
id,
},
});
await deleteFolder({
userId: user.id,
teamId,
@ -193,6 +226,13 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { id, parentId } = input;
ctx.logger.info({
input: {
id,
parentId,
},
});
const currentFolder = await getFolderById({
userId: user.id,
teamId,
@ -238,6 +278,13 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { documentId, folderId } = input;
ctx.logger.info({
input: {
documentId,
folderId,
},
});
if (folderId !== null) {
try {
await getFolderById({
@ -277,6 +324,13 @@ export const folderRouter = router({
const { teamId, user } = ctx;
const { templateId, folderId } = input;
ctx.logger.info({
input: {
templateId,
folderId,
},
});
if (folderId !== null) {
try {
await getFolderById({
@ -310,16 +364,24 @@ export const folderRouter = router({
* @private
*/
pinFolder: authenticatedProcedure.input(ZPinFolderSchema).mutation(async ({ ctx, input }) => {
const { folderId } = input;
ctx.logger.info({
input: {
folderId,
},
});
const currentFolder = await getFolderById({
userId: ctx.user.id,
teamId: ctx.teamId,
folderId: input.folderId,
folderId,
});
const result = await pinFolder({
userId: ctx.user.id,
teamId: ctx.teamId,
folderId: input.folderId,
folderId,
type: currentFolder.type,
});
@ -333,16 +395,24 @@ export const folderRouter = router({
* @private
*/
unpinFolder: authenticatedProcedure.input(ZUnpinFolderSchema).mutation(async ({ ctx, input }) => {
const { folderId } = input;
ctx.logger.info({
input: {
folderId,
},
});
const currentFolder = await getFolderById({
userId: ctx.user.id,
teamId: ctx.teamId,
folderId: input.folderId,
folderId,
});
const result = await unpinFolder({
userId: ctx.user.id,
teamId: ctx.teamId,
folderId: input.folderId,
folderId,
type: currentFolder.type,
});

6
packages/trpc/server/organisation-router/create-organisation-group.ts
View File

@ -24,6 +24,12 @@ export const createOrganisationGroupRoute = authenticatedProcedure
const { organisationId, organisationRole, name, memberIds } = input;
const { user } = ctx;
ctx.logger.info({
input: {
organisationId,
},
});
const organisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({
organisationId,

6
packages/trpc/server/organisation-router/create-organisation-member-invites.ts
View File

@ -14,6 +14,12 @@ export const createOrganisationMemberInvitesRoute = authenticatedProcedure
const userId = ctx.user.id;
const userName = ctx.user.name || '';
ctx.logger.info({
input: {
organisationId,
},
});
await createOrganisationMemberInvites({
userId,
userName,

6
packages/trpc/server/organisation-router/create-organisation.ts
View File

@ -23,6 +23,12 @@ export const createOrganisationRoute = authenticatedProcedure
const { name, priceId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
priceId,
},
});
// Check if user can create a free organiastion.
if (IS_BILLING_ENABLED() && !priceId) {
const userOrganisations = await prisma.organisation.findMany({

7
packages/trpc/server/organisation-router/delete-organisation-group.ts
View File

@ -19,6 +19,13 @@ export const deleteOrganisationGroupRoute = authenticatedProcedure
const { groupId, organisationId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
groupId,
organisationId,
},
});
const organisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({
organisationId,

7
packages/trpc/server/organisation-router/delete-organisation-member-invites.ts
View File

@ -19,6 +19,13 @@ export const deleteOrganisationMemberInvitesRoute = authenticatedProcedure
const { organisationId, invitationIds } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
organisationId,
invitationIds,
},
});
const organisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({
organisationId,

7
packages/trpc/server/organisation-router/delete-organisation-member.ts
View File

@ -13,6 +13,13 @@ export const deleteOrganisationMemberRoute = authenticatedProcedure
const { organisationId, organisationMemberId } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
organisationId,
organisationMemberId,
},
});
await deleteOrganisationMembers({
userId,
organisationId,

7
packages/trpc/server/organisation-router/delete-organisation-members.ts
View File

@ -21,6 +21,13 @@ export const deleteOrganisationMembersRoute = authenticatedProcedure
const { organisationId, organisationMemberIds } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
organisationId,
organisationMemberIds,
},
});
await deleteOrganisationMembers({
userId,
organisationId,

6
packages/trpc/server/organisation-router/delete-organisation.ts
View File

@ -17,6 +17,12 @@ export const deleteOrganisationRoute = authenticatedProcedure
const { organisationId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
organisationId,
},
});
const organisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({
organisationId,

6
packages/trpc/server/organisation-router/find-organisation-groups.ts
View File

@ -21,6 +21,12 @@ export const findOrganisationGroupsRoute = authenticatedProcedure
input;
const { user } = ctx;
ctx.logger.info({
input: {
organisationId,
},
});
return await findOrganisationGroups({
userId: user.id,
organisationId,

6
packages/trpc/server/organisation-router/find-organisation-member-invites.ts
View File

@ -21,6 +21,12 @@ export const findOrganisationMemberInvitesRoute = authenticatedProcedure
const { organisationId, query, page, perPage, status } = input;
const { user } = ctx;
ctx.logger.info({
input: {
organisationId,
},
});
return await findOrganisationMemberInvites({
userId: user.id,
organisationId,

6
packages/trpc/server/organisation-router/get-organisation.ts
View File

@ -14,6 +14,12 @@ export const getOrganisationRoute = authenticatedProcedure
.query(async ({ input, ctx }) => {
const { organisationReference } = input;
ctx.logger.info({
input: {
organisationReference,
},
});
return await getOrganisation({
userId: ctx.user.id,
organisationReference,

7
packages/trpc/server/organisation-router/leave-organisation.ts
View File

@ -17,9 +17,14 @@ export const leaveOrganisationRoute = authenticatedProcedure
.output(ZLeaveOrganisationResponseSchema)
.mutation(async ({ ctx, input }) => {
const { organisationId } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
organisationId,
},
});
const organisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({ organisationId, userId }),
include: {

7
packages/trpc/server/organisation-router/resend-organisation-member-invite.ts
View File

@ -20,6 +20,13 @@ export const resendOrganisationMemberInviteRoute = authenticatedProcedure
const userId = ctx.user.id;
const userName = ctx.user.name || '';
ctx.logger.info({
input: {
organisationId,
invitationId,
},
});
await resendOrganisationMemberInvitation({
userId,
userName,

6
packages/trpc/server/organisation-router/update-organisation-group.ts
View File

@ -25,6 +25,12 @@ export const updateOrganisationGroupRoute = authenticatedProcedure
const { id, ...data } = input;
const { user } = ctx;
ctx.logger.info({
input: {
id,
},
});
const organisationGroup = await prisma.organisationGroup.findFirst({
where: {
id,

7
packages/trpc/server/organisation-router/update-organisation-members.ts
View File

@ -24,6 +24,13 @@ export const updateOrganisationMemberRoute = authenticatedProcedure
const { organisationId, organisationMemberId, data } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
organisationId,
organisationMemberId,
},
});
const organisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({
organisationId,

6
packages/trpc/server/organisation-router/update-organisation-settings.ts
View File

@ -16,6 +16,12 @@ export const updateOrganisationSettingsRoute = authenticatedProcedure
const { user } = ctx;
const { organisationId, data } = input;
ctx.logger.info({
input: {
organisationId,
},
});
const {
// Document related settings.
documentVisibility,

7
packages/trpc/server/organisation-router/update-organisation.ts
View File

@ -15,9 +15,14 @@ export const updateOrganisationRoute = authenticatedProcedure
.output(ZUpdateOrganisationResponseSchema)
.mutation(async ({ input, ctx }) => {
const { organisationId, data } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
organisationId,
},
});
// Check if organisation exists and user has access to it
const existingOrganisation = await prisma.organisation.findFirst({
where: buildOrganisationWhereQuery({

15
packages/trpc/server/profile-router/router.ts
View File

@ -23,9 +23,15 @@ export const profileRouter = router({
});
}),
getUser: adminProcedure.input(ZRetrieveUserByIdQuerySchema).query(async ({ input }) => {
getUser: adminProcedure.input(ZRetrieveUserByIdQuerySchema).query(async ({ input, ctx }) => {
const { id } = input;
ctx.logger.info({
input: {
id,
},
});
return await getUserById({ id });
}),
@ -53,6 +59,13 @@ export const profileRouter = router({
.mutation(async ({ input, ctx }) => {
const { bytes, teamId, organisationId } = input;
ctx.logger.info({
input: {
teamId,
organisationId,
},
});
let target: SetAvatarImageOptions['target'] = {
type: 'user',
};

96
packages/trpc/server/recipient-router/router.ts
View File

@ -62,6 +62,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { recipientId } = input;
ctx.logger.info({
input: {
recipientId,
},
});
return await getRecipientById({
userId: ctx.user.id,
teamId,
@ -88,6 +94,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { documentId, recipient } = input;
ctx.logger.info({
input: {
documentId,
},
});
const createdRecipients = await createDocumentRecipients({
userId: ctx.user.id,
teamId,
@ -118,6 +130,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { documentId, recipients } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await createDocumentRecipients({
userId: ctx.user.id,
teamId,
@ -146,6 +164,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { documentId, recipient } = input;
ctx.logger.info({
input: {
documentId,
},
});
const updatedRecipients = await updateDocumentRecipients({
userId: ctx.user.id,
teamId,
@ -176,6 +200,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { documentId, recipients } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await updateDocumentRecipients({
userId: ctx.user.id,
teamId,
@ -203,6 +233,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { recipientId } = input;
ctx.logger.info({
input: {
recipientId,
},
});
await deleteDocumentRecipient({
userId: ctx.user.id,
teamId,
@ -223,6 +259,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { documentId, recipients } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await setDocumentRecipients({
userId: ctx.user.id,
teamId,
@ -259,6 +301,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { recipientId } = input;
ctx.logger.info({
input: {
recipientId,
},
});
return await getRecipientById({
userId: ctx.user.id,
teamId,
@ -285,6 +333,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { templateId, recipient } = input;
ctx.logger.info({
input: {
templateId,
},
});
const createdRecipients = await createTemplateRecipients({
userId: ctx.user.id,
teamId,
@ -314,6 +368,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { templateId, recipients } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await createTemplateRecipients({
userId: ctx.user.id,
teamId,
@ -341,6 +401,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { templateId, recipient } = input;
ctx.logger.info({
input: {
templateId,
},
});
const updatedRecipients = await updateTemplateRecipients({
userId: ctx.user.id,
teamId,
@ -370,6 +436,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { templateId, recipients } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await updateTemplateRecipients({
userId: ctx.user.id,
teamId,
@ -396,6 +468,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { recipientId } = input;
ctx.logger.info({
input: {
recipientId,
},
});
await deleteTemplateRecipient({
recipientId,
userId: ctx.user.id,
@ -415,6 +493,12 @@ export const recipientRouter = router({
const { teamId } = ctx;
const { templateId, recipients } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await setTemplateRecipients({
userId: ctx.user.id,
teamId,
@ -438,6 +522,12 @@ export const recipientRouter = router({
.mutation(async ({ input, ctx }) => {
const { token, documentId, authOptions, nextSigner } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await completeDocumentWithToken({
token,
documentId,
@ -456,6 +546,12 @@ export const recipientRouter = router({
.mutation(async ({ input, ctx }) => {
const { token, documentId, reason } = input;
ctx.logger.info({
input: {
documentId,
},
});
return await rejectDocumentWithToken({
token,
documentId,

6
packages/trpc/server/share-link-router/get-document-internal-url-for-qr-code.ts
View File

@ -14,6 +14,12 @@ export const getDocumentInternalUrlForQRCodeRoute = procedure
.query(async ({ input, ctx }) => {
const { documentId } = input;
ctx.logger.info({
input: {
documentId,
},
});
if (!ctx.user) {
return null;
}

6
packages/trpc/server/share-link-router/router.ts
View File

@ -10,6 +10,12 @@ export const shareLinkRouter = router({
.mutation(async ({ ctx, input }) => {
const { documentId, token } = input;
ctx.logger.info({
input: {
documentId,
},
});
if (token) {
return await createOrGetShareLink({ documentId, token });
}

7
packages/trpc/server/team-router/create-team-groups.ts
View File

@ -27,6 +27,13 @@ export const createTeamGroupsRoute = authenticatedProcedure
const { teamId, groups } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
groups,
},
});
const team = await prisma.team.findFirst({
where: buildTeamWhereQuery({
teamId,

7
packages/trpc/server/team-router/create-team-members.ts
View File

@ -21,6 +21,13 @@ export const createTeamMembersRoute = authenticatedProcedure
const { teamId, organisationMembers } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
organisationMembers,
},
});
return await createTeamMembers({
userId: user.id,
teamId,

6
packages/trpc/server/team-router/create-team.ts
View File

@ -11,6 +11,12 @@ export const createTeamRoute = authenticatedProcedure
const { teamName, teamUrl, organisationId, inheritMembers } = input;
const { user } = ctx;
ctx.logger.info({
input: {
organisationId,
},
});
return await createTeam({
userId: user.id,
teamName,

7
packages/trpc/server/team-router/delete-team-group.ts
View File

@ -19,6 +19,13 @@ export const deleteTeamGroupRoute = authenticatedProcedure
const { teamGroupId, teamId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamGroupId,
teamId,
},
});
const team = await prisma.team.findFirst({
where: buildTeamWhereQuery({
teamId,

7
packages/trpc/server/team-router/delete-team-member.ts
View File

@ -20,6 +20,13 @@ export const deleteTeamMemberRoute = authenticatedProcedure
const { teamId, memberId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
memberId,
},
});
const team = await prisma.team.findFirst({
where: buildTeamWhereQuery({
teamId,

6
packages/trpc/server/team-router/delete-team.ts
View File

@ -11,6 +11,12 @@ export const deleteTeamRoute = authenticatedProcedure
const { teamId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
},
});
await deleteTeam({
userId: user.id,
teamId,

7
packages/trpc/server/team-router/find-team-groups.ts
View File

@ -20,6 +20,13 @@ export const findTeamGroupsRoute = authenticatedProcedure
const { teamId, types, query, page, perPage, teamGroupId, organisationRoles } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
teamGroupId,
},
});
return await findTeamGroups({
userId: user.id,
teamId,

6
packages/trpc/server/team-router/find-team-members.ts
View File

@ -13,6 +13,12 @@ export const findTeamMembersRoute = authenticatedProcedure
const { teamId, query, page, perPage } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
},
});
return await findTeamMembers({
userId: user.id,
teamId,

6
packages/trpc/server/team-router/find-teams.ts
View File

@ -11,5 +11,11 @@ export const findTeamsRoute = authenticatedProcedure
const { organisationId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
organisationId,
},
});
return findTeams({ userId: user.id, organisationId });
});

6
packages/trpc/server/team-router/get-team-members.ts
View File

@ -14,6 +14,12 @@ export const getTeamMembersRoute = authenticatedProcedure
const { teamId } = input;
const { user } = ctx;
ctx.logger.info({
input: {
teamId,
},
});
return await getTeamMembers({
userId: user.id,
teamId,

10
packages/trpc/server/team-router/get-team.ts
View File

@ -8,8 +8,16 @@ export const getTeamRoute = authenticatedProcedure
.input(ZGetTeamRequestSchema)
.output(ZGetTeamResponseSchema)
.query(async ({ input, ctx }) => {
const { teamReference } = input;
ctx.logger.info({
input: {
teamReference,
},
});
return await getTeam({
teamReference: input.teamReference,
teamReference,
userId: ctx.user.id,
});
});

50
packages/trpc/server/team-router/router.ts
View File

@ -61,6 +61,12 @@ export const teamRouter = router({
update: authenticatedProcedure
.input(ZUpdateTeamEmailMutationSchema)
.mutation(async ({ input, ctx }) => {
ctx.logger.info({
input: {
teamId: input.teamId,
},
});
return await updateTeamEmail({
userId: ctx.user.id,
...input,
@ -69,39 +75,71 @@ export const teamRouter = router({
delete: authenticatedProcedure
.input(ZDeleteTeamEmailMutationSchema)
.mutation(async ({ input, ctx }) => {
const { teamId } = input;
ctx.logger.info({
input: {
teamId,
},
});
return await deleteTeamEmail({
userId: ctx.user.id,
userEmail: ctx.user.email,
...input,
teamId,
});
}),
verification: {
send: authenticatedProcedure
.input(ZCreateTeamEmailVerificationMutationSchema)
.mutation(async ({ input, ctx }) => {
const { teamId, email, name } = input;
ctx.logger.info({
input: {
teamId,
},
});
return await createTeamEmailVerification({
teamId: input.teamId,
teamId,
userId: ctx.user.id,
data: {
email: input.email,
name: input.name,
email,
name,
},
});
}),
resend: authenticatedProcedure
.input(ZResendTeamEmailVerificationMutationSchema)
.mutation(async ({ input, ctx }) => {
const { teamId } = input;
ctx.logger.info({
input: {
teamId,
},
});
await resendTeamEmailVerification({
userId: ctx.user.id,
...input,
teamId,
});
}),
delete: authenticatedProcedure
.input(ZDeleteTeamEmailVerificationMutationSchema)
.mutation(async ({ input, ctx }) => {
const { teamId } = input;
ctx.logger.info({
input: {
teamId,
},
});
return await deleteTeamEmailVerification({
userId: ctx.user.id,
...input,
teamId,
});
}),
},

9
packages/trpc/server/team-router/update-team-group.ts
View File

@ -19,6 +19,15 @@ export const updateTeamGroupRoute = authenticatedProcedure
const { id, data } = input;
const { user } = ctx;
ctx.logger.info({
input: {
id,
data: {
teamRole: data.teamRole,
},
},
});
const teamGroup = await prisma.teamGroup.findFirst({
where: {
id,

7
packages/trpc/server/team-router/update-team-member.ts
View File

@ -22,6 +22,13 @@ export const updateTeamMemberRoute = authenticatedProcedure
const { teamId, memberId, data } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
teamId,
memberId,
},
});
const team = await prisma.team.findFirst({
where: {
AND: [

6
packages/trpc/server/team-router/update-team-settings.ts
View File

@ -16,6 +16,12 @@ export const updateTeamSettingsRoute = authenticatedProcedure
const { user } = ctx;
const { teamId, data } = input;
ctx.logger.info({
input: {
teamId,
},
});
const {
// Document related settings.
documentVisibility,

6
packages/trpc/server/team-router/update-team.ts
View File

@ -13,6 +13,12 @@ export const updateTeamRoute = authenticatedProcedure
const { name, url, profileBio, profileEnabled } = data;
ctx.logger.info({
input: {
teamId,
},
});
if (name || url) {
await updateTeam({
userId: ctx.user.id,

76
packages/trpc/server/template-router/router.ts
View File

@ -67,6 +67,12 @@ export const templateRouter = router({
.query(async ({ input, ctx }) => {
const { teamId } = ctx;
ctx.logger.info({
input: {
folderId: input.folderId,
},
});
return await findTemplates({
userId: ctx.user.id,
teamId,
@ -92,6 +98,12 @@ export const templateRouter = router({
const { teamId } = ctx;
const { templateId } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await getTemplateById({
id: templateId,
userId: ctx.user.id,
@ -120,6 +132,12 @@ export const templateRouter = router({
const { teamId } = ctx;
const { title, templateDocumentDataId, folderId } = input;
ctx.logger.info({
input: {
folderId,
},
});
return await createTemplate({
userId: ctx.user.id,
teamId,
@ -146,9 +164,14 @@ export const templateRouter = router({
.mutation(async ({ input, ctx }) => {
const { teamId } = ctx;
const { templateId, data, meta } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
templateId,
},
});
return await updateTemplate({
userId,
teamId,
@ -176,6 +199,12 @@ export const templateRouter = router({
const { teamId } = ctx;
const { templateId } = input;
ctx.logger.info({
input: {
templateId,
},
});
return await duplicateTemplate({
userId: ctx.user.id,
teamId,
@ -200,9 +229,14 @@ export const templateRouter = router({
.mutation(async ({ input, ctx }) => {
const { teamId } = ctx;
const { templateId } = input;
const userId = ctx.user.id;
ctx.logger.info({
input: {
templateId,
},
});
await deleteTemplate({ userId, id: templateId, teamId });
return ZGenericSuccessResponse;
@ -228,6 +262,12 @@ export const templateRouter = router({
const { templateId, recipients, distributeDocument, customDocumentDataId, prefillFields } =
input;
ctx.logger.info({
input: {
templateId,
},
});
const limits = await getServerLimits({ userId: ctx.user.id, teamId });
if (limits.remaining.documents === 0) {
@ -291,6 +331,12 @@ export const templateRouter = router({
templateUpdatedAt,
} = input;
ctx.logger.info({
input: {
directTemplateToken,
},
});
return await createDocumentFromDirectTemplate({
directRecipientName,
directRecipientEmail,
@ -330,6 +376,13 @@ export const templateRouter = router({
const userId = ctx.user.id;
ctx.logger.info({
input: {
templateId,
directRecipientId,
},
});
const template = await getTemplateById({ id: templateId, teamId, userId: ctx.user.id });
const limits = await getServerLimits({ userId: ctx.user.id, teamId: template.teamId });
@ -364,6 +417,12 @@ export const templateRouter = router({
const userId = ctx.user.id;
ctx.logger.info({
input: {
templateId,
},
});
await deleteTemplateDirectLink({ userId, teamId, templateId });
return ZGenericSuccessResponse;
@ -390,6 +449,12 @@ export const templateRouter = router({
const userId = ctx.user.id;
ctx.logger.info({
input: {
templateId,
},
});
return await toggleTemplateDirectLink({ userId, teamId, templateId, enabled });
}),
@ -402,6 +467,13 @@ export const templateRouter = router({
const { templateId, teamId, csv, sendImmediately } = input;
const { user } = ctx;
ctx.logger.info({
input: {
templateId,
teamId,
},
});
if (csv.length > 4 * 1024 * 1024) {
throw new TRPCError({
code: 'BAD_REQUEST',

90
packages/trpc/server/trpc.ts
View File

@ -4,7 +4,9 @@ import type { AnyZodObject } from 'zod';
import { AppError, genericErrorCodeToTrpcErrorCodeMap } from '@documenso/lib/errors/app-error';
import { getApiTokenByToken } from '@documenso/lib/server-only/public-api/get-api-token-by-token';
import type { TrpcApiLog } from '@documenso/lib/types/api-logs';
import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
import { alphaid } from '@documenso/lib/universal/id';
import { isAdmin } from '@documenso/lib/utils/is-admin';
import type { TrpcContext } from './context';
@ -65,7 +67,15 @@ const t = initTRPC
/**
* Middlewares
*/
export const authenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
export const authenticatedMiddleware = t.middleware(async ({ ctx, next, path }) => {
const infoToLog: TrpcApiLog = {
path,
auth: ctx.metadata.auth,
source: ctx.metadata.source,
trpcMiddleware: 'authenticated',
unverifiedTeamId: ctx.teamId,
};
const authorizationHeader = ctx.req.headers.get('authorization');
// Taken from `authenticatedMiddleware` in `@documenso/api/v1/middleware/authenticated.ts`.
@ -79,6 +89,12 @@ export const authenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
const apiToken = await getApiTokenByToken({ token });
ctx.logger.info({
...infoToLog,
userId: apiToken.user.id,
apiTokenId: apiToken.id,
} satisfies TrpcApiLog);
return await next({
ctx: {
...ctx,
@ -111,9 +127,21 @@ export const authenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
});
}
// Recreate the logger with a sub request ID to differentiate between batched requests.
const trpcSessionLogger = ctx.logger.child({
nonBatchedRequestId: alphaid(),
});
trpcSessionLogger.info({
...infoToLog,
userId: ctx.user.id,
apiTokenId: null,
} satisfies TrpcApiLog);
return await next({
ctx: {
...ctx,
logger: trpcSessionLogger,
user: ctx.user,
session: ctx.session,
metadata: {
@ -129,10 +157,26 @@ export const authenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
});
});
export const maybeAuthenticatedMiddleware = t.middleware(async ({ ctx, next }) => {
export const maybeAuthenticatedMiddleware = t.middleware(async ({ ctx, next, path }) => {
// Recreate the logger with a sub request ID to differentiate between batched requests.
const trpcSessionLogger = ctx.logger.child({
nonBatchedRequestId: alphaid(),
});
ctx.logger.info({
path,
auth: ctx.metadata.auth,
source: ctx.metadata.source,
userId: ctx.user?.id,
apiTokenId: null,
trpcMiddleware: 'maybeAuthenticated',
unverifiedTeamId: ctx.teamId,
} satisfies TrpcApiLog);
return await next({
ctx: {
...ctx,
logger: trpcSessionLogger,
user: ctx.user,
session: ctx.session,
metadata: {
@ -150,7 +194,7 @@ export const maybeAuthenticatedMiddleware = t.middleware(async ({ ctx, next }) =
});
});
export const adminMiddleware = t.middleware(async ({ ctx, next }) => {
export const adminMiddleware = t.middleware(async ({ ctx, next, path }) => {
if (!ctx.session || !ctx.user) {
throw new TRPCError({
code: 'UNAUTHORIZED',
@ -167,9 +211,24 @@ export const adminMiddleware = t.middleware(async ({ ctx, next }) => {
});
}
// Recreate the logger with a sub request ID to differentiate between batched requests.
const trpcSessionLogger = ctx.logger.child({
nonBatchedRequestId: alphaid(),
});
trpcSessionLogger.info({
path,
auth: ctx.metadata.auth,
source: ctx.metadata.source,
userId: ctx.user.id,
apiTokenId: null,
trpcMiddleware: 'admin',
} satisfies TrpcApiLog);
return await next({
ctx: {
...ctx,
logger: trpcSessionLogger,
user: ctx.user,
session: ctx.session,
metadata: {
@ -185,11 +244,34 @@ export const adminMiddleware = t.middleware(async ({ ctx, next }) => {
});
});
export const procedureMiddleware = t.middleware(async ({ ctx, next, path }) => {
// Recreate the logger with a sub request ID to differentiate between batched requests.
const trpcSessionLogger = ctx.logger.child({
nonBatchedRequestId: alphaid(),
});
trpcSessionLogger.info({
path,
auth: ctx.metadata.auth,
source: ctx.metadata.source,
userId: ctx.user?.id,
apiTokenId: null,
trpcMiddleware: 'procedure',
} satisfies TrpcApiLog);
return await next({
ctx: {
...ctx,
logger: trpcSessionLogger,
},
});
});
/**
* Routers and Procedures
*/
export const router = t.router;
export const procedure = t.procedure;
export const procedure = t.procedure.use(procedureMiddleware);
export const authenticatedProcedure = t.procedure.use(authenticatedMiddleware);
// While this is functionally the same as `procedure`, it's useful for indicating purpose
export const maybeAuthenticatedProcedure = t.procedure.use(maybeAuthenticatedMiddleware);

33
packages/trpc/server/webhook-router/router.ts
View File

@ -19,6 +19,12 @@ export const webhookRouter = router({
.query(async ({ ctx, input }) => {
const { teamId } = input;
ctx.logger.info({
input: {
teamId,
},
});
return await getWebhooksByTeamId(teamId, ctx.user.id);
}),
@ -27,6 +33,13 @@ export const webhookRouter = router({
.query(async ({ input, ctx }) => {
const { id, teamId } = input;
ctx.logger.info({
input: {
id,
teamId,
},
});
return await getWebhookById({
id,
userId: ctx.user.id,
@ -39,6 +52,12 @@ export const webhookRouter = router({
.mutation(async ({ input, ctx }) => {
const { enabled, eventTriggers, secret, webhookUrl, teamId } = input;
ctx.logger.info({
input: {
teamId,
},
});
return await createWebhook({
enabled,
secret,
@ -54,6 +73,13 @@ export const webhookRouter = router({
.mutation(async ({ input, ctx }) => {
const { id, teamId } = input;
ctx.logger.info({
input: {
id,
teamId,
},
});
return await deleteWebhookById({
id,
teamId,
@ -66,6 +92,13 @@ export const webhookRouter = router({
.mutation(async ({ input, ctx }) => {
const { id, teamId, ...data } = input;
ctx.logger.info({
input: {
id,
teamId,
},
});
return await editWebhook({
id,
data,