Merge branch 'feat/refresh' into feat/marketing-share-document

fix: update share link
2025-11-12 15:53:02 +10:00 · 2023-10-12 12:23:14 +11:00 · 2023-10-12 12:22:31 +11:00 · 2023-10-12 12:14:12 +11:00 · 2023-10-12 11:33:01 +11:00 · 2023-10-11 12:02:37 +11:00
30 changed files with 102 additions and 590 deletions
--- a/.env.example
+++ b/.env.example
@ -68,7 +68,6 @@ NEXT_PRIVATE_STRIPE_API_KEY=
 NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET=
 NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID=
 NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID=
-NEXT_PUBLIC_STRIPE_FREE_PLAN_ID=

 # [[FEATURES]]
 # OPTIONAL: Leave blank to disable PostHog and feature flags.
--- a/apps/marketing/process-env.d.ts
+++ b/apps/marketing/process-env.d.ts
@ -7,7 +7,6 @@ declare namespace NodeJS {

    NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;
    NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID: string;
-    NEXT_PUBLIC_STRIPE_FREE_PLAN_ID?: string;

    NEXT_PRIVATE_STRIPE_API_KEY: string;
    NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;
--- a/apps/marketing/src/app/layout.tsx
+++ b/apps/marketing/src/app/layout.tsx
@ -4,6 +4,7 @@ import { Caveat, Inter } from 'next/font/google';

 import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag';
 import { getAllAnonymousFlags } from '@documenso/lib/universal/get-feature-flag';
+import { TrpcProvider } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Toaster } from '@documenso/ui/primitives/toaster';

