fix: resolve issues with open graph asset loading

apps/marketing/package.json

@@ -20,7 +20,7 @@
     "framer-motion": "^10.12.8",
     "lucide-react": "^0.214.0",
     "micro": "^10.0.1",
-    "next": "13.4.12",
+    "next": "13.5.2",
     "next-auth": "4.22.3",
     "next-contentlayer": "^0.3.4",
     "next-plausible": "^3.10.1",

apps/web/package.json

@@ -24,7 +24,7 @@
     "lucide-react": "^0.214.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "13.4.12",
+    "next": "13.5.2",
     "next-auth": "4.22.3",
     "next-plausible": "^3.10.1",
     "next-themes": "^0.2.1",

apps/web/public/next.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

apps/web/public/vercel.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

apps/web/src/app/(share)/share/[slug]/opengraph-image.tsx

@@ -4,7 +4,8 @@ import { P, match } from 'ts-pattern';
 
 import { getRecipientOrSenderByShareLinkSlug } from '@documenso/lib/server-only/share/get-recipient-or-sender-by-share-link-slug';
 
-export const runtime = 'edge';
+import { Logo } from '~/components/branding/logo';
+import { getAssetBuffer } from '~/helpers/get-asset-buffer';
 
 const CARD_OFFSET_TOP = 152;
 const CARD_OFFSET_LEFT = 350;
