Skip to content

The Open Source DocuSign Alternative.

fix: mask recipient token (#1051)

Catalin Pitc8a09099a372
diff --git a/apps/web/src/components/(dashboard)/common/command-menu.tsx b/apps/web/src/components/(dashboard)/common/command-menu.tsx
index bdc6c2064..812efd4b9 100644
--- a/apps/web/src/components/(dashboard)/common/command-menu.tsx
+++ b/apps/web/src/components/(dashboard)/common/command-menu.tsx
@@ -5,7 +5,6 @@ import { useCallback, useMemo, useState } from 'react';
import { useRouter } from 'next/navigation';
import { Loader, Monitor, Moon, Sun } from 'lucide-react';
-import { useSession } from 'next-auth/react';
import { useTheme } from 'next-themes';
import { useHotkeys } from 'react-hotkeys-hook';
@@ -18,7 +17,6 @@ import {
DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
SKIP_QUERY_BATCH_META,
} from '@documenso/lib/constants/trpc';
-import type { Document, Recipient } from '@documenso/prisma/client';
import { trpc as trpcReact } from '@documenso/trpc/react';
import {
CommandDialog,
@@ -71,7 +69,6 @@ export type CommandMenuProps = {
export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
const { setTheme } = useTheme();
- const { data: session } = useSession();
const router = useRouter();
@@ -93,17 +90,6 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
},
);
- const isOwner = useCallback(
- (document: Document) => document.userId === session?.user.id,
- [session?.user.id],
- );
-
- const getSigningLink = useCallback(
- (recipients: Recipient[]) =>
- `/sign/${recipients.find((r) => r.email === session?.user.email)?.token}`,
- [session?.user.email],
- );
-
const searchResults = useMemo(() => {
if (!searchDocumentsData) {
return [];
@@ -111,10 +97,10 @@ export function CommandMenu({ open, onOpenChange }: CommandMenuProps) {
return searchDocumentsData.map((document) => ({
label: document.title,
- path: isOwner(document) ? `/documents/${document.id}` : getSigningLink(document.Recipient),
- value: [document.id, document.title, ...document.Recipient.map((r) => r.email)].join(' '),
+ path: document.path,
+ value: document.value,
}));
- }, [searchDocumentsData, isOwner, getSigningLink]);
+ }, [searchDocumentsData]);
const currentPage = pages[pages.length - 1];
diff --git a/packages/lib/server-only/document/search-documents-with-keyword.ts b/packages/lib/server-only/document/search-documents-with-keyword.ts
index 8125ae900..a9139f5d3 100644
--- a/packages/lib/server-only/document/search-documents-with-keyword.ts
+++ b/packages/lib/server-only/document/search-documents-with-keyword.ts
@@ -1,7 +1,6 @@
import { prisma } from '@documenso/prisma';
import { DocumentStatus } from '@documenso/prisma/client';
-
-import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document';
+import type { Document, Recipient, User } from '@documenso/prisma/client';
export type SearchDocumentsWithKeywordOptions = {
query: string;
@@ -79,12 +78,19 @@ export const searchDocumentsWithKeyword = async ({
take: limit,
});
- const maskedDocuments = documents.map((document) =>
- maskRecipientTokensForDocument({
- document,
- user,
- }),
- );
+ const isOwner = (document: Document, user: User) => document.userId === user.id;
+ const getSigningLink = (recipients: Recipient[], user: User) =>
+ `/sign/${recipients.find((r) => r.email === user.email)?.token}`;
+
+ const maskedDocuments = documents.map((document) => {
+ const { Recipient, ...documentWithoutRecipient } = document;
+
+ return {
+ ...documentWithoutRecipient,
+ path: isOwner(document, user) ? `/documents/${document.id}` : getSigningLink(Recipient, user),
+ value: [document.id, document.title, ...document.Recipient.map((r) => r.email)].join(' '),
+ };
+ });
return maskedDocuments;
};
diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts
index 3cc61bef2..d12002674 100644
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@@ -358,6 +358,7 @@ export const documentRouter = router({
query,
userId: ctx.user.id,
});
+
return documents;
} catch (err) {
console.error(err);