The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: add and use NEXT_PRIVATE_INTERNAL_WEBAPP_URL (#1298)
david-loe6c3acb1c2def
diff --git a/.env.example b/.env.exampleindex ed77d048a..b2dfb0805 100644--- a/.env.example+++ b/.env.example@@ -27,6 +27,8 @@ NEXT_PRIVATE_OIDC_SKIP_VERIFY=""# [[URLS]]NEXT_PUBLIC_WEBAPP_URL="http://localhost:3000"NEXT_PUBLIC_MARKETING_URL="http://localhost:3001"+# URL used by the web app to request itself (e.g. local background jobs)+NEXT_PRIVATE_INTERNAL_WEBAPP_URL="http://localhost:3000"# [[DATABASE]]NEXT_PRIVATE_DATABASE_URL="postgres://documenso:[email protected]:54320/documenso"diff --git a/apps/marketing/process-env.d.ts b/apps/marketing/process-env.d.tsindex 207bacef5..fabe9b243 100644--- a/apps/marketing/process-env.d.ts+++ b/apps/marketing/process-env.d.ts@@ -2,7 +2,8 @@ declare namespace NodeJS {export interface ProcessEnv {NEXT_PUBLIC_WEBAPP_URL?: string;NEXT_PUBLIC_MARKETING_URL?: string;-+ NEXT_PRIVATE_INTERNAL_WEBAPP_URL?:string;+NEXT_PRIVATE_DATABASE_URL: string;NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;diff --git a/apps/web/process-env.d.ts b/apps/web/process-env.d.tsindex 8bdfa41f9..ae9995df7 100644--- a/apps/web/process-env.d.ts+++ b/apps/web/process-env.d.ts@@ -2,6 +2,7 @@ declare namespace NodeJS {export interface ProcessEnv {NEXT_PUBLIC_WEBAPP_URL?: string;NEXT_PUBLIC_MARKETING_URL?: string;+ NEXT_PRIVATE_INTERNAL_WEBAPP_URL?:string;NEXT_PRIVATE_DATABASE_URL: string;diff --git a/docker/README.md b/docker/README.mdindex f3b3abd90..780d116fe 100644--- a/docker/README.md+++ b/docker/README.md@@ -74,6 +74,7 @@ docker run -d \-e NEXT_PRIVATE_ENCRYPTION_KEY="<your-next-private-encryption-key>"-e NEXT_PRIVATE_ENCRYPTION_SECONDARY_KEY="<your-next-private-encryption-secondary-key>"-e NEXT_PUBLIC_WEBAPP_URL="<your-next-public-webapp-url>"+ -e NEXT_PRIVATE_INTERNAL_WEBAPP_URL="http://localhost:3000"-e NEXT_PRIVATE_DATABASE_URL="<your-next-private-database-url>"-e NEXT_PRIVATE_DIRECT_DATABASE_URL="<your-next-private-database-url>"-e NEXT_PRIVATE_SMTP_TRANSPORT="<your-next-private-smtp-transport>"diff --git a/docker/production/compose.yml b/docker/production/compose.ymlindex 36682ee42..bd2b9597e 100644--- a/docker/production/compose.yml+++ b/docker/production/compose.yml@@ -29,6 +29,7 @@ services:- NEXT_PRIVATE_GOOGLE_CLIENT_ID=${NEXT_PRIVATE_GOOGLE_CLIENT_ID}- NEXT_PRIVATE_GOOGLE_CLIENT_SECRET=${NEXT_PRIVATE_GOOGLE_CLIENT_SECRET}- NEXT_PUBLIC_WEBAPP_URL=${NEXT_PUBLIC_WEBAPP_URL:?err}+ - NEXT_PRIVATE_INTERNAL_WEBAPP_URL=${NEXT_PRIVATE_INTERNAL_WEBAPP_URL:-http://localhost:$PORT}- NEXT_PUBLIC_MARKETING_URL=${NEXT_PUBLIC_MARKETING_URL:-https://documenso.com}- NEXT_PRIVATE_DATABASE_URL=${NEXT_PRIVATE_DATABASE_URL:?err}- NEXT_PRIVATE_DIRECT_DATABASE_URL=${NEXT_PRIVATE_DIRECT_DATABASE_URL:-${NEXT_PRIVATE_DATABASE_URL}}diff --git a/packages/lib/constants/app.ts b/packages/lib/constants/app.tsindex 622878fdf..789bdd44f 100644--- a/packages/lib/constants/app.ts+++ b/packages/lib/constants/app.ts@@ -6,6 +6,7 @@ export const APP_DOCUMENT_UPLOAD_SIZE_LIMIT =export const NEXT_PUBLIC_WEBAPP_URL = () => env('NEXT_PUBLIC_WEBAPP_URL');export const NEXT_PUBLIC_MARKETING_URL = () => env('NEXT_PUBLIC_MARKETING_URL');+export const NEXT_PRIVATE_INTERNAL_WEBAPP_URL = process.env.NEXT_PRIVATE_INTERNAL_WEBAPP_URL ?? NEXT_PUBLIC_WEBAPP_URL();export const IS_APP_MARKETING = process.env.NEXT_PUBLIC_PROJECT === 'marketing';export const IS_APP_WEB = process.env.NEXT_PUBLIC_PROJECT === 'web';diff --git a/packages/lib/jobs/client/local.ts b/packages/lib/jobs/client/local.tsindex 8a307f082..a0405dbf1 100644--- a/packages/lib/jobs/client/local.ts+++ b/packages/lib/jobs/client/local.ts@@ -6,7 +6,7 @@ import { json } from 'micro';import { prisma } from '@documenso/prisma';import { BackgroundJobStatus, Prisma } from '@documenso/prisma/client';-import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';+import { NEXT_PRIVATE_INTERNAL_WEBAPP_URL } from '../../constants/app';import { sign } from '../../server-only/crypto/sign';import { verify } from '../../server-only/crypto/verify';import {@@ -229,7 +229,7 @@ export class LocalJobProvider extends BaseJobProvider {}) {const { jobId, jobDefinitionId, data, isRetry } = options;- const endpoint = `${NEXT_PUBLIC_WEBAPP_URL()}/api/jobs/${jobDefinitionId}/${jobId}`;+ const endpoint = `${NEXT_PRIVATE_INTERNAL_WEBAPP_URL}/api/jobs/${jobDefinitionId}/${jobId}`;const signature = sign(data);const headers: Record<string, string> = {diff --git a/packages/lib/server-only/feature-flags/all.ts b/packages/lib/server-only/feature-flags/all.tsindex 71efd5425..05163b356 100644--- a/packages/lib/server-only/feature-flags/all.ts+++ b/packages/lib/server-only/feature-flags/all.ts@@ -5,7 +5,7 @@ import { getToken } from 'next-auth/jwt';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 { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL, NEXT_PRIVATE_INTERNAL_WEBAPP_URL } from '../../constants/app';import { extractDistinctUserId, mapJwtToFlagProperties } from './get';/**@@ -46,6 +46,10 @@ export default async function handlerFeatureFlagAll(req: Request) {if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001')) {res.headers.set('Access-Control-Allow-Origin', origin);}++ if (origin.startsWith(NEXT_PRIVATE_INTERNAL_WEBAPP_URL ?? 'http://localhost:3000')) {+ res.headers.set('Access-Control-Allow-Origin', origin);+ }}return res;diff --git a/packages/lib/server-only/feature-flags/get.ts b/packages/lib/server-only/feature-flags/get.tsindex 5b2b3b7fd..46a223d14 100644--- a/packages/lib/server-only/feature-flags/get.ts+++ b/packages/lib/server-only/feature-flags/get.ts@@ -7,7 +7,7 @@ import { getToken } from 'next-auth/jwt';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';+import { NEXT_PUBLIC_MARKETING_URL, NEXT_PUBLIC_WEBAPP_URL, NEXT_PRIVATE_INTERNAL_WEBAPP_URL } from '../../constants/app';/*** Evaluate a single feature flag based on the current user if possible.@@ -67,6 +67,10 @@ export default async function handleFeatureFlagGet(req: Request) {if (origin.startsWith(NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001')) {res.headers.set('Access-Control-Allow-Origin', origin);}++ if (origin.startsWith(NEXT_PRIVATE_INTERNAL_WEBAPP_URL ?? 'http://localhost:3000')) {+ res.headers.set('Access-Control-Allow-Origin', origin);+ }}return res;diff --git a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts b/packages/lib/server-only/webhooks/trigger/trigger-webhook.tsindex e0a5eaaaf..e226c808d 100644--- a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts+++ b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts@@ -1,6 +1,6 @@import type { WebhookTriggerEvents } from '@documenso/prisma/client';-import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';+import { NEXT_PRIVATE_INTERNAL_WEBAPP_URL } from '../../../constants/app';import { sign } from '../../crypto/sign';import { getAllWebhooksByEventTrigger } from '../get-all-webhooks-by-event-trigger';@@ -29,7 +29,7 @@ export const triggerWebhook = async ({ event, data, userId, teamId }: TriggerWebconst signature = sign(body);await Promise.race([- fetch(`${NEXT_PUBLIC_WEBAPP_URL()}/api/webhook/trigger`, {+ fetch(`${NEXT_PRIVATE_INTERNAL_WEBAPP_URL}/api/webhook/trigger`, {method: 'POST',headers: {'content-type': 'application/json',diff --git a/render.yaml b/render.yamlindex 9e1565621..5a6bbb954 100644--- a/render.yaml+++ b/render.yaml@@ -43,6 +43,8 @@ services:envVarKey: RENDER_EXTERNAL_URL- key: NEXT_PUBLIC_MARKETING_URLvalue: 'http://localhost:3001'+ - key: NEXT_PRIVATE_INTERNAL_WEBAPP_URL+ value: 'http://localhost:10000'# SMTP- key: NEXT_PRIVATE_SMTP_TRANSPORTdiff --git a/turbo.json b/turbo.jsonindex 66b9bf696..44bf77b62 100644--- a/turbo.json+++ b/turbo.json@@ -48,6 +48,7 @@"NEXT_PUBLIC_PROJECT","NEXT_PUBLIC_WEBAPP_URL","NEXT_PUBLIC_MARKETING_URL",+ "NEXT_PRIVATE_INTERNAL_WEBAPP_URL","NEXT_PUBLIC_POSTHOG_KEY","NEXT_PUBLIC_FEATURE_BILLING_ENABLED","NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID",