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

fix: implement review feedback, resolve build errors

Browse Source
This commit is contained in:
Mythie
2024-04-10 17:38:34 +07:00
parent c9b4915fc8
commit 4d4dfd3c5f
8 changed files with 155 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/next.config.js
View File

@ -23,7 +23,7 @@ const config = {
output: process.env.DOCKER_OUTPUT ? 'standalone' : undefined,
experimental: {
outputFileTracingRoot: path.join(__dirname, '../../'),
serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign'],
serverComponentsExternalPackages: ['@node-rs/bcrypt', '@documenso/pdf-sign', 'playwright'],
serverActions: {
bodySizeLimit: '50mb',
},

59
apps/web/src/app/(dashboard)/documents/[id]/logs/download-audit-log-button.tsx
View File

@ -5,6 +5,7 @@ import { DownloadIcon } from 'lucide-react';
import { trpc } from '@documenso/trpc/react';
import { cn } from '@documenso/ui/lib/utils';
import { Button } from '@documenso/ui/primitives/button';
import { useToast } from '@documenso/ui/primitives/use-toast';
export type DownloadAuditLogButtonProps = {
className?: string;
@ -12,40 +13,52 @@ export type DownloadAuditLogButtonProps = {
};
export const DownloadAuditLogButton = ({ className, documentId }: DownloadAuditLogButtonProps) => {
const { toast } = useToast();
const { mutateAsync: downloadAuditLogs, isLoading } =
trpc.document.downloadAuditLogs.useMutation();
const onDownloadAuditLogsClick = async () => {
const { url } = await downloadAuditLogs({ documentId });
try {
const { url } = await downloadAuditLogs({ documentId });
const iframe = Object.assign(document.createElement('iframe'), {
src: url,
});
const iframe = Object.assign(document.createElement('iframe'), {
src: url,
});
Object.assign(iframe.style, {
position: 'fixed',
top: '0',
left: '0',
width: '0',
height: '0',
});
Object.assign(iframe.style, {
position: 'fixed',
top: '0',
left: '0',
width: '0',
height: '0',
});
const onLoaded = () => {
if (iframe.contentDocument?.readyState === 'complete') {
iframe.contentWindow?.print();
const onLoaded = () => {
if (iframe.contentDocument?.readyState === 'complete') {
iframe.contentWindow?.print();
iframe.contentWindow?.addEventListener('afterprint', () => {
document.body.removeChild(iframe);
});
}
};
iframe.contentWindow?.addEventListener('afterprint', () => {
document.body.removeChild(iframe);
});
}
};
// When the iframe has loaded, print the iframe and remove it from the dom
iframe.addEventListener('load', onLoaded);
// When the iframe has loaded, print the iframe and remove it from the dom
iframe.addEventListener('load', onLoaded);
document.body.appendChild(iframe);
document.body.appendChild(iframe);
onLoaded();
onLoaded();
} catch (error) {
console.error(error);
toast({
title: 'Something went wrong',
description: 'Sorry, we were unable to download the audit logs. Please try again later.',
variant: 'destructive',
});
}
};
return (

59
apps/web/src/app/(dashboard)/documents/[id]/logs/download-certificate-button.tsx
View File

@ -5,6 +5,7 @@ import { DownloadIcon } from 'lucide-react';
import { trpc } from '@documenso/trpc/react';
import { cn } from '@documenso/ui/lib/utils';
import { Button } from '@documenso/ui/primitives/button';
import { useToast } from '@documenso/ui/primitives/use-toast';
export type DownloadCertificateButtonProps = {
className?: string;
@ -15,40 +16,52 @@ export const DownloadCertificateButton = ({
className,
documentId,
}: DownloadCertificateButtonProps) => {
const { toast } = useToast();
const { mutateAsync: downloadCertificate, isLoading } =
trpc.document.downloadCertificate.useMutation();
const onDownloadCertificatesClick = async () => {
const { url } = await downloadCertificate({ documentId });
try {
const { url } = await downloadCertificate({ documentId });
const iframe = Object.assign(document.createElement('iframe'), {
src: url,
});
const iframe = Object.assign(document.createElement('iframe'), {
src: url,
});
Object.assign(iframe.style, {
position: 'fixed',
top: '0',
left: '0',
width: '0',
height: '0',
});
Object.assign(iframe.style, {
position: 'fixed',
top: '0',
left: '0',
width: '0',
height: '0',
});
const onLoaded = () => {
if (iframe.contentDocument?.readyState === 'complete') {
iframe.contentWindow?.print();
const onLoaded = () => {
if (iframe.contentDocument?.readyState === 'complete') {
iframe.contentWindow?.print();
iframe.contentWindow?.addEventListener('afterprint', () => {
document.body.removeChild(iframe);
});
}
};
iframe.contentWindow?.addEventListener('afterprint', () => {
document.body.removeChild(iframe);
});
}
};
// When the iframe has loaded, print the iframe and remove it from the dom
iframe.addEventListener('load', onLoaded);
// When the iframe has loaded, print the iframe and remove it from the dom
iframe.addEventListener('load', onLoaded);
document.body.appendChild(iframe);
document.body.appendChild(iframe);
onLoaded();
onLoaded();
} catch (error) {
console.error(error);
toast({
title: 'Something went wrong',
description: 'Sorry, we were unable to download the certificate. Please try again later.',
variant: 'destructive',
});
}
};
return (

42
apps/web/src/app/(internal)/%5F%5Fhtmltopdf/certificate/page.tsx
View File

@ -12,10 +12,7 @@ import { getEntireDocument } from '@documenso/lib/server-only/admin/get-entire-d
import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
import { getDocumentCertificateAuditLogs } from '@documenso/lib/server-only/document/get-document-certificate-audit-logs';
import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
import {
ZDocumentAuthOptionsSchema,
ZRecipientAuthOptionsSchema,
} from '@documenso/lib/types/document-auth';
import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
import { FieldType } from '@documenso/prisma/client';
import { Card, CardContent } from '@documenso/ui/primitives/card';
import {
@ -93,40 +90,30 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
return 'Unknown';
}
const documentAuthOptions = ZDocumentAuthOptionsSchema.parse(document.authOptions);
const recipientAuthOptions = ZRecipientAuthOptionsSchema.parse(recipient.authOptions);
const extractedAuthMethods = extractDocumentAuthMethods({
documentAuth: document.authOptions,
recipientAuth: recipient.authOptions,
});
let authLevel = 'Email';
if (
documentAuthOptions.globalAccessAuth === 'ACCOUNT' ||
recipientAuthOptions.accessAuth === 'ACCOUNT'
) {
if (extractedAuthMethods.derivedRecipientAccessAuth === 'ACCOUNT') {
authLevel = 'Account Authentication';
}
if (
documentAuthOptions.globalActionAuth === 'ACCOUNT' ||
recipientAuthOptions.actionAuth === 'ACCOUNT'
) {
if (extractedAuthMethods.derivedRecipientActionAuth === 'ACCOUNT') {
authLevel = 'Account Re-Authentication';
}
if (
documentAuthOptions.globalActionAuth === 'TWO_FACTOR_AUTH' ||
recipientAuthOptions.actionAuth === 'TWO_FACTOR_AUTH'
) {
authLevel = 'Two Factor Re-Authentication';
if (extractedAuthMethods.derivedRecipientActionAuth === 'TWO_FACTOR_AUTH') {
authLevel = 'Two-Factor Re-Authentication';
}
if (
documentAuthOptions.globalActionAuth === 'PASSKEY' ||
recipientAuthOptions.actionAuth === 'PASSKEY'
) {
if (extractedAuthMethods.derivedRecipientActionAuth === 'PASSKEY') {
authLevel = 'Passkey Re-Authentication';
}
if (recipientAuthOptions.actionAuth === 'EXPLICIT_NONE') {
if (extractedAuthMethods.derivedRecipientActionAuth === 'EXPLICIT_NONE') {
authLevel = 'Email';
}
@ -284,13 +271,6 @@ export default async function SigningCertificate({ searchParams }: SigningCertif
</p>
</div>
</TableCell>
{/* <TableCell truncate={false} className="w-[min-content] align-top">
<p className="text-sm text-muted-foreground print:text-xs">
Authentication: {'<authentication>'}
</p>
<p className="text-sm text-muted-foreground print:text-xs">IP: {'<ip>'}</p>
</TableCell> */}
</TableRow>
);
})}