Skip to content

The Open Source DocuSign Alternative.

Merge branch 'main' into feat/add-runtime-env

Lucas Smithd13cf743bfe6
diff --cc apps/web/src/app/(unauthenticated)/signin/page.tsx
index 11f47d734,8331e7c03..71a558bc0
--- a/apps/web/src/app/(unauthenticated)/signin/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/signin/page.tsx
@@@ -1,9 -1,9 +1,11 @@@
import type { Metadata } from 'next';
import Link from 'next/link';
+ import { redirect } from 'next/navigation';
+import { env } from 'next-runtime-env';
+
import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth';
+ import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
import { SignInForm } from '~/components/forms/signin';
@@@ -11,8 -11,19 +13,21 @@@ export const metadata: Metadata =
title: 'Sign In',
};
- export default function SignInPage() {
+ type SignInPageProps = {
+ searchParams: {
+ email?: string;
+ };
+ };
+
+ export default function SignInPage({ searchParams }: SignInPageProps) {
+ const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP');
++
+ const rawEmail = typeof searchParams.email === 'string' ? searchParams.email : undefined;
+ const email = rawEmail ? decryptSecondaryData(rawEmail) : null;
+
+ if (!email && rawEmail) {
+ redirect('/signin');
+ }
return (
<div>
@@@ -22,9 -33,13 +37,13 @@@
Welcome back, we are lucky to have you.
</p>
- <SignInForm className="mt-4" isGoogleSSOEnabled={IS_GOOGLE_SSO_ENABLED} />
+ <SignInForm
+ className="mt-4"
+ initialEmail={email || undefined}
+ isGoogleSSOEnabled={IS_GOOGLE_SSO_ENABLED}
+ />
- {process.env.NEXT_PUBLIC_DISABLE_SIGNUP !== 'true' && (
+ {NEXT_PUBLIC_DISABLE_SIGNUP !== 'true' && (
<p className="text-muted-foreground mt-6 text-center text-sm">
Don't have an account?{' '}
<Link href="/signup" className="text-primary duration-200 hover:opacity-70">
diff --cc apps/web/src/app/(unauthenticated)/signup/page.tsx
index 2387b1c96,dbbbcdba9..b9365e1d5
--- a/apps/web/src/app/(unauthenticated)/signup/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/signup/page.tsx
@@@ -2,9 -2,8 +2,10 @@@ import type { Metadata } from 'next'
import Link from 'next/link';
import { redirect } from 'next/navigation';
+import { env } from 'next-runtime-env';
+
import { IS_GOOGLE_SSO_ENABLED } from '@documenso/lib/constants/auth';
+ import { decryptSecondaryData } from '@documenso/lib/server-only/crypto/decrypt';
import { SignUpForm } from '~/components/forms/signup';
@@@ -12,10 -11,14 +13,16 @@@ export const metadata: Metadata =
title: 'Sign Up',
};
- export default function SignUpPage() {
+ type SignUpPageProps = {
+ searchParams: {
+ email?: string;
+ };
+ };
+
+ export default function SignUpPage({ searchParams }: SignUpPageProps) {
- if (process.env.NEXT_PUBLIC_DISABLE_SIGNUP === 'true') {
+ const NEXT_PUBLIC_DISABLE_SIGNUP = env('NEXT_PUBLIC_DISABLE_SIGNUP');
+
+ if (NEXT_PUBLIC_DISABLE_SIGNUP === 'true') {
redirect('/signin');
}
diff --cc apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx
index a809ed23e,46182c36e..69dd88d79
--- a/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx
+++ b/apps/web/src/components/(dashboard)/avatar/avatar-with-recipient.tsx
@@@ -4,7 -4,7 +4,8 @@@ import React from 'react'
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 { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
import type { Recipient } from '@documenso/prisma/client';
import { cn } from '@documenso/ui/lib/utils';
diff --cc packages/ee/server-only/limits/client.ts
index fa31e6e40,9a36928b1..f6dfaec5b
--- a/packages/ee/server-only/limits/client.ts
+++ b/packages/ee/server-only/limits/client.ts
@@@ -6,13 -6,18 +6,18 @@@ import { ZLimitsResponseSchema } from '
export type GetLimitsOptions = {
headers?: Record<string, string>;
+ teamId?: number | null;
};
- export const getLimits = async ({ headers }: GetLimitsOptions = {}) => {
+ export const getLimits = async ({ headers, teamId }: GetLimitsOptions = {}) => {
const requestHeaders = headers ?? {};
- const url = new URL(`${APP_BASE_URL}/api/limits`);
+ const url = new URL('/api/limits', APP_BASE_URL() ?? 'http://localhost:3000');
+ if (teamId) {
+ requestHeaders['team-id'] = teamId.toString();
+ }
+
return fetch(url, {
headers: {
...requestHeaders,
diff --cc packages/lib/constants/app.ts
index 0675bb84b,6c4d056d0..71f227764
--- a/packages/lib/constants/app.ts
+++ b/packages/lib/constants/app.ts
@@@ -1,13 -1,16 +1,19 @@@
-export const IS_APP_MARKETING = process.env.NEXT_PUBLIC_PROJECT === 'marketing';
-export const IS_APP_WEB = process.env.NEXT_PUBLIC_PROJECT === 'web';
-export const IS_BILLING_ENABLED = process.env.NEXT_PUBLIC_FEATURE_BILLING_ENABLED === 'true';
+import { env } from 'next-runtime-env';
+ export const APP_DOCUMENT_UPLOAD_SIZE_LIMIT =
+ Number(process.env.NEXT_PUBLIC_DOCUMENT_SIZE_UPLOAD_LIMIT) || 50;
+
-export const APP_FOLDER = IS_APP_MARKETING ? 'marketing' : 'web';
+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 APP_BASE_URL = IS_APP_WEB
- ? process.env.NEXT_PUBLIC_WEBAPP_URL
- : process.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 WEBAPP_BASE_URL = process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000';
+export const APP_FOLDER = () => (IS_APP_MARKETING() ? 'marketing' : 'web');
-export const MARKETING_BASE_URL = process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001';
+export const APP_BASE_URL = () =>
+ IS_APP_WEB() ? NEXT_PUBLIC_WEBAPP_URL() : NEXT_PUBLIC_MARKETING_URL();
++
++export const WEBAPP_BASE_URL = NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000';
++export const MARKETING_BASE_URL = NEXT_PUBLIC_MARKETING_URL() ?? 'http://localhost:3001';
diff --cc packages/lib/next-auth/auth-options.ts
index 8f324d248,f23295a81..c8588ca4e
--- a/packages/lib/next-auth/auth-options.ts
+++ b/packages/lib/next-auth/auth-options.ts
@@@ -7,10 -7,9 +7,10 @@@ import type { JWT } from 'next-auth/jwt
import CredentialsProvider from 'next-auth/providers/credentials';
import type { GoogleProfile } from 'next-auth/providers/google';
import GoogleProvider from 'next-auth/providers/google';
+import { env } from 'next-runtime-env';
import { prisma } from '@documenso/prisma';
- import { IdentityProvider } from '@documenso/prisma/client';
+ import { IdentityProvider, UserSecurityAuditLogType } from '@documenso/prisma/client';
import { isTwoFactorAuthenticationEnabled } from '../server-only/2fa/is-2fa-availble';
import { validateTwoFactorAuthentication } from '../server-only/2fa/validate-2fa';
diff --cc packages/lib/server-only/document/resend-document.tsx
index 85e148a57,d72da3a8d..98d7cb137
--- a/packages/lib/server-only/document/resend-document.tsx
+++ b/packages/lib/server-only/document/resend-document.tsx
@@@ -6,10 -6,12 +6,14 @@@ import { DocumentInviteEmailTemplate }
import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template';
import { prisma } from '@documenso/prisma';
- import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';
+ import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+ import type { Prisma } from '@documenso/prisma/client';
+
+ import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles';
+ import { getDocumentWhereInput } from './get-document-by-id';
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+
export type ResendDocumentOptions = {
documentId: number;
userId: number;
diff --cc packages/lib/server-only/document/send-document.tsx
index 86f610cc9,312b30462..5f0fe8557
--- a/packages/lib/server-only/document/send-document.tsx
+++ b/packages/lib/server-only/document/send-document.tsx
@@@ -6,10 -6,10 +6,12 @@@ import { DocumentInviteEmailTemplate }
import { FROM_ADDRESS, FROM_NAME } from '@documenso/lib/constants/email';
import { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template';
import { prisma } from '@documenso/prisma';
- import { DocumentStatus, SendStatus } from '@documenso/prisma/client';
+ import { DocumentStatus, RecipientRole, SendStatus } from '@documenso/prisma/client';
+
+ import { RECIPIENT_ROLES_DESCRIPTION } from '../../constants/recipient-roles';
+import { NEXT_PUBLIC_WEBAPP_URL } from '../../constants/app';
+
export type SendDocumentOptions = {
documentId: number;
userId: number;