@ -63,7 +64,9 @@ export default async function RootLayout({ children }: { children: React.ReactNo
      <body>
        <FeatureFlagProvider initialFlags={flags}>
          <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-            <PlausibleProvider>{children}</PlausibleProvider>
+            <PlausibleProvider>
+              <TrpcProvider>{children}</TrpcProvider>
+            </PlausibleProvider>
          </ThemeProvider>
        </FeatureFlagProvider>

--- a/apps/marketing/src/components/(marketing)/password-reveal.tsx
+++ b/apps/marketing/src/components/(marketing)/password-reveal.tsx
@ -1,9 +1,8 @@
 'use client';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
 export type PasswordRevealProps = {
  password: string;
 };
--- a/apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx
+++ b/apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx
@ -4,14 +4,13 @@ import { useEffect, useState } from 'react';

 import Link from 'next/link';

-import { Share } from 'lucide-react';
-
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
 import { base64 } from '@documenso/lib/universal/base64';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { DocumentWithRecipient } from '@documenso/prisma/types/document-with-recipient';
 import DocumentDialog from '@documenso/ui/components/document/document-dialog';
 import { DocumentDownloadButton } from '@documenso/ui/components/document/document-download-button';
+import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@ -87,11 +86,11 @@ export const SinglePlayerModeSuccess = ({ className, document }: SinglePlayerMod
      <div className="relative mt-8 w-full">
        <div className={cn('flex flex-col items-center', className)}>
          <div className="grid w-full max-w-sm grid-cols-2 gap-4">
-            {/* TODO: Hook this up */}
-            <Button variant="outline" className="flex-1 bg-transparent backdrop-blur-sm" disabled>
-              <Share className="mr-2 h-5 w-5" />
-              Share
-            </Button>
+            <DocumentShareButton
+              documentId={document.id}
+              token={document.Recipient.token}
+              className="flex-1 bg-transparent backdrop-blur-sm"
+            />

            <DocumentDownloadButton
              className="flex-1 bg-transparent backdrop-blur-sm"
@ -103,7 +102,7 @@ export const SinglePlayerModeSuccess = ({ className, document }: SinglePlayerMod
            <Button
              onClick={async () => onShowDocumentClick()}
              loading={isFetchingDocumentFile}
-              className="col-span-2"
+              className="z-10 col-span-2"
            >
              Show document
            </Button>
--- a/apps/marketing/src/pages/api/trpc/[trpc].ts
+++ b/apps/marketing/src/pages/api/trpc/[trpc].ts
@ -0,0 +1,8 @@
+import * as trpcNext from '@documenso/trpc/server/adapters/next';
+import { createTrpcContext } from '@documenso/trpc/server/context';
+import { appRouter } from '@documenso/trpc/server/router';
+
+export default trpcNext.createNextApiHandler({
+  router: appRouter,
+  createContext: async ({ req, res }) => createTrpcContext({ req, res }),
+});
--- a/apps/web/process-env.d.ts
+++ b/apps/web/process-env.d.ts
@ -7,7 +7,6 @@ declare namespace NodeJS {

    NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;
    NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID: string;
-    NEXT_PUBLIC_STRIPE_FREE_PLAN_ID?: string;

    NEXT_PRIVATE_STRIPE_API_KEY: string;
    NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
@ -6,13 +6,12 @@ import { Edit, Pencil, Share } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 import { match } from 'ts-pattern';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { Document, DocumentStatus, Recipient, SigningStatus, User } from '@documenso/prisma/client';
 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 DataTableActionButtonProps = {
  row: Document & {
    User: Pick<User, 'id' | 'name' | 'email'>;
@ -47,7 +46,7 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
      documentId: row.id,
    });

-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+    await copyToClipboard(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`).catch(() => null);

    toast({
      title: 'Copied to clipboard',
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
@ -18,6 +18,7 @@ import {
 } from 'lucide-react';
 import { useSession } from 'next-auth/react';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { Document, DocumentStatus, Recipient, User } from '@documenso/prisma/client';
 import { DocumentWithData } from '@documenso/prisma/types/document-with-data';
@ -32,8 +33,6 @@ import {
 } from '@documenso/ui/primitives/dropdown-menu';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
 import { DeleteDraftDocumentDialog } from './delete-draft-document-dialog';

 export type DataTableActionDropdownProps = {
@ -73,7 +72,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
      documentId: row.id,
    });

-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+    await copyToClipboard(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`).catch(() => null);

    toast({
      title: 'Copied to clipboard',
--- a/apps/web/src/app/(dashboard)/settings/billing/billing-plans.tsx
+++ b/apps/web/src/app/(dashboard)/settings/billing/billing-plans.tsx
@ -1,133 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { AnimatePresence, motion } from 'framer-motion';
-
-import { PriceIntervals } from '@documenso/ee/server-only/stripe/get-prices-by-interval';
-import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
-import { toHumanPrice } from '@documenso/lib/universal/stripe/to-human-price';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent, CardTitle } from '@documenso/ui/primitives/card';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { createCheckout } from './create-checkout.action';
-
-type Interval = keyof PriceIntervals;
-
-const INTERVALS: Interval[] = ['day', 'week', 'month', 'year'];
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const isInterval = (value: unknown): value is Interval => INTERVALS.includes(value as Interval);
-
-const FRIENDLY_INTERVALS: Record<Interval, string> = {
-  day: 'Daily',
-  week: 'Weekly',
-  month: 'Monthly',
-  year: 'Yearly',
-};
-
-const MotionCard = motion(Card);
-
-export type BillingPlansProps = {
-  prices: PriceIntervals;
-};
-
-export const BillingPlans = ({ prices }: BillingPlansProps) => {
-  const { toast } = useToast();
-
-  const isMounted = useIsMounted();
-
-  const [interval, setInterval] = useState<Interval>('month');
-  const [isFetchingCheckoutSession, setIsFetchingCheckoutSession] = useState(false);
-
-  const onSubscribeClick = async (priceId: string) => {
-    try {
-      setIsFetchingCheckoutSession(true);
-
-      const url = await createCheckout({ priceId });
-
-      if (!url) {
-        throw new Error('Unable to create session');
-      }
-
-      window.open(url);
-    } catch (_err) {
-      toast({
-        title: 'Something went wrong',
-        description: 'An error occurred while trying to create a checkout session.',
-        variant: 'destructive',
-      });
-    } finally {
-      setIsFetchingCheckoutSession(false);
-    }
-  };
-
-  return (
-    <div>
-      <Tabs value={interval} onValueChange={(value) => isInterval(value) && setInterval(value)}>
-        <TabsList>
-          {INTERVALS.map(
-            (interval) =>
-              prices[interval].length > 0 && (
-                <TabsTrigger key={interval} className="min-w-[150px]" value={interval}>
-                  {FRIENDLY_INTERVALS[interval]}
-                </TabsTrigger>
-              ),
-          )}
-        </TabsList>
-      </Tabs>
-
-      <div className="mt-8 grid gap-8 lg:grid-cols-2 2xl:grid-cols-3">
-        <AnimatePresence mode="wait">
-          {prices[interval].map((price) => (
-            <MotionCard
-              key={price.id}
-              initial={{ opacity: isMounted ? 0 : 1, y: isMounted ? 20 : 0 }}
-              animate={{ opacity: 1, y: 0, transition: { duration: 0.3 } }}
-              exit={{ opacity: 0, transition: { duration: 0.3 } }}
-            >
-              <CardContent className="flex h-full flex-col p-6">
-                <CardTitle>{price.product.name}</CardTitle>
-
-                <div className="text-muted-foreground mt-2 text-lg font-medium">
-                  ${toHumanPrice(price.unit_amount ?? 0)} {price.currency.toUpperCase()}{' '}
-                  <span className="text-xs">per {interval}</span>
-                </div>
-
-                <div className="text-muted-foreground mt-1.5 text-sm">
-                  {price.product.description}
-                </div>
-
-                {price.product.features && price.product.features.length > 0 && (
-                  <div className="text-muted-foreground mt-4">
-                    <div className="text-sm font-medium">Includes:</div>
-
-                    <ul className="mt-1 divide-y text-sm">
-                      {price.product.features.map((feature, index) => (
-                        <li key={index} className="py-2">
-                          {feature.name}
-                        </li>
-                      ))}
-                    </ul>
-                  </div>
-                )}
-
-                <div className="flex-1" />
-
-                <Button
-                  className="mt-4"
-                  loading={isFetchingCheckoutSession}
-                  onClick={() => void onSubscribeClick(price.id)}
-                >
-                  Subscribe
-                </Button>
-              </CardContent>
-            </MotionCard>
-          ))}
-        </AnimatePresence>
-      </div>
-    </div>
-  );
-};
--- a/apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx
+++ b/apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx
@ -1,55 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { createBillingPortal } from './create-billing-portal.action';
-
-export const BillingPortalButton = () => {
-  const { toast } = useToast();
-
-  const [isFetchingPortalUrl, setIsFetchingPortalUrl] = useState(false);
-
-  const handleFetchPortalUrl = async () => {
-    if (isFetchingPortalUrl) {
-      return;
-    }
-
-    setIsFetchingPortalUrl(true);
-
-    try {
-      const sessionUrl = await createBillingPortal();
-
-      if (!sessionUrl) {
-        throw new Error('NO_SESSION');
-      }
-
-      window.open(sessionUrl, '_blank');
-    } catch (e) {
-      let description =
-        'We are unable to proceed to the billing portal at this time. Please try again, or contact support.';
-
-      if (e.message === 'CUSTOMER_NOT_FOUND') {
-        description =
-          'You do not currently have a customer record, this should not happen. Please contact support for assistance.';
-      }
-
-      toast({
-        title: 'Something went wrong',
-        description,
-        variant: 'destructive',
-        duration: 10000,
-      });
-    }
-
-    setIsFetchingPortalUrl(false);
-  };
-
-  return (
-    <Button onClick={async () => handleFetchPortalUrl()} loading={isFetchingPortalUrl}>
-      Manage Subscription
-    </Button>
-  );
-};
--- a/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts
+++ b/apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts
@ -1,48 +0,0 @@
-'use server';
-
-import {
-  getStripeCustomerByEmail,
-  getStripeCustomerById,
-} from '@documenso/ee/server-only/stripe/get-customer';
-import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
-import { Stripe, stripe } from '@documenso/lib/server-only/stripe';
-import { getSubscriptionByUserId } from '@documenso/lib/server-only/subscription/get-subscription-by-user-id';
-
-export const createBillingPortal = async () => {
-  const { user } = await getRequiredServerComponentSession();
-
-  const existingSubscription = await getSubscriptionByUserId({ userId: user.id });
-
-  let stripeCustomer: Stripe.Customer | null = null;
-
-  // Find the Stripe customer for the current user subscription.
-  if (existingSubscription) {
-    stripeCustomer = await getStripeCustomerById(existingSubscription.customerId);
-
-    if (!stripeCustomer) {
-      throw new Error('Missing Stripe customer for subscription');
-    }
-  }
-
-  // Fallback to check if a Stripe customer already exists for the current user email.
-  if (!stripeCustomer) {
-    stripeCustomer = await getStripeCustomerByEmail(user.email);
-  }
-
-  // Create a Stripe customer if it does not exist for the current user.
-  if (!stripeCustomer) {
-    stripeCustomer = await stripe.customers.create({
-      name: user.name ?? undefined,
-      email: user.email,
-      metadata: {
-        userId: user.id,
-      },
-    });
-  }
-
-  return getPortalSession({
-    customerId: stripeCustomer.id,
-    returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
-  });
-};
--- a/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts
+++ b/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts
@ -1,59 +0,0 @@
-'use server';
-
-import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session';
-import {
-  getStripeCustomerByEmail,
-  getStripeCustomerById,
-} from '@documenso/ee/server-only/stripe/get-customer';
-import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
-import { Stripe, stripe } from '@documenso/lib/server-only/stripe';
-import { getSubscriptionByUserId } from '@documenso/lib/server-only/subscription/get-subscription-by-user-id';
-
-export type CreateCheckoutOptions = {
-  priceId: string;
-};
-
-export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => {
-  const { user } = await getRequiredServerComponentSession();
-
-  const existingSubscription = await getSubscriptionByUserId({ userId: user.id });
-
-  let stripeCustomer: Stripe.Customer | null = null;
-
-  // Find the Stripe customer for the current user subscription.
-  if (existingSubscription) {
-    stripeCustomer = await getStripeCustomerById(existingSubscription.customerId);
-
-    if (!stripeCustomer) {
-      throw new Error('Missing Stripe customer for subscription');
-    }
-
-    return getPortalSession({
-      customerId: stripeCustomer.id,
-      returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
-    });
-  }
-
-  // Fallback to check if a Stripe customer already exists for the current user email.
-  if (!stripeCustomer) {
-    stripeCustomer = await getStripeCustomerByEmail(user.email);
-  }
-
-  // Create a Stripe customer if it does not exist for the current user.
-  if (!stripeCustomer) {
-    stripeCustomer = await stripe.customers.create({
-      name: user.name ?? undefined,
-      email: user.email,
-      metadata: {
-        userId: user.id,
-      },
-    });
-  }
-
-  return getCheckoutSession({
-    customerId: stripeCustomer.id,
-    priceId,
-    returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
-  });
-};
--- a/apps/web/src/app/(dashboard)/settings/billing/page.tsx
+++ b/apps/web/src/app/(dashboard)/settings/billing/page.tsx
@ -1,18 +1,16 @@
+import Link from 'next/link';
 import { redirect } from 'next/navigation';

-import { match } from 'ts-pattern';
-
-import { getPricesByInterval } from '@documenso/ee/server-only/stripe/get-prices-by-interval';
+import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
+import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
-import { Stripe, stripe } from '@documenso/lib/server-only/stripe';
 import { getSubscriptionByUserId } from '@documenso/lib/server-only/subscription/get-subscription-by-user-id';
+import { SubscriptionStatus } from '@documenso/prisma/client';
+import { Button } from '@documenso/ui/primitives/button';

 import { LocaleDate } from '~/components/formatter/locale-date';

-import { BillingPlans } from './billing-plans';
-import { BillingPortalButton } from './billing-portal-button';
-
 export default async function BillingSettingsPage() {
  const { user } = await getRequiredServerComponentSession();

@ -23,75 +21,57 @@ export default async function BillingSettingsPage() {
    redirect('/settings/profile');
  }

-  const [subscription, prices] = await Promise.all([
-    getSubscriptionByUserId({ userId: user.id }),
-    getPricesByInterval(),
-  ]);
-
-  let subscriptionProduct: Stripe.Product | null = null;
-
-  if (subscription?.planId) {
-    const foundSubscriptionProduct = (await stripe.products.list()).data.find(
-      (item) => item.default_price === subscription.planId,
-    );
-
-    subscriptionProduct = foundSubscriptionProduct ?? null;
+  const subscription = await getSubscriptionByUserId({ userId: user.id }).then(async (sub) => {
+    if (sub) {
+      return sub;
    }

-  const isMissingOrInactiveOrFreePlan = !subscription || subscription.status === 'INACTIVE';
+    // If we don't have a customer record, create one as well as an empty subscription.
+    return createCustomer({ user });
+  });
+
+  let billingPortalUrl = '';
+
+  if (subscription.customerId) {
+    billingPortalUrl = await getPortalSession({
+      customerId: subscription.customerId,
+      returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
+    });
+  }

  return (
    <div>
      <h3 className="text-lg font-medium">Billing</h3>

-      <div className="text-muted-foreground mt-2 text-sm">
-        {isMissingOrInactiveOrFreePlan && (
-          <p>
-            You are currently on the <span className="font-semibold">Free Plan</span>.
-          </p>
-        )}
-
-        {!isMissingOrInactiveOrFreePlan &&
-          match(subscription.status)
-            .with('ACTIVE', () => (
-              <p>
-                {subscriptionProduct ? (
-                  <span>
-                    You are currently subscribed to{' '}
-                    <span className="font-semibold">{subscriptionProduct.name}</span>
-                  </span>
-                ) : (
-                  <span>You currently have an active plan</span>
-                )}
-
-                {subscription.periodEnd && (
-                  <span>
+      <p className="text-muted-foreground mt-2 text-sm">
+        Your subscription is{' '}
+        {subscription.status !== SubscriptionStatus.INACTIVE ? 'active' : 'inactive'}.
+        {subscription?.periodEnd && (
+          <>
            {' '}
-                    which is set to{' '}
-                    {subscription.cancelAtPeriodEnd ? (
-                      <span>
-                        end on{' '}
-                        <LocaleDate className="font-semibold" date={subscription.periodEnd} />.
-                      </span>
-                    ) : (
-                      <span>
-                        automatically renew on{' '}
-                        <LocaleDate className="font-semibold" date={subscription.periodEnd} />.
-                      </span>
-                    )}
+            Your next payment is due on{' '}
+            <span className="font-semibold">
+              <LocaleDate date={subscription.periodEnd} />
            </span>
+            .
+          </>
        )}
      </p>
-            ))
-            .with('PAST_DUE', () => (
-              <p>Your current plan is past due. Please update your payment information.</p>
-            ))
-            .otherwise(() => null)}
-      </div>

      <hr className="my-4" />

-      {isMissingOrInactiveOrFreePlan ? <BillingPlans prices={prices} /> : <BillingPortalButton />}
+      {billingPortalUrl && (
+        <Button asChild>
+          <Link href={billingPortalUrl}>Manage Subscription</Link>
+        </Button>
+      )}
+
+      {!billingPortalUrl && (
+        <p className="text-muted-foreground max-w-[60ch] text-base">
+          You do not currently have a customer record, this should not happen. Please contact
+          support for assistance.
+        </p>
+      )}
    </div>
  );
 }
--- a/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/complete/page.tsx
@ -9,12 +9,11 @@ import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-f
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { DocumentStatus, FieldType } from '@documenso/prisma/client';
 import { DocumentDownloadButton } from '@documenso/ui/components/document/document-download-button';
+import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';

 import signingCelebration from '~/assets/signing-celebration.png';

-import { ShareButton } from './share-button';
-
 export type CompletedSigningPageProps = {
  params: {
    token?: string;
@ -89,7 +88,7 @@ export default async function CompletedSigningPage({
          ))}

        <div className="mt-8 flex w-full max-w-sm items-center justify-center gap-4">
-          <ShareButton documentId={document.id} token={recipient.token} />
+          <DocumentShareButton documentId={document.id} token={recipient.token} />

          <DocumentDownloadButton
            className="flex-1"
--- a/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx
@ -1,6 +1,6 @@
 'use client';

-import { useMemo, useState, useTransition } from 'react';
+import { useEffect, useMemo, useState, useTransition } from 'react';

 import { useRouter } from 'next/navigation';

@ -48,6 +48,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {

  const [showSignatureModal, setShowSignatureModal] = useState(false);
  const [localSignature, setLocalSignature] = useState<string | null>(null);
+  const [isLocalSignatureSet, setIsLocalSignatureSet] = useState(false);

  const state = useMemo<SignatureFieldState>(() => {
    if (!field.inserted) {
@ -61,9 +62,16 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
    return 'signed-text';
  }, [field.inserted, signature?.signatureImageAsBase64]);

+  useEffect(() => {
+    if (!showSignatureModal && !isLocalSignatureSet) {
+      setLocalSignature(null);
+    }
+  }, [showSignatureModal, isLocalSignatureSet]);
+
  const onSign = async (source: 'local' | 'provider' = 'provider') => {
    try {
      if (!providedSignature && !localSignature) {
+        setIsLocalSignatureSet(false);
        setShowSignatureModal(true);
        return;
      }
@ -178,6 +186,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
                disabled={!localSignature}
                onClick={() => {
                  setShowSignatureModal(false);
+                  setIsLocalSignatureSet(true);
                  void onSign('local');
                }}
              >
--- a/apps/web/src/hooks/use-copy-to-clipboard.ts
+++ b/apps/web/src/hooks/use-copy-to-clipboard.ts
@ -1,28 +0,0 @@
-import { useState } from 'react';
-
-export type CopiedValue = string | null;
-export type CopyFn = (_text: string) => Promise<boolean>;
-
-export function useCopyToClipboard(): [CopiedValue, CopyFn] {
-  const [copiedText, setCopiedText] = useState<CopiedValue>(null);
-
-  const copy: CopyFn = async (text) => {
-    if (!navigator?.clipboard) {
-      console.warn('Clipboard not supported');
-      return false;
-    }
-
-    // Try to save to clipboard then save it in the state if worked
-    try {
-      await navigator.clipboard.writeText(text);
-      setCopiedText(text);
-      return true;
-    } catch (error) {
-      console.warn('Copy failed', error);
-      setCopiedText(null);
-      return false;
-    }
-  };
-
-  return [copiedText, copy];
-}
--- a/apps/web/src/pages/api/stripe/webhook/index.ts
+++ b/apps/web/src/pages/api/stripe/webhook/index.ts
@ -3,7 +3,6 @@ import { NextApiRequest, NextApiResponse } from 'next';
 import { randomBytes } from 'crypto';
 import { readFileSync } from 'fs';
 import { buffer } from 'micro';
-import { match } from 'ts-pattern';

 import { insertImageInPDF } from '@documenso/lib/server-only/pdf/insert-image-in-pdf';
 import { insertTextInPDF } from '@documenso/lib/server-only/pdf/insert-text-in-pdf';
@ -17,7 +16,6 @@ import {
  ReadStatus,
  SendStatus,
  SigningStatus,
-  SubscriptionStatus,
 } from '@documenso/prisma/client';

 const log = (...args: unknown[]) => console.log('[stripe]', ...args);
@ -56,18 +54,6 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
  );
  log('event-type:', event.type);

-  if (event.type === 'customer.subscription.updated') {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const subscription = event.data.object as Stripe.Subscription;
-
-    await handleCustomerSubscriptionUpdated(subscription);
-
-    return res.status(200).json({
-      success: true,
-      message: 'Webhook received',
-    });
-  }
-
  if (event.type === 'checkout.session.completed') {
    // This is required since we don't want to create a guard for every event type
    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@ -209,29 +195,3 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    message: 'Unhandled webhook event',
  });
 }
-
-const handleCustomerSubscriptionUpdated = async (subscription: Stripe.Subscription) => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  const { plan } = subscription as unknown as Stripe.SubscriptionItem;
-
-  const customerId =
-    typeof subscription.customer === 'string' ? subscription.customer : subscription.customer.id;
-
-  const status = match(subscription.status)
-    .with('active', () => SubscriptionStatus.ACTIVE)
-    .with('past_due', () => SubscriptionStatus.PAST_DUE)
-    .otherwise(() => SubscriptionStatus.INACTIVE);
-
-  await prisma.subscription.update({
-    where: {
-      customerId: customerId,
-    },
-    data: {
-      planId: plan.id,
-      status,
-      cancelAtPeriodEnd: subscription.cancel_at_period_end,
-      periodEnd: new Date(subscription.current_period_end * 1000),
-      updatedAt: new Date(),
-    },
-  });
-};
--- a/packages/ee/server-only/stripe/get-checkout-session.ts
+++ b/packages/ee/server-only/stripe/get-checkout-session.ts
@ -1,31 +0,0 @@
-'use server';
-
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-export type GetCheckoutSessionOptions = {
-  customerId: string;
-  priceId: string;
-  returnUrl: string;
-};
-
-export const getCheckoutSession = async ({
-  customerId,
-  priceId,
-  returnUrl,
-}: GetCheckoutSessionOptions) => {
-  'use server';
-
-  const session = await stripe.checkout.sessions.create({
-    customer: customerId,
-    line_items: [
-      {
-        price: priceId,
-        quantity: 1,
-      },
-    ],
-    success_url: `${returnUrl}?success=true`,
-    cancel_url: `${returnUrl}?canceled=true`,
-  });
-
-  return session.url;
-};
--- a/packages/ee/server-only/stripe/get-customer.ts
+++ b/packages/ee/server-only/stripe/get-customer.ts
@ -1,19 +0,0 @@
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-export const getStripeCustomerByEmail = async (email: string) => {
-  const foundStripeCustomers = await stripe.customers.list({
-    email,
-  });
-
-  return foundStripeCustomers.data[0] ?? null;
-};
-
-export const getStripeCustomerById = async (stripeCustomerId: string) => {
-  try {
-    const stripeCustomer = await stripe.customers.retrieve(stripeCustomerId);
-
-    return !stripeCustomer.deleted ? stripeCustomer : null;
-  } catch {
-    return null;
-  }
-};
--- a/packages/ee/server-only/stripe/get-prices-by-interval.ts
+++ b/packages/ee/server-only/stripe/get-prices-by-interval.ts
@ -1,40 +0,0 @@
-import Stripe from 'stripe';
-
-import { stripe } from '@documenso/lib/server-only/stripe';
-
-// Utility type to handle usage of the `expand` option.
-type PriceWithProduct = Stripe.Price & { product: Stripe.Product };
-
-export type PriceIntervals = Record<Stripe.Price.Recurring.Interval, PriceWithProduct[]>;
-
-export const getPricesByInterval = async () => {
-  const { data: prices } = await stripe.prices.search({
-    query: `active:'true' type:'recurring'`,
-    expand: ['data.product'],
-    limit: 100,
-  });
-
-  const intervals: PriceIntervals = {
-    day: [],
-    week: [],
-    month: [],
-    year: [],
-  };
-
-  // Add each price to the correct interval.
-  for (const price of prices) {
-    if (price.recurring?.interval) {
-      // We use `expand` to get the product, but it's not typed as part of the Price type.
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      intervals[price.recurring.interval].push(price as PriceWithProduct);
-    }
-  }
-
-  // Order all prices by unit_amount.
-  intervals.day.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-  intervals.week.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-  intervals.month.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-  intervals.year.sort((a, b) => Number(a.unit_amount) - Number(b.unit_amount));
-
-  return intervals;
-};
--- a/packages/lib/client-only/hooks/use-copy-to-clipboard.ts
+++ b/packages/lib/client-only/hooks/use-copy-to-clipboard.ts
--- a/packages/lib/server-only/stripe/index.ts
+++ b/packages/lib/server-only/stripe/index.ts
@ -1,4 +1,3 @@
-/// <reference types="./stripe.d.ts" />
 import Stripe from 'stripe';

 export const stripe = new Stripe(process.env.NEXT_PRIVATE_STRIPE_API_KEY ?? '', {
--- a/packages/lib/server-only/stripe/stripe.d.ts
+++ b/packages/lib/server-only/stripe/stripe.d.ts
@ -1,7 +0,0 @@
-declare module 'stripe' {
-  namespace Stripe {
-    interface Product {
-      features?: Array<{ name: string }>;
-    }
-  }
-}
--- a/packages/lib/universal/stripe/to-human-price.ts
+++ b/packages/lib/universal/stripe/to-human-price.ts
@ -1,3 +0,0 @@
-export const toHumanPrice = (price: number) => {
-  return Number(price / 100).toFixed(2);
-};
--- a/packages/prisma/migrations/20230918111438_update_subscription_constraints_and_columns/migration.sql
+++ b/packages/prisma/migrations/20230918111438_update_subscription_constraints_and_columns/migration.sql
@ -1,17 +0,0 @@
-/*
-  Warnings:
-
-  - A unique constraint covering the columns `[userId]` on the table `Subscription` will be added. If there are existing duplicate values, this will fail.
-  - Made the column `customerId` on table `Subscription` required. This step will fail if there are existing NULL values in that column.
-
-*/
-
-DELETE FROM "Subscription"
-WHERE "customerId" IS NULL;
-
-- AlterTable
-ALTER TABLE "Subscription" ADD COLUMN     "cancelAtPeriodEnd" BOOLEAN NOT NULL DEFAULT false,
-ALTER COLUMN "customerId" SET NOT NULL;
-
-- CreateIndex
-CREATE UNIQUE INDEX "Subscription_userId_key" ON "Subscription"("userId");
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@ -55,12 +55,11 @@ model Subscription {
  status     SubscriptionStatus @default(INACTIVE)
  planId     String?
  priceId    String?
-  customerId        String
+  customerId String?
  periodEnd  DateTime?
-  userId            Int                @unique
+  userId     Int
  createdAt  DateTime           @default(now())
  updatedAt  DateTime           @updatedAt
-  cancelAtPeriodEnd Boolean            @default(false)

  User User @relation(fields: [userId], references: [id], onDelete: Cascade)

--- a/packages/tsconfig/process-env.d.ts
+++ b/packages/tsconfig/process-env.d.ts
@ -10,7 +10,6 @@ declare namespace NodeJS {

    NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;
    NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID: string;
-    NEXT_PUBLIC_STRIPE_FREE_PLAN_ID?: string;

    NEXT_PRIVATE_STRIPE_API_KEY: string;
    NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;
--- a/apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx
@ -5,8 +5,10 @@ import { HTMLAttributes, useState } from 'react';
 import { Copy, Share } from 'lucide-react';
 import { FaXTwitter } from 'react-icons/fa6';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { generateTwitterIntent } from '@documenso/lib/universal/generate-twitter-intent';
 import { trpc } from '@documenso/trpc/react';
+import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
@ -18,14 +20,12 @@ import {
 } from '@documenso/ui/primitives/dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
-export type ShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
+export type DocumentShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
  token: string;
  documentId: number;
 };

-export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
+export const DocumentShareButton = ({ token, documentId, className }: DocumentShareButtonProps) => {
  const { toast } = useToast();
  const [, copyToClipboard] = useCopyToClipboard();

@ -60,7 +60,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
      slug = result.slug;
    }

-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+    await copyToClipboard(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`).catch(() => null);

    toast({
      title: 'Copied to clipboard',
@ -85,7 +85,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
    window.open(
      generateTwitterIntent(
        `I just ${token ? 'signed' : 'sent'} a document with @documenso. Check it out!`,
-        `${window.location.origin}/share/${slug}`,
+        `${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`,
      ),
      '_blank',
    );
@ -99,7 +99,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
        <Button
          variant="outline"
          disabled={!token || !documentId}
-          className="flex-1"
+          className={cn('flex-1', className)}
          loading={isLoading}
        >
          {!isLoading && <Share className="mr-2 h-5 w-5" />}
@ -120,8 +120,12 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
            <span className="font-medium text-blue-400">@documenso</span>
            . Check it out!
            <span className="mt-2 block" />
-            <span className="break-all font-medium text-blue-400">
-              {window.location.origin}/share/{shareLink?.slug || '...'}
+            <span
+              className={cn('break-all font-medium text-blue-400', {
+                'animate-pulse': !shareLink?.slug,
+              })}
+            >
+              {process.env.NEXT_PUBLIC_WEBAPP_URL}/share/{shareLink?.slug || '...'}
            </span>
          </div>

--- a/turbo.json
+++ b/turbo.json
@ -34,7 +34,6 @@
    "NEXT_PUBLIC_FEATURE_BILLING_ENABLED",
    "NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID",
    "NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID",
-    "NEXT_PUBLIC_STRIPE_FREE_PLAN_ID",
    "NEXT_PRIVATE_DATABASE_URL",
    "NEXT_PRIVATE_DIRECT_DATABASE_URL",
    "NEXT_PRIVATE_GOOGLE_CLIENT_ID",
Author	SHA1	Message	Date
David Nguyen	cf84844d9b	Merge branch 'feat/refresh' into feat/marketing-share-document	2023-10-12 12:23:14 +11:00
David Nguyen	37a2ae87a6	fix: update share link	2023-10-12 12:22:31 +11:00
David Nguyen	f964cda8ec	fix: update share link	2023-10-12 12:14:12 +11:00
Abhinav-Developer-23	2ea5ff2c94	fix: bypass signature fix (#536 ) (#547 )	2023-10-12 11:33:01 +11:00
David Nguyen	73a445035c	feat: add marketing document share button	2023-10-11 12:02:37 +11:00