The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: update env entries to evaluate at runtime
Mythie08f82b23dcc7
diff --git a/apps/marketing/src/app/(marketing)/claimed/page.tsx b/apps/marketing/src/app/(marketing)/claimed/page.tsxindex 931045bd2..7f85b5d2e 100644--- a/apps/marketing/src/app/(marketing)/claimed/page.tsx+++ b/apps/marketing/src/app/(marketing)/claimed/page.tsx@@ -4,6 +4,7 @@ import { redirect } from 'next/navigation';import { ArrowRight } from 'lucide-react';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { redis } from '@documenso/lib/server-only/redis';import { stripe } from '@documenso/lib/server-only/stripe';import { prisma } from '@documenso/prisma';@@ -175,11 +176,7 @@ export default async function ClaimedPlanPage({ searchParams = {} }: ClaimedPlanThis is a temporary password. Please change it as soon as possible.</p>- <Link- href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signin`}- target="_blank"- className="mt-4 block"- >+ <Link href={`${NEXT_PUBLIC_WEBAPP_URL()}/signin`} target="_blank" className="mt-4 block"><Button size="lg" className="text-base">Let's get started!<ArrowRight className="ml-2 h-5 w-5" />diff --git a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx b/apps/marketing/src/app/(marketing)/singleplayer/client.tsxindex 389528bf8..f1884bf5c 100644--- a/apps/marketing/src/app/(marketing)/singleplayer/client.tsx+++ b/apps/marketing/src/app/(marketing)/singleplayer/client.tsx@@ -6,6 +6,7 @@ import Link from 'next/link';import { useRouter } from 'next/navigation';import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { base64 } from '@documenso/lib/universal/base64';import { putFile } from '@documenso/lib/universal/upload/put-file';import type { Field, Recipient } from '@documenso/prisma/client';@@ -188,7 +189,7 @@ export const SinglePlayerClient = () => {<p className="text-foreground mx-auto mt-4 max-w-[50ch] text-lg leading-normal">Create a{' '}<Link- href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}+ href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup`}target="_blank"className="hover:text-foreground/80 font-semibold transition-colors">diff --git a/apps/marketing/src/components/(marketing)/pricing-table.tsx b/apps/marketing/src/components/(marketing)/pricing-table.tsxindex b65411064..4e06c4b3a 100644--- a/apps/marketing/src/components/(marketing)/pricing-table.tsx+++ b/apps/marketing/src/components/(marketing)/pricing-table.tsx@@ -8,6 +8,7 @@ import Link from 'next/link';import { AnimatePresence, motion } from 'framer-motion';import { usePlausible } from 'next-plausible';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { cn } from '@documenso/ui/lib/utils';import { Button } from '@documenso/ui/primitives/button';@@ -82,11 +83,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {</p><Button className="rounded-full text-base" asChild>- <Link- href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}- target="_blank"- className="mt-6"- >+ <Link href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup`} target="_blank" className="mt-6">Signup Now</Link></Button>@@ -117,7 +114,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {</p><Button className="mt-6 rounded-full text-base" asChild>- <Link href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}>Signup Now</Link>+ <Link href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup`}>Signup Now</Link></Button><div className="mt-8 flex w-full flex-col divide-y">diff --git 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.tsxindex 1af71c775..d8a8e2c53 100644--- 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@@ -6,6 +6,7 @@ import Link from 'next/link';import signingCelebration from '@documenso/assets/images/signing-celebration.png';import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import type { Signature } from '@documenso/prisma/client';import { DocumentStatus } from '@documenso/prisma/client';import type { DocumentWithRecipient } from '@documenso/prisma/types/document-with-recipient';@@ -85,7 +86,7 @@ export const SinglePlayerModeSuccess = ({<p className="text-muted-foreground/60 mt-16 text-center text-sm">Create a{' '}<Link- href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}+ href={`${NEXT_PUBLIC_WEBAPP_URL()}/signup`}target="_blank"className="text-documenso-700 hover:text-documenso-600 whitespace-nowrap">diff --git a/apps/marketing/src/components/(marketing)/widget.tsx b/apps/marketing/src/components/(marketing)/widget.tsxindex 80c13b275..b0baeb5fc 100644--- a/apps/marketing/src/components/(marketing)/widget.tsx+++ b/apps/marketing/src/components/(marketing)/widget.tsx@@ -7,6 +7,7 @@ import { zodResolver } from '@hookform/resolvers/zod';import { AnimatePresence, motion } from 'framer-motion';import { Loader } from 'lucide-react';import { usePlausible } from 'next-plausible';+import { env } from 'next-runtime-env';import { Controller, useForm } from 'react-hook-form';import { z } from 'zod';@@ -144,7 +145,11 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {setTimeout(resolve, 1000);});- const planId = process.env.NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID;+ const planId = env('NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID');++ if (!planId) {+ throw new Error('No plan ID found.');+ }const claimPlanInput = signatureDataUrl? {diff --git a/apps/marketing/src/pages/api/claim-plan/index.ts b/apps/marketing/src/pages/api/claim-plan/index.tsindex 57597001e..c63a727c5 100644--- a/apps/marketing/src/pages/api/claim-plan/index.ts+++ b/apps/marketing/src/pages/api/claim-plan/index.ts@@ -1,13 +1,15 @@-import { NextApiRequest, NextApiResponse } from 'next';+import type { NextApiRequest, NextApiResponse } from 'next';import { randomUUID } from 'crypto';-import { TEarlyAdopterCheckoutMetadataSchema } from '@documenso/ee/server-only/stripe/webhook/early-adopter-checkout-metadata';+import type { TEarlyAdopterCheckoutMetadataSchema } from '@documenso/ee/server-only/stripe/webhook/early-adopter-checkout-metadata';+import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { redis } from '@documenso/lib/server-only/redis';import { stripe } from '@documenso/lib/server-only/stripe';import { prisma } from '@documenso/prisma';-import { TClaimPlanResponseSchema, ZClaimPlanRequestSchema } from '~/api/claim-plan/types';+import type { TClaimPlanResponseSchema } from '~/api/claim-plan/types';+import { ZClaimPlanRequestSchema } from '~/api/claim-plan/types';export default async function handler(req: NextApiRequest,@@ -40,7 +42,7 @@ export default async function handler(if (user) {return res.status(200).json({- redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/signin`,+ redirectUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/signin`,});}@@ -77,8 +79,8 @@ export default async function handler(mode: 'subscription',metadata,allow_promotion_codes: true,- success_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/claimed?sessionId={CHECKOUT_SESSION_ID}`,- cancel_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}`,+ success_url: `${NEXT_PUBLIC_MARKETING_URL()}/claimed?sessionId={CHECKOUT_SESSION_ID}`,+ cancel_url: `${NEXT_PUBLIC_MARKETING_URL()}`,});if (!checkout.url) {diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsxindex 832e255fd..2159b87f2 100644--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx@@ -61,7 +61,7 @@ export const EditDocumentForm = ({const { mutateAsync: setPasswordForDocument } =trpc.document.setPasswordForDocument.useMutation();- const documentFlow: Record<EditDocumentStep, DcumentFlowStep> = {+ const documentFlow: Record<EditDocumentStep, DocumentFlowStep> = {title: {title: 'Add Title',description: 'Add the title to the document.',diff --git 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.tsindex 7d952d599..5435aefb1 100644--- 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,20 +1,17 @@'use server';-import { env } from 'next-runtime-env';-import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';export const createBillingPortal = async () => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const { user } = await getRequiredServerComponentSession();const { stripeCustomer } = await getStripeCustomerByUser(user);return getPortalSession({customerId: stripeCustomer.id,- returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,+ returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`,});};diff --git a/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts b/apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.tsindex ef3fb0f30..90dd77e79 100644--- 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,10 +1,9 @@'use server';-import { env } from 'next-runtime-env';-import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session';import { getStripeCustomerByUser } from '@documenso/ee/server-only/stripe/get-customer';import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscription/get-subscriptions-by-user-id';@@ -13,8 +12,6 @@ export type CreateCheckoutOptions = {};export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const session = await getRequiredServerComponentSession();const { user, stripeCustomer } = await getStripeCustomerByUser(session.user);@@ -31,13 +28,13 @@ export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => {if (foundSubscription) {return getPortalSession({customerId: stripeCustomer.id,- returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,+ returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`,});}return getCheckoutSession({customerId: stripeCustomer.id,priceId,- returnUrl: `${NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,+ returnUrl: `${NEXT_PUBLIC_WEBAPP_URL()}/settings/billing`,});};diff --git a/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx b/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsxindex e9977b8f3..27f39a6b1 100644--- a/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx+++ b/apps/web/src/app/(share)/share/[slug]/opengraph/route.tsx@@ -1,9 +1,10 @@import { ImageResponse } from 'next/og';import { NextResponse } from 'next/server';-import { env } from 'next-runtime-env';import { P, match } from 'ts-pattern';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';+import type { ShareHandlerAPIResponse } from '~/pages/api/share';export const runtime = 'edge';@@ -23,8 +24,6 @@ type SharePageOpenGraphImageProps = {};export async function GET(_request: Request, { params: { slug } }: SharePageOpenGraphImageProps) {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const [interSemiBold, interRegular, caveatRegular, shareFrameImage] = await Promise.all([fetch(new URL('@documenso/assets/fonts/inter-semibold.ttf', import.meta.url)).then(async (res) => res.arrayBuffer(),@@ -40,7 +39,7 @@ export async function GET(_request: Request, { params: { slug } }: SharePageOpen),]);- const baseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const baseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';const recipientOrSender: ShareHandlerAPIResponse = await fetch(new URL(`/api/share?slug=${slug}`, baseUrl),diff --git a/apps/web/src/app/(share)/share/[slug]/page.tsx b/apps/web/src/app/(share)/share/[slug]/page.tsxindex ab530ba0b..80d991934 100644--- a/apps/web/src/app/(share)/share/[slug]/page.tsx+++ b/apps/web/src/app/(share)/share/[slug]/page.tsx@@ -2,9 +2,7 @@ import type { Metadata } from 'next';import { headers } from 'next/headers';import { redirect } from 'next/navigation';-import { env } from 'next-runtime-env';--import { APP_BASE_URL } from '@documenso/lib/constants/app';+import { APP_BASE_URL, NEXT_PUBLIC_MARKETING_URL } from '@documenso/lib/constants/app';type SharePageProps = {params: { slug: string };@@ -18,20 +16,18 @@ export function generateMetadata({ params: { slug } }: SharePageProps) {title: 'Documenso - Join the open source signing revolution',description: 'I just signed with Documenso!',type: 'website',- images: [`${APP_BASE_URL}/share/${slug}/opengraph`],+ images: [`${APP_BASE_URL()}/share/${slug}/opengraph`],},twitter: {site: '@documenso',card: 'summary_large_image',- images: [`${APP_BASE_URL}/share/${slug}/opengraph`],+ images: [`${APP_BASE_URL()}/share/${slug}/opengraph`],description: 'I just signed with Documenso!',},} satisfies Metadata;}export default function SharePage() {- const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL');-const userAgent = headers().get('User-Agent') ?? '';// https://stackoverflow.com/questions/47026171/how-to-detect-bots-for-open-graph-with-user-agent@@ -39,5 +35,5 @@ export default function SharePage() {return null;}- redirect(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001');+ redirect(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001');}diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsxindex 1e6619a46..606aa0f10 100644--- a/apps/web/src/app/layout.tsx+++ b/apps/web/src/app/layout.tsx@@ -2,10 +2,11 @@ import { Suspense } from 'react';import { Caveat, Inter } from 'next/font/google';-import { PublicEnvScript, env } from 'next-runtime-env';+import { PublicEnvScript } from 'next-runtime-env';import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag';import { LocaleProvider } from '@documenso/lib/client-only/providers/locale';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { getServerComponentAllFlags } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';import { getLocale } from '@documenso/lib/server-only/headers/get-locale';import { TrpcProvider } from '@documenso/trpc/react';@@ -21,8 +22,6 @@ import './globals.css';const fontInter = Inter({ subsets: ['latin'], variable: '--font-sans' });const fontCaveat = Caveat({ subsets: ['latin'], variable: '--font-signature' });-const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-export const metadata = {title: {template: '%s - Documenso',@@ -39,12 +38,12 @@ export const metadata = {description:'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.',type: 'website',- images: [`${NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`],+ images: [`${NEXT_PUBLIC_WEBAPP_URL()}/opengraph-image.jpg`],},twitter: {site: '@documenso',card: 'summary_large_image',- images: [`${NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`],+ images: [`${NEXT_PUBLIC_WEBAPP_URL()}/opengraph-image.jpg`],description:'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.',},diff --git a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsxindex 727627ddd..a809ed23e 100644--- a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx+++ b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx@@ -2,10 +2,9 @@import React from 'react';-import { env } from 'next-runtime-env';-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';import { getRecipientType } from '@documenso/lib/client-only/recipient-type';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';import type { Recipient } from '@documenso/prisma/client';import { cn } from '@documenso/ui/lib/utils';@@ -18,8 +17,6 @@ export type AvatarWithRecipientProps = {};export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const [, copy] = useCopyToClipboard();const { toast } = useToast();@@ -28,7 +25,7 @@ export function AvatarWithRecipient({ recipient }: AvatarWithRecipientProps) {return;}- void copy(`${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`).then(() => {+ void copy(`${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`).then(() => {toast({title: 'Copied to clipboard',description: 'The signing link has been copied to your clipboard.',diff --git a/apps/web/src/helpers/get-asset-buffer.ts b/apps/web/src/helpers/get-asset-buffer.tsindex 12c27d1a5..871e669b1 100644--- a/apps/web/src/helpers/get-asset-buffer.ts+++ b/apps/web/src/helpers/get-asset-buffer.ts@@ -1,4 +1,4 @@-import { env } from 'next-runtime-env';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';/*** getAssetBuffer is used to retrieve array buffers for various assets@@ -10,9 +10,7 @@ import { env } from 'next-runtime-env';* @param path The path to the asset, relative to the `public` folder.*/export const getAssetBuffer = async (path: string) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-- const baseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const baseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';return fetch(new URL(path, baseUrl)).then(async (res) => res.arrayBuffer());};diff --git a/packages/ee/server-only/limits/client.ts b/packages/ee/server-only/limits/client.tsindex 9bb2bd0ac..fa31e6e40 100644--- a/packages/ee/server-only/limits/client.ts+++ b/packages/ee/server-only/limits/client.ts@@ -11,7 +11,7 @@ export type GetLimitsOptions = {export const getLimits = async ({ headers }: GetLimitsOptions = {}) => {const requestHeaders = headers ?? {};- const url = new URL('/api/limits', APP_BASE_URL ?? 'http://localhost:3000');+ const url = new URL('/api/limits', APP_BASE_URL() ?? 'http://localhost:3000');return fetch(url, {headers: {diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.tsindex cee5a7586..0675bb84b 100644--- a/packages/lib/constants/app.ts+++ b/packages/lib/constants/app.ts@@ -1,12 +1,13 @@import { env } from 'next-runtime-env';-const NEXT_PUBLIC_PROJECT = process.env.NEXT_PUBLIC_PROJECT;-const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL');+export const NEXT_PUBLIC_PROJECT = () => env('NEXT_PUBLIC_PROJECT');+export const NEXT_PUBLIC_WEBAPP_URL = () => env('NEXT_PUBLIC_WEBAPP_URL');+export const NEXT_PUBLIC_MARKETING_URL = () => env('NEXT_PUBLIC_MARKETING_URL');-export const IS_APP_MARKETING = NEXT_PUBLIC_PROJECT === 'marketing';-export const IS_APP_WEB = NEXT_PUBLIC_PROJECT === 'web';+export const IS_APP_MARKETING = () => NEXT_PUBLIC_PROJECT() === 'marketing';+export const IS_APP_WEB = () => NEXT_PUBLIC_PROJECT() === 'web';-export const APP_FOLDER = IS_APP_MARKETING ? 'marketing' : 'web';+export const APP_FOLDER = () => (IS_APP_MARKETING() ? 'marketing' : 'web');-export const APP_BASE_URL = IS_APP_WEB ? NEXT_PUBLIC_WEBAPP_URL : NEXT_PUBLIC_MARKETING_URL;+export const APP_BASE_URL = () =>+ IS_APP_WEB() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PUBLIC_MARKETING_URL();diff --git a/packages/lib/constants/crypto.ts b/packages/lib/constants/crypto.tsindex 40d3ef113..74f306a53 100644--- a/packages/lib/constants/crypto.ts+++ b/packages/lib/constants/crypto.ts@@ -2,15 +2,15 @@ export const DOCUMENSO_ENCRYPTION_KEY = process.env.NEXT_PRIVATE_ENCRYPTION_KEY;export const DOCUMENSO_ENCRYPTION_SECONDARY_KEY = process.env.NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY;-if (!DOCUMENSO_ENCRYPTION_KEY || !DOCUMENSO_ENCRYPTION_SECONDARY_KEY) {- throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY or DOCUMENSO_ENCRYPTION_SECONDARY_KEY keys');-}+// if (!DOCUMENSO_ENCRYPTION_KEY || !DOCUMENSO_ENCRYPTION_SECONDARY_KEY) {+// throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY or DOCUMENSO_ENCRYPTION_SECONDARY_KEY keys');+// }-if (DOCUMENSO_ENCRYPTION_KEY === DOCUMENSO_ENCRYPTION_SECONDARY_KEY) {- throw new Error(- 'DOCUMENSO_ENCRYPTION_KEY and DOCUMENSO_ENCRYPTION_SECONDARY_KEY cannot be equal',- );-}+// if (DOCUMENSO_ENCRYPTION_KEY === DOCUMENSO_ENCRYPTION_SECONDARY_KEY) {+// throw new Error(+// 'DOCUMENSO_ENCRYPTION_KEY and DOCUMENSO_ENCRYPTION_SECONDARY_KEY cannot be equal',+// );+// }if (DOCUMENSO_ENCRYPTION_KEY === 'CAFEBABE') {console.warn('*********************************************************************');diff --git a/packages/lib/constants/feature-flags.ts b/packages/lib/constants/feature-flags.tsindex a0e958e3a..d33db549e 100644--- a/packages/lib/constants/feature-flags.ts+++ b/packages/lib/constants/feature-flags.ts@@ -2,8 +2,8 @@ import { env } from 'next-runtime-env';import { APP_BASE_URL } from './app';-const NEXT_PUBLIC_FEATURE_BILLING_ENABLED = env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED');-const NEXT_PUBLIC_POSTHOG_KEY = env('NEXT_PUBLIC_POSTHOG_KEY');+const NEXT_PUBLIC_FEATURE_BILLING_ENABLED = () => env('NEXT_PUBLIC_FEATURE_BILLING_ENABLED');+const NEXT_PUBLIC_POSTHOG_KEY = () => env('NEXT_PUBLIC_POSTHOG_KEY');/*** The flag name for global session recording feature flag.@@ -21,7 +21,7 @@ export const FEATURE_FLAG_POLL_INTERVAL = 30000;* Does not take any person or group properties into account.*/export const LOCAL_FEATURE_FLAGS: Record<string, boolean> = {- app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true',+ app_billing: NEXT_PUBLIC_FEATURE_BILLING_ENABLED() === 'true',marketing_header_single_player_mode: false,} as const;@@ -29,8 +29,8 @@ export const LOCAL_FEATURE_FLAGS: Record<string, boolean> = {* Extract the PostHog configuration from the environment.*/export function extractPostHogConfig(): { key: string; host: string } | null {- const postHogKey = NEXT_PUBLIC_POSTHOG_KEY;- const postHogHost = `${APP_BASE_URL}/ingest`;+ const postHogKey = NEXT_PUBLIC_POSTHOG_KEY();+ const postHogHost = `${APP_BASE_URL()}/ingest`;if (!postHogKey || !postHogHost) {return null;diff --git a/packages/lib/constants/pdf.ts b/packages/lib/constants/pdf.tsindex eba72ab56..19663ef58 100644--- a/packages/lib/constants/pdf.ts+++ b/packages/lib/constants/pdf.ts@@ -6,4 +6,4 @@ export const DEFAULT_HANDWRITING_FONT_SIZE = 50;export const MIN_STANDARD_FONT_SIZE = 8;export const MIN_HANDWRITING_FONT_SIZE = 20;-export const CAVEAT_FONT_PATH = `${APP_BASE_URL}/fonts/caveat.ttf`;+export const CAVEAT_FONT_PATH = () => `${APP_BASE_URL()}/fonts/caveat.ttf`;diff --git a/packages/lib/next-auth/auth-options.ts b/packages/lib/next-auth/auth-options.tsindex 4823833cc..8f324d248 100644--- a/packages/lib/next-auth/auth-options.ts+++ b/packages/lib/next-auth/auth-options.ts@@ -17,8 +17,6 @@ import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2faimport { getUserByEmail } from '../server-only/user/get-user-by-email';import { ErrorCode } from './error-codes';-const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP');-export const NEXT_AUTH_OPTIONS: AuthOptions = {adapter: PrismaAdapter(prisma),secret: process.env.NEXTAUTH_SECRET ?? 'secret',@@ -186,7 +184,7 @@ export const NEXT_AUTH_OPTIONS: AuthOptions = {async signIn({ user }) {// We do this to stop OAuth providers from creating an account// when signups are disabled- if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') {+ if (env('NEXT_PUBLIC_DISABLE_SIGNUP') === 'true') {const userData = await getUserByEmail({ email: user.email! });return !!userData;diff --git a/packages/lib/server-only/auth/send-confirmation-email.ts b/packages/lib/server-only/auth/send-confirmation-email.tsindex c808e8f3d..3e1ac920d 100644--- a/packages/lib/server-only/auth/send-confirmation-email.ts+++ b/packages/lib/server-only/auth/send-confirmation-email.ts@@ -1,20 +1,19 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { ConfirmEmailTemplate } from '@documenso/email/templates/confirm-email';import { prisma } from '@documenso/prisma';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+export interface SendConfirmationEmailProps {userId: number;}export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailProps) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');- const NEXT_PRIVATE_SMTP_FROM_NAME = env('NEXT_PRIVATE_SMTP_FROM_NAME');- const NEXT_PRIVATE_SMTP_FROM_ADDRESS = env('NEXT_PRIVATE_SMTP_FROM_ADDRESS');+ const NEXT_PRIVATE_SMTP_FROM_NAME = process.env.NEXT_PRIVATE_SMTP_FROM_NAME;+ const NEXT_PRIVATE_SMTP_FROM_ADDRESS = process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS;const user = await prisma.user.findFirstOrThrow({where: {@@ -36,7 +35,7 @@ export const sendConfirmationEmail = async ({ userId }: SendConfirmationEmailProthrow new Error('Verification token not found for the user');}- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';const confirmationLink = `${assetBaseUrl}/verify-email/${verificationToken.token}`;const senderName = NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso';const senderAdress = NEXT_PRIVATE_SMTP_FROM_ADDRESS || '[email protected]';diff --git a/packages/lib/server-only/auth/send-forgot-password.ts b/packages/lib/server-only/auth/send-forgot-password.tsindex 125db9338..6e3a582a8 100644--- a/packages/lib/server-only/auth/send-forgot-password.ts+++ b/packages/lib/server-only/auth/send-forgot-password.ts@@ -1,19 +1,17 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { ForgotPasswordTemplate } from '@documenso/email/templates/forgot-password';import { prisma } from '@documenso/prisma';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+export interface SendForgotPasswordOptions {userId: number;}export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const user = await prisma.user.findFirstOrThrow({where: {id: userId,@@ -33,8 +31,8 @@ export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions)}const token = user.PasswordResetToken[0].token;- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';- const resetPasswordLink = `${NEXT_PUBLIC_WEBAPP_URL}/reset-password/${token}`;+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';+ const resetPasswordLink = `${NEXT_PUBLIC_WEBAPP_URL()}/reset-password/${token}`;const template = createElement(ForgotPasswordTemplate, {assetBaseUrl,diff --git a/packages/lib/server-only/auth/send-reset-password.ts b/packages/lib/server-only/auth/send-reset-password.tsindex 3dcec113c..6bcd5820d 100644--- a/packages/lib/server-only/auth/send-reset-password.ts+++ b/packages/lib/server-only/auth/send-reset-password.ts@@ -1,26 +1,24 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { ResetPasswordTemplate } from '@documenso/email/templates/reset-password';import { prisma } from '@documenso/prisma';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+export interface SendResetPasswordOptions {userId: number;}export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const user = await prisma.user.findFirstOrThrow({where: {id: userId,},});- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';const template = createElement(ResetPasswordTemplate, {assetBaseUrl,diff --git a/packages/lib/server-only/document/delete-document.ts b/packages/lib/server-only/document/delete-document.tsindex 58b1f48a9..a5cf96cdd 100644--- a/packages/lib/server-only/document/delete-document.ts+++ b/packages/lib/server-only/document/delete-document.ts@@ -2,14 +2,13 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import DocumentCancelTemplate from '@documenso/email/templates/document-cancel';import { prisma } from '@documenso/prisma';import { DocumentStatus } from '@documenso/prisma/client';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';import { FROM_ADDRESS, FROM_NAME } from '../../constants/email';export type DeleteDocumentOptions = {@@ -18,8 +17,6 @@ export type DeleteDocumentOptions = {status: DocumentStatus;};-const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptions) => {// if the document is a draft, hard-deleteif (status === DocumentStatus.DRAFT) {@@ -53,7 +50,7 @@ export const deleteDocument = async ({ id, userId, status }: DeleteDocumentOptioif (document.Recipient.length > 0) {await Promise.all(document.Recipient.map(async (recipient) => {- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';const template = createElement(DocumentCancelTemplate, {documentName: document.title,diff --git a/packages/lib/server-only/document/resend-document.tsx b/packages/lib/server-only/document/resend-document.tsxindex a048cf600..85e148a57 100644--- a/packages/lib/server-only/document/resend-document.tsx+++ b/packages/lib/server-only/document/resend-document.tsx@@ -1,7 +1,5 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';@@ -10,14 +8,14 @@ import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-emimport { prisma } from '@documenso/prisma';import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+export type ResendDocumentOptions = {documentId: number;userId: number;recipients: number[];};-const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-export const resendDocument = async ({ documentId, userId, recipients }: ResendDocumentOptions) => {const user = await prisma.user.findFirstOrThrow({where: {@@ -71,8 +69,8 @@ export const resendDocument = async ({ documentId, userId, recipients }: ResendD'document.name': document.title,};- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';- const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`;+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';+ const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`;const template = createElement(DocumentInviteEmailTemplate, {documentName: document.title,diff --git a/packages/lib/server-only/document/send-completed-email.ts b/packages/lib/server-only/document/send-completed-email.tsindex 9b624a23c..c7134d164 100644--- a/packages/lib/server-only/document/send-completed-email.ts+++ b/packages/lib/server-only/document/send-completed-email.ts@@ -1,12 +1,11 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed';import { prisma } from '@documenso/prisma';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';import { getFile } from '../../universal/upload/get-file';export interface SendDocumentOptions {@@ -14,8 +13,6 @@ export interface SendDocumentOptions {}export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const document = await prisma.document.findUnique({where: {id: documentId,@@ -40,12 +37,12 @@ export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) =>document.Recipient.map(async (recipient) => {const { email, name, token } = recipient;- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';const template = createElement(DocumentCompletedEmailTemplate, {documentName: document.title,assetBaseUrl,- downloadLink: `${NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`,+ downloadLink: `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${token}/complete`,});await mailer.sendMail({diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsxindex f72c79792..86f610cc9 100644--- a/packages/lib/server-only/document/send-document.tsx+++ b/packages/lib/server-only/document/send-document.tsx@@ -1,7 +1,5 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';@@ -10,14 +8,14 @@ import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-emimport { prisma } from '@documenso/prisma';import { DocumentStatus, SendStatus } from '@documenso/prisma/client';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+export type SendDocumentOptions = {documentId: number;userId: number;};export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const user = await prisma.user.findFirstOrThrow({where: {id: userId,@@ -63,8 +61,8 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)return;}- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';- const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`;+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';+ const signDocumentLink = `${NEXT_PUBLIC_WEBAPP_URL()}/sign/${recipient.token}`;const template = createElement(DocumentInviteEmailTemplate, {documentName: document.title,diff --git a/packages/lib/server-only/document/send-pending-email.ts b/packages/lib/server-only/document/send-pending-email.tsindex abbecd72a..73e938a7d 100644--- a/packages/lib/server-only/document/send-pending-email.ts+++ b/packages/lib/server-only/document/send-pending-email.ts@@ -1,20 +1,18 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';-import { mailer } from '@documenso/email/mailer';import { render } from '@documenso/email/render';import { DocumentPendingEmailTemplate } from '@documenso/email/templates/document-pending';import { prisma } from '@documenso/prisma';+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+export interface SendPendingEmailOptions {documentId: number;recipientId: number;}export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingEmailOptions) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-const document = await prisma.document.findFirst({where: {id: documentId,@@ -45,7 +43,7 @@ export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingEconst { email, name } = recipient;- const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';+ const assetBaseUrl = NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000';const template = createElement(DocumentPendingEmailTemplate, {documentName: document.title,diff --git a/packages/lib/server-only/feature-flags/all.ts b/packages/lib/server-only/feature-flags/all.tsindex fff6cd855..71efd5425 100644--- a/packages/lib/server-only/feature-flags/all.ts+++ b/packages/lib/server-only/feature-flags/all.ts@@ -1,20 +1,17 @@import { NextRequest, NextResponse } from 'next/server';import { getToken } from 'next-auth/jwt';-import { env } from 'next-runtime-env';import { LOCAL_FEATURE_FLAGS } from '@documenso/lib/constants/feature-flags';import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client';+import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';import { extractDistinctUserId, mapJwtToFlagProperties } from './get';/*** Get all the evaluated feature flags based on the current user if possible.*/export default async function handlerFeatureFlagAll(req: Request) {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');- const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL');-const requestHeaders = Object.fromEntries(req.headers.entries());const nextReq = new NextRequest(req, {@@ -42,11 +39,11 @@ export default async function handlerFeatureFlagAll(req: Request) {const origin = req.headers.get('origin');if (origin) {- if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) {+ if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000')) {res.headers.set('Access-Control-Allow-Origin', origin);}- if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) {+ if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001')) {res.headers.set('Access-Control-Allow-Origin', origin);}}diff --git a/packages/lib/server-only/feature-flags/get.ts b/packages/lib/server-only/feature-flags/get.tsindex 6f8a2c011..5b2b3b7fd 100644--- a/packages/lib/server-only/feature-flags/get.ts+++ b/packages/lib/server-only/feature-flags/get.ts@@ -3,11 +3,12 @@ import { NextRequest, NextResponse } from 'next/server';import { nanoid } from 'nanoid';import type { JWT } from 'next-auth/jwt';import { getToken } from 'next-auth/jwt';-import { env } from 'next-runtime-env';import { LOCAL_FEATURE_FLAGS, extractPostHogConfig } from '@documenso/lib/constants/feature-flags';import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client';+import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+/*** Evaluate a single feature flag based on the current user if possible.*@@ -15,9 +16,6 @@ import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-po* @returns A Response with the feature flag value.*/export default async function handleFeatureFlagGet(req: Request) {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');- const NEXT_PUBLIC_MARKETING_URL = env('NEXT_PUBLIC_MARKETING_URL');-const { searchParams } = new URL(req.url ?? '');const flag = searchParams.get('flag');@@ -62,11 +60,11 @@ export default async function handleFeatureFlagGet(req: Request) {const origin = req.headers.get('Origin');if (origin) {- if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000')) {+ if (origin.startsWith(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000')) {res.headers.set('Access-Control-Allow-Origin', origin);}- if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001')) {+ if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001')) {res.headers.set('Access-Control-Allow-Origin', origin);}}diff --git a/packages/lib/server-only/pdf/insert-text-in-pdf.ts b/packages/lib/server-only/pdf/insert-text-in-pdf.tsindex 248702b6e..d5120341c 100644--- a/packages/lib/server-only/pdf/insert-text-in-pdf.ts+++ b/packages/lib/server-only/pdf/insert-text-in-pdf.ts@@ -12,7 +12,7 @@ export async function insertTextInPDF(useHandwritingFont = true,): Promise<string> {// Fetch the font file from the public URL.- const fontResponse = await fetch(CAVEAT_FONT_PATH);+ const fontResponse = await fetch(CAVEAT_FONT_PATH());const fontCaveat = await fontResponse.arrayBuffer();const pdfDoc = await PDFDocument.load(pdfAsBase64);diff --git a/packages/lib/universal/get-base-url.ts b/packages/lib/universal/get-base-url.tsindex b7c9d4ea4..7f9380047 100644--- a/packages/lib/universal/get-base-url.ts+++ b/packages/lib/universal/get-base-url.ts@@ -1,7 +1,5 @@/* eslint-disable turbo/no-undeclared-env-vars */-import { env } from 'next-runtime-env';--const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');+import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';export const getBaseUrl = () => {if (typeof window !== 'undefined') {@@ -12,8 +10,10 @@ export const getBaseUrl = () => {return `https://${process.env.VERCEL_URL}`;}- if (NEXT_PUBLIC_WEBAPP_URL) {- return NEXT_PUBLIC_WEBAPP_URL;+ const webAppUrl = NEXT_PUBLIC_WEBAPP_URL();++ if (webAppUrl) {+ return webAppUrl;}return `http://localhost:${process.env.PORT ?? 3000}`;diff --git a/packages/lib/universal/get-feature-flag.ts b/packages/lib/universal/get-feature-flag.tsindex 0fc0aa131..f4650f691 100644--- a/packages/lib/universal/get-feature-flag.ts+++ b/packages/lib/universal/get-feature-flag.ts@@ -22,7 +22,7 @@ export const getFlag = async (return LOCAL_FEATURE_FLAGS[flag] ?? true;}- const url = new URL(`${APP_BASE_URL}/api/feature-flag/get`);+ const url = new URL(`${APP_BASE_URL()}/api/feature-flag/get`);url.searchParams.set('flag', flag);const response = await fetch(url, {@@ -55,7 +55,7 @@ export const getAllFlags = async (return LOCAL_FEATURE_FLAGS;}- const url = new URL(`${APP_BASE_URL}/api/feature-flag/all`);+ const url = new URL(`${APP_BASE_URL()}/api/feature-flag/all`);return fetch(url, {headers: {@@ -80,7 +80,7 @@ export const getAllAnonymousFlags = async (): Promise<Record<string, TFeatureFlareturn LOCAL_FEATURE_FLAGS;}- const url = new URL(`${APP_BASE_URL}/api/feature-flag/all`);+ const url = new URL(`${APP_BASE_URL()}/api/feature-flag/all`);return fetch(url, {next: {diff --git a/packages/lib/universal/upload/put-file.ts b/packages/lib/universal/upload/put-file.tsindex 498bed3bd..b6aab5f11 100644--- a/packages/lib/universal/upload/put-file.ts+++ b/packages/lib/universal/upload/put-file.ts@@ -12,9 +12,9 @@ type File = {arrayBuffer: () => Promise<ArrayBuffer>;};-const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT');-export const putFile = async (file: File) => {+ const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT');+const { type, data } = await match(NEXT_PUBLIC_UPLOAD_TRANSPORT).with('s3', async () => putFileInS3(file)).otherwise(async () => putFileInDatabase(file));diff --git a/packages/lib/universal/upload/server-actions.ts b/packages/lib/universal/upload/server-actions.tsindex 61429cd86..fd4bfc57a 100644--- a/packages/lib/universal/upload/server-actions.ts+++ b/packages/lib/universal/upload/server-actions.ts@@ -18,8 +18,6 @@ import { APP_BASE_URL } from '../../constants/app';import { ONE_HOUR, ONE_SECOND } from '../../constants/time';import { alphaid } from '../id';-const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT');-export const getPresignPostUrl = async (fileName: string, contentType: string) => {const client = getS3Client();@@ -28,8 +26,10 @@ export const getPresignPostUrl = async (fileName: string, contentType: string) =let token: JWT | null = null;try {+ const baseUrl = APP_BASE_URL() ?? 'http://localhost:3000';+token = await getToken({- req: new NextRequest(APP_BASE_URL ?? 'http://localhost:3000', {+ req: new NextRequest(baseUrl, {headers: headers(),}),});@@ -120,6 +120,8 @@ export const deleteS3File = async (key: string) => {};const getS3Client = () => {+ const NEXT_PUBLIC_UPLOAD_TRANSPORT = env('NEXT_PUBLIC_UPLOAD_TRANSPORT');+if (NEXT_PUBLIC_UPLOAD_TRANSPORT !== 's3') {throw new Error('Invalid upload transport');}diff --git a/packages/trpc/server/auth-router/router.ts b/packages/trpc/server/auth-router/router.tsindex 0debd7f8d..65fe8d296 100644--- a/packages/trpc/server/auth-router/router.ts+++ b/packages/trpc/server/auth-router/router.ts@@ -9,12 +9,12 @@ import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-confimport { authenticatedProcedure, procedure, router } from '../trpc';import { ZSignUpMutationSchema, ZVerifyPasswordMutationSchema } from './schema';-const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP');+const NEXT_PUBLIC_DISABLE_SIGNUP = () => env('NEXT_PUBLIC_DISABLE_SIGNUP');export const authRouter = router({signup: procedure.input(ZSignUpMutationSchema).mutation(async ({ input }) => {try {- if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') {+ if (NEXT_PUBLIC_DISABLE_SIGNUP() === 'true') {throw new TRPCError({code: 'BAD_REQUEST',message: 'Signups are disabled.',diff --git a/packages/trpc/server/singleplayer-router/router.ts b/packages/trpc/server/singleplayer-router/router.tsindex cb92aa7a4..4b4c12c0a 100644--- a/packages/trpc/server/singleplayer-router/router.ts+++ b/packages/trpc/server/singleplayer-router/router.ts@@ -1,11 +1,11 @@import { createElement } from 'react';-import { env } from 'next-runtime-env';import { PDFDocument } from 'pdf-lib';import { mailer } from '@documenso/email/mailer';import { renderAsync } from '@documenso/email/render';import { DocumentSelfSignedEmailTemplate } from '@documenso/email/templates/document-self-signed';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import { FROM_ADDRESS, FROM_NAME, SERVICE_USER_EMAIL } from '@documenso/lib/constants/email';import { insertFieldInPDF } from '@documenso/lib/server-only/pdf/insert-field-in-pdf';import { alphaid } from '@documenso/lib/universal/id';@@ -25,8 +25,6 @@ import { procedure, router } from '../trpc';import { mapField } from './helper';import { ZCreateSinglePlayerDocumentMutationSchema } from './schema';-const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');-export const singleplayerRouter = router({createSinglePlayerDocument: procedure.input(ZCreateSinglePlayerDocumentMutationSchema)@@ -151,7 +149,7 @@ export const singleplayerRouter = router({const template = createElement(DocumentSelfSignedEmailTemplate, {documentName: documentName,- assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000',+ assetBaseUrl: NEXT_PUBLIC_WEBAPP_URL() || 'http://localhost:3000',});const [html, text] = await Promise.all([diff --git a/packages/ui/components/document/document-share-button.tsx b/packages/ui/components/document/document-share-button.tsxindex f304d92c0..e20e677c7 100644--- a/packages/ui/components/document/document-share-button.tsx+++ b/packages/ui/components/document/document-share-button.tsx@@ -4,10 +4,10 @@ import type { HTMLAttributes } from 'react';import React, { useState } from 'react';import { Copy, Sparkles } from 'lucide-react';-import { env } from 'next-runtime-env';import { FaXTwitter } from 'react-icons/fa6';import { useCopyShareLink } from '@documenso/lib/client-only/hooks/use-copy-share-link';+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';import {TOAST_DOCUMENT_SHARE_ERROR,TOAST_DOCUMENT_SHARE_SUCCESS,@@ -39,7 +39,6 @@ export const DocumentShareButton = ({className,trigger,}: DocumentShareButtonProps) => {- const NEXT_PUBLIC_WEBAPP_URL = env('NEXT_PUBLIC_WEBAPP_URL');const { toast } = useToast();const { copyShareLink, createAndCopyShareLink, isCopyingShareLink } = useCopyShareLink({@@ -70,7 +69,7 @@ export const DocumentShareButton = ({const onCopyClick = async () => {if (shareLink) {- await copyShareLink(`${NEXT_PUBLIC_WEBAPP_URL}/share/${shareLink.slug}`);+ await copyShareLink(`${NEXT_PUBLIC_WEBAPP_URL()}/share/${shareLink.slug}`);} else {await createAndCopyShareLink({token,@@ -94,7 +93,7 @@ export const DocumentShareButton = ({}// Ensuring we've prewarmed the opengraph image for the Twitter- await fetch(`${NEXT_PUBLIC_WEBAPP_URL}/share/${slug}/opengraph`, {+ await fetch(`${NEXT_PUBLIC_WEBAPP_URL()}/share/${slug}/opengraph`, {// We don't care about the response, so we can use no-corsmode: 'no-cors',});@@ -102,7 +101,7 @@ export const DocumentShareButton = ({window.open(generateTwitterIntent(`I just ${token ? 'signed' : 'sent'} a document in style with @documenso. Check it out!`,- `${NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`,+ `${NEXT_PUBLIC_WEBAPP_URL()}/share/${slug}`,),'_blank',);@@ -150,7 +149,7 @@ export const DocumentShareButton = ({'animate-pulse': !shareLink?.slug,})}>- {NEXT_PUBLIC_WEBAPP_URL}/share/{shareLink?.slug || '...'}+ {NEXT_PUBLIC_WEBAPP_URL()}/share/{shareLink?.slug || '...'}</span><divclassName={cn(@@ -162,7 +161,7 @@ export const DocumentShareButton = ({>{shareLink?.slug && (<img- src={`${NEXT_PUBLIC_WEBAPP_URL}/share/${shareLink.slug}/opengraph`}+ src={`${NEXT_PUBLIC_WEBAPP_URL()}/share/${shareLink.slug}/opengraph`}alt="sharing link"className="h-full w-full object-cover"/>