Skip to content

The Open Source DocuSign Alternative.

chore: merge main

Catalin Pit4d6e780abe5b
diff --cc apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx
index 5b7a1b739,572c91c76..29e11621f
--- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx
+++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx
@@@ -35,32 -36,21 +36,34 @@@ export const DesktopNav = ({ className
</Button>
</Link>
- <Link href="/settings/teams">
- <Button
- variant="ghost"
- className={cn(
- 'w-full justify-start',
- pathname?.startsWith('/settings/teams') && 'bg-secondary',
- )}
- >
- <Users className="mr-2 h-5 w-5" />
- Teams
- </Button>
- </Link>
+ {isTeamsEnabled && (
+ <Link href="/settings/teams">
+ <Button
+ variant="ghost"
+ className={cn(
+ 'w-full justify-start',
+ pathname?.startsWith('/settings/teams') && 'bg-secondary',
+ )}
+ >
+ <Users className="mr-2 h-5 w-5" />
+ Teams
+ </Button>
+ </Link>
+ )}
+ <Link href="/settings/webhooks">
+ <Button
+ variant="ghost"
+ className={cn(
+ 'w-full justify-start',
+ pathname?.startsWith('/settings/webhooks') && 'bg-secondary',
+ )}
+ >
+ <Webhook className="mr-2 h-5 w-5" />
+ Webhooks
+ </Button>
+ </Link>
+
<Link href="/settings/security">
<Button
variant="ghost"
diff --cc apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx
index 28bbf747d,291c941f6..37ab7484e
--- a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx
+++ b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx
@@@ -38,32 -39,21 +39,34 @@@ export const MobileNav = ({ className,
</Button>
</Link>
- <Link href="/settings/teams">
- <Button
- variant="ghost"
- className={cn(
- 'w-full justify-start',
- pathname?.startsWith('/settings/teams') && 'bg-secondary',
- )}
- >
- <Users className="mr-2 h-5 w-5" />
- Teams
- </Button>
- </Link>
+ {isTeamsEnabled && (
+ <Link href="/settings/teams">
+ <Button
+ variant="ghost"
+ className={cn(
+ 'w-full justify-start',
+ pathname?.startsWith('/settings/teams') && 'bg-secondary',
+ )}
+ >
+ <Users className="mr-2 h-5 w-5" />
+ Teams
+ </Button>
+ </Link>
+ )}
+ <Link href="/settings/webhooks">
+ <Button
+ variant="ghost"
+ className={cn(
+ 'w-full justify-start',
+ pathname?.startsWith('/settings/webhooks') && 'bg-secondary',
+ )}
+ >
+ <Webhook className="mr-2 h-5 w-5" />
+ Webhooks
+ </Button>
+ </Link>
+
<Link href="/settings/security">
<Button
variant="ghost"
diff --cc packages/lib/server-only/document/complete-document-with-token.ts
index b1438f0ce,b0e7e024f..ae729e200
--- a/packages/lib/server-only/document/complete-document-with-token.ts
+++ b/packages/lib/server-only/document/complete-document-with-token.ts
@@@ -1,20 -1,28 +1,24 @@@
'use server';
+ import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
+ import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
+ import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
import { prisma } from '@documenso/prisma';
import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';
+import { WebhookTriggerEvents } from '@documenso/prisma/client';
+import { triggerWebhook } from '../../universal/trigger-webhook';
import { sealDocument } from './seal-document';
import { sendPendingEmail } from './send-pending-email';
export type CompleteDocumentWithTokenOptions = {
token: string;
documentId: number;
+ requestMetadata?: RequestMetadata;
};
-export const completeDocumentWithToken = async ({
- token,
- documentId,
- requestMetadata,
-}: CompleteDocumentWithTokenOptions) => {
- 'use server';
-
- const document = await prisma.document.findFirstOrThrow({
+const getDocument = async ({ token, documentId }: CompleteDocumentWithTokenOptions) => {
+ return await prisma.document.findFirstOrThrow({
where: {
id: documentId,
Recipient: {
@@@ -31,15 -39,6 +35,16 @@@
},
},
});
+};
+
+export const completeDocumentWithToken = async ({
+ token,
+ documentId,
++ requestMetadata,
+}: CompleteDocumentWithTokenOptions) => {
+ 'use server';
+
+ const document = await getDocument({ token, documentId });
if (document.status === DocumentStatus.COMPLETED) {
throw new Error(`Document ${document.id} has already been completed`);
@@@ -105,13 -122,6 +128,13 @@@
});
if (documents.count > 0) {
- await sealDocument({ documentId: document.id });
+ await sealDocument({ documentId: document.id, requestMetadata });
}
+
+ const updatedDocument = await getDocument({ token, documentId });
+
+ await triggerWebhook({
+ eventTrigger: WebhookTriggerEvents.DOCUMENT_SIGNED,
+ documentData: updatedDocument,
+ });
};
diff --cc packages/lib/server-only/document/create-document.ts
index 82dacfba7,7243652f0..d7d8b58e4
--- a/packages/lib/server-only/document/create-document.ts
+++ b/packages/lib/server-only/document/create-document.ts
@@@ -1,9 -1,10 +1,13 @@@
'use server';
+ import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+ import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
+ import type { RequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
+ import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
import { prisma } from '@documenso/prisma';
+import { WebhookTriggerEvents } from '@documenso/prisma/client';
+
+import { triggerWebhook } from '../../universal/trigger-webhook';
export type CreateDocumentOptions = {
title: string;
@@@ -41,11 -51,18 +54,23 @@@ export const createDocument = async (
},
});
+ await tx.documentAuditLog.create({
+ data: createDocumentAuditLogData({
+ type: DOCUMENT_AUDIT_LOG_TYPE.DOCUMENT_CREATED,
+ documentId: document.id,
+ user,
+ requestMetadata,
+ data: {
+ title,
+ },
+ }),
+ });
+
+ await triggerWebhook({
+ eventTrigger: WebhookTriggerEvents.DOCUMENT_CREATED,
- documentData: createdDocument,
++ documentData: document,
+ });
+
- return createdDocument;
+ return document;
});
};
diff --cc packages/lib/server-only/document/resend-document.tsx
index d72da3a8d,0dbda803e..eeafe0b90
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@@@ -9,8 -16,9 +16,8 @@@ import { prisma } from '@documenso/pris
import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
import type { Prisma } from '@documenso/prisma/client';
- import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles';
-import { getDocumentWhereInput } from './get-document-by-id';
-
+ import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+import { getDocumentWhereInput } from './get-document-by-id';
export type ResendDocumentOptions = {
documentId: number;