@@ -21,12 +22,21 @@ type SharePageOpenGraphImageProps = {
 };
 
 export default async function Image({ params: { slug } }: SharePageOpenGraphImageProps) {
+  const [interSemiBold, interRegular, caveatRegular, shareFrameImage] = await Promise.all([
+    getAssetBuffer('/fonts/inter-semibold.ttf'),
+    getAssetBuffer('/fonts/inter-regular.ttf'),
+    getAssetBuffer('/fonts/caveat-regular.ttf'),
+    getAssetBuffer('/static/og-share-frame.png'),
+  ]);
+
   const recipientOrSender = await getRecipientOrSenderByShareLinkSlug({ slug }).catch(() => null);
 
   if (!recipientOrSender) {
     return null;
   }
 
+  const isRecipient = 'Signature' in recipientOrSender;
+
   const signatureImage = match(recipientOrSender)
     .with({ Signature: P.array(P._) }, (recipient) => {
       return recipient.Signature?.[0]?.signatureImageAsBase64 || null;
@@ -43,30 +53,20 @@ export default async function Image({ params: { slug } }: SharePageOpenGraphImag
       return sender.name || sender.email;
     });
 
-  const [interSemiBold, interRegular, caveatRegular, shareFrameImage] = await Promise.all([
-    fetch(new URL('./../../../../assets/inter-semibold.ttf', import.meta.url)).then(async (res) =>
-      res.arrayBuffer(),
-    ),
-    fetch(new URL('./../../../../assets/inter-regular.ttf', import.meta.url)).then(async (res) =>
-      res.arrayBuffer(),
-    ),
-    fetch(new URL('./../../../../assets/caveat-regular.ttf', import.meta.url)).then(async (res) =>
-      res.arrayBuffer(),
-    ),
-    fetch(new URL('./../../../../assets/og-share-frame.png', import.meta.url)).then(async (res) =>
-      res.arrayBuffer(),
-    ),
-  ]);
-
   return new ImageResponse(
     (
       <div tw="relative flex h-full w-full">
         {/* @ts-expect-error Lack of typing from ImageResponse */}
         <img src={shareFrameImage} alt="og-share-frame" tw="absolute inset-0 w-full h-full" />
 
+        <div tw="absolute top-20 flex w-full items-center justify-center">
+          {/* @ts-expect-error Lack of typing from ImageResponse */}
+          <Logo tw="h-8 w-60" />
+        </div>
+
         {signatureImage ? (
           <div
-            tw="absolute py-6 px-12 -mt-2 flex items-center justify-center text-center"
+            tw="absolute py-6 px-12 flex items-center justify-center text-center"
             style={{
               top: `${CARD_OFFSET_TOP}px`,
               left: `${CARD_OFFSET_LEFT}px`,
@@ -74,11 +74,11 @@ export default async function Image({ params: { slug } }: SharePageOpenGraphImag
               height: `${CARD_HEIGHT}px`,
             }}
           >
-            <img src={signatureImage} alt="signature" tw="w-full h-full" />
+            <img src={signatureImage} alt="signature" tw="opacity-60 h-full max-w-[100%]" />
           </div>
         ) : (
           <p
-            tw="absolute py-6 px-12 -mt-2 flex items-center justify-center text-center"
+            tw="absolute py-6 px-12 -mt-2 flex items-center justify-center text-center text-slate-500"
             style={{
               fontFamily: 'Caveat',
               fontSize: `${Math.max(
@@ -95,20 +95,34 @@ export default async function Image({ params: { slug } }: SharePageOpenGraphImag
           </p>
         )}
 
+        {/* <div
+          tw="absolute flex items-center justify-center text-slate-500"
+          style={{
+            top: `${CARD_OFFSET_TOP + CARD_HEIGHT - 45}px`,
+            left: `${CARD_OFFSET_LEFT}`,
+            width: `${CARD_WIDTH}px`,
+            fontSize: '30px',
+          }}
+        >
+          {signatureName}
+        </div> */}
+
         <div
-          tw="absolute absolute flex flex-col items-center justify-center pt-2.5 w-full"
+          tw="absolute flex flex-col items-center justify-center pt-12 w-full"
           style={{
             top: `${CARD_OFFSET_TOP + CARD_HEIGHT}px`,
           }}
         >
           <h2
-            tw="text-2xl text-slate-900/60"
+            tw="text-3xl text-slate-500"
             style={{
               fontFamily: 'Inter',
               fontWeight: 600,
             }}
           >
-            I just signed with Documenso
+            {isRecipient
+              ? 'I just signed with Documenso and you can too!'
+              : 'I just sent a document with Documenso and you can too!'}
           </h2>
         </div>
       </div>

apps/web/src/app/(share)/share/[slug]/page.tsx

@@ -1,38 +1,11 @@
-import React from 'react';
-
 import { Metadata } from 'next';
-import { notFound } from 'next/navigation';
 
-import { getShareLinkBySlug } from '@documenso/lib/server-only/share/get-share-link-by-slug';
-
-import Redirect from './redirect';
+import { Redirect } from './redirect';
 
 export const metadata: Metadata = {
   title: 'Documenso - Share',
 };
 
-export type SharePageProps = {
-  params: {
-    slug?: string;
-  };
-};
-
-export default async function SharePage({ params: { slug } }: SharePageProps) {
-  if (!slug) {
-    return notFound();
-  }
-
-  const share = await getShareLinkBySlug({ slug }).catch(() => null);
-
-  if (!share) {
-    return notFound();
-  }
-
-  return (
-    <div className="flex h-screen flex-col items-center justify-center">
-      <h1 className="my-2 text-4xl font-semibold">Share Page</h1>
-      <p className="my-2 text-xl">Redirecting...</p>
-      <Redirect />
-    </div>
-  );
+export default function SharePage() {
+  return <Redirect />;
 }

apps/web/src/app/(share)/share/[slug]/redirect.tsx

@@ -2,18 +2,10 @@
 
 import { useEffect } from 'react';
 
-import { useRouter } from 'next/navigation';
-
-export default function Redirect() {
-  const { push } = useRouter();
-
+export const Redirect = () => {
   useEffect(() => {
-    const timer = setTimeout(() => {
-      push('/');
-    }, 3000);
+    window.location.href = process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001';
+  }, []);
 
-    return () => clearTimeout(timer);
-  }, [push]);
-
-  return <div></div>;
-}
+  return null;
+};

apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx

@@ -2,12 +2,13 @@
 
 import { HTMLAttributes } from 'react';
 
-import { useRouter } from 'next/navigation';
-
 import { Share } from 'lucide-react';
 
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
 
 export type ShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
   token: string;
@@ -15,29 +16,35 @@ export type ShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
 };
 
 export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
+  const { toast } = useToast();
+  const [, copyToClipboard] = useCopyToClipboard();
+
   const { mutateAsync: createOrGetShareLink, isLoading } =
     trpc.shareLink.createOrGetShareLink.useMutation();
 
-  const router = useRouter();
+  const onShareClick = async () => {
+    const { slug } = await createOrGetShareLink({
+      token: token,
+      documentId,
+    });
+
+    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+
+    toast({
+      title: 'Copied to clipboard',
+      description: 'The sharing link has been copied to your clipboard.',
+    });
+  };
 
   return (
     <Button
       variant="outline"
       className="flex-1"
-      disabled={!token || !documentId || isLoading}
-      onClick={async () => {
-        console.log('Signing Clicked');
-
-        const { slug } = await createOrGetShareLink({
-          token,
-          documentId,
-        });
-
-        // TODO: Router delaying...
-        return router.push(`/share/${slug}`);
-      }}
+      disabled={!token || !documentId}
+      loading={isLoading}
+      onClick={onShareClick}
     >
-      <Share className="mr-2 h-5 w-5" />
+      {!isLoading && <Share className="mr-2 h-5 w-5" />}
       Share
     </Button>
   );

apps/web/src/helpers/get-asset-buffer.ts

@@ -0,0 +1,14 @@
+/**
+ * getAssetBuffer is used to retrieve array buffers for various assets
+ * that are hosted in the `public` folder.
+ *
+ * This exists due to a breakage with `import.meta.url` imports and open graph images,
+ * once we can identify a fix for this, we can remove this helper.
+ *
+ * @param path The path to the asset, relative to the `public` folder.
+ */
+export const getAssetBuffer = async (path: string) => {
+  const baseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
+
+  return fetch(new URL(path, baseUrl)).then(async (res) => res.arrayBuffer());
+};