-
+
+
);
diff --git a/apps/web/src/app/(unauthenticated)/reset-password/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/reset-password/[token]/page.tsx
index 04afd2c4d..1d469eb74 100644
--- a/apps/web/src/app/(unauthenticated)/reset-password/[token]/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/reset-password/[token]/page.tsx
@@ -19,19 +19,21 @@ export default async function ResetPasswordPage({ params: { token } }: ResetPass
}
return (
-
+
{children}
+ {children}
-
Reset Password
+
+
);
}
diff --git a/apps/web/src/app/(unauthenticated)/reset-password/page.tsx b/apps/web/src/app/(unauthenticated)/reset-password/page.tsx
index 93cd41ebb..20d4bfe57 100644
--- a/apps/web/src/app/(unauthenticated)/reset-password/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/reset-password/page.tsx
@@ -9,17 +9,19 @@ export const metadata: Metadata = {
export default function ResetPasswordPage() {
return (
-
+
Reset Password
-Please choose your new password
+Please choose your new password
-- Don't have an account?{' '} - - Sign up - -
++ Don't have an account?{' '} + + Sign up + +
+
-
Unable to reset password
+
+
);
}
diff --git a/apps/web/src/app/(unauthenticated)/signin/page.tsx b/apps/web/src/app/(unauthenticated)/signin/page.tsx
index 50356a5bb..21136f2e6 100644
--- a/apps/web/src/app/(unauthenticated)/signin/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/signin/page.tsx
@@ -30,36 +30,27 @@ export default function SignInPage({ searchParams }: SignInPageProps) {
}
return (
-
+
Unable to reset password
-- The token you have used to reset your password is either expired or it never existed. If you - have still forgotten your password, please request a new reset link. -
++ The token you have used to reset your password is either expired or it never existed. If + you have still forgotten your password, please request a new reset link. +
- + +
-
Sign in to your account
+
+
);
}
diff --git a/apps/web/src/app/(unauthenticated)/signup/page.tsx b/apps/web/src/app/(unauthenticated)/signup/page.tsx
index b9365e1d5..ad758a8e9 100644
--- a/apps/web/src/app/(unauthenticated)/signup/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/signup/page.tsx
@@ -1,5 +1,4 @@
import type { Metadata } from 'next';
-import Link from 'next/link';
import { redirect } from 'next/navigation';
import { env } from 'next-runtime-env';
@@ -7,7 +6,7 @@ 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';
+import { SignUpFormV2 } from '~/components/forms/v2/signup';
export const metadata: Metadata = {
title: 'Sign Up',
@@ -34,26 +33,10 @@ export default function SignUpPage({ searchParams }: SignUpPageProps) {
}
return (
-
+
+ +
Sign in to your account
-- Welcome back, we are lucky to have you. -
- -- Don't have an account?{' '} - - Sign up - +
+ Welcome back, we are lucky to have you.
- )} -- - Forgot your password? - -
++ +
+ Don't have an account?{' '} + + Sign up + +
+ )} +
-
+ Create a new account
- -- Create your account and start using state-of-the-art document signing. Open and beautiful - signing is within your grasp. -
- -- Already have an account?{' '} - - Sign in instead - -
-
-
Invalid token
+
+
);
}
diff --git a/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx
index 53ad4461b..8d67ca218 100644
--- a/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/team/verify/email/[token]/page.tsx
@@ -22,16 +22,18 @@ export default async function VerifyTeamEmailPage({ params: { token } }: VerifyT
if (!teamEmailVerification || isTokenExpired(teamEmailVerification.expiresAt)) {
return (
-
+
Invalid token
-- This token is invalid or has expired. Please contact your team for a new invitation. -
++ This token is invalid or has expired. Please contact your team for a new invitation. +
- + +
-
Invalid link
+
+
);
}
diff --git a/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx
index 819b7e970..719ec5b76 100644
--- a/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/team/verify/transfer/[token]/page.tsx
@@ -25,17 +25,19 @@ export default async function VerifyTeamTransferPage({
if (!teamTransferVerification || isTokenExpired(teamTransferVerification.expiresAt)) {
return (
-
+
Invalid link
-- This link is invalid or has expired. Please contact your team to resend a verification. -
++ This link is invalid or has expired. Please contact your team to resend a verification. +
- + +
-
Invalid link
+
+
);
}
diff --git a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx
index f4b8b90d7..c5b6fbcff 100644
--- a/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/unverified-account/page.tsx
@@ -4,23 +4,25 @@ import { SendConfirmationEmailForm } from '~/components/forms/send-confirmation-
export default function UnverifiedAccount() {
return (
-
+
Invalid link
-- This link is invalid or has expired. Please contact your team to resend a transfer - request. -
++ This link is invalid or has expired. Please contact your team to resend a transfer + request. +
- + +
-
-
-
-
Confirm email
+
+
);
diff --git a/apps/web/src/app/(unauthenticated)/verify-email/[token]/page.tsx b/apps/web/src/app/(unauthenticated)/verify-email/[token]/page.tsx
index f671fb101..9536f937c 100644
--- a/apps/web/src/app/(unauthenticated)/verify-email/[token]/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/verify-email/[token]/page.tsx
@@ -14,15 +14,17 @@ export type PageProps = {
export default async function VerifyEmailPage({ params: { token } }: PageProps) {
if (!token) {
return (
-
+
+
+
+
Confirm email
-- To gain access to your account, please confirm your email address by clicking on the - confirmation link from your inbox. -
++ To gain access to your account, please confirm your email address by clicking on the + confirmation link from your inbox. +
-- If you don't find the confirmation link in your inbox, you can request a new one below. -
++ If you don't find the confirmation link in your inbox, you can request a new one below. +
-
-
-
+
+
);
}
@@ -31,22 +33,24 @@ export default async function VerifyEmailPage({ params: { token } }: PageProps)
if (verified === null) {
return (
-
+
+
- No token provided
-- It seems that there is no token provided. Please check your email and try again. -
+No token provided
++ It seems that there is no token provided. Please check your email and try again. +
+
-
-
+
+
- );
- }
-
- return (
-
+
);
@@ -54,17 +58,41 @@ export default async function VerifyEmailPage({ params: { token } }: PageProps)
if (!verified) {
return (
+
+
-
-
Something went wrong
+
+
Something went wrong
-- We were unable to verify your email. If your email is not verified already, please try - again. -
++ We were unable to verify your email. If your email is not verified already, please try + again. +
- + +
+
+ );
+ }
+
+ return (
+
+
+
+
+
+
+
+ Your token has expired!
+ ++ It seems that the provided token has expired. We've just sent you another token, + please check your email and try again. +
+ + +
-
-
Your token has expired!
+Email Confirmed!
- It seems that the provided token has expired. We've just sent you another token, please - check your email and try again. + Your email has been successfully confirmed! You can now use all features of Documenso.
-
);
}
diff --git a/apps/web/src/app/(unauthenticated)/verify-email/page.tsx b/apps/web/src/app/(unauthenticated)/verify-email/page.tsx
index 30d2baf16..f002ffda6 100644
--- a/apps/web/src/app/(unauthenticated)/verify-email/page.tsx
+++ b/apps/web/src/app/(unauthenticated)/verify-email/page.tsx
@@ -11,22 +11,26 @@ export const metadata: Metadata = {
export default function EmailVerificationWithoutTokenPage() {
return (
-
-
-
-
-
Email Confirmed!
- -- Your email has been successfully confirmed! You can now use all features of Documenso. -
- - -
-
-
+
+
+
);
diff --git a/apps/web/src/app/api/v1/openapi/page.tsx b/apps/web/src/app/api/v1/openapi/page.tsx
index ca5c3a5ed..24e14c958 100644
--- a/apps/web/src/app/api/v1/openapi/page.tsx
+++ b/apps/web/src/app/api/v1/openapi/page.tsx
@@ -1,3 +1,11 @@
'use client';
-export { OpenApiDocsPage as default } from '@documenso/api/v1/api-documentation';
+import dynamic from 'next/dynamic';
+
+const Docs = dynamic(async () => import('@documenso/api/v1/api-documentation'), {
+ ssr: false,
+});
+
+export default function OpenApiDocsPage() {
+ return
+
-
-
Uh oh! Looks like you're missing a token
+
+
+ Uh oh! Looks like you're missing a token +
-- It seems that there is no token provided, if you are trying to verify your email please - follow the link in your email. -
++ It seems that there is no token provided, if you are trying to verify your email please + follow the link in your email. +
- + +
+
+
+ );
+}
diff --git a/apps/web/src/components/(dashboard)/settings/layout/header.tsx b/apps/web/src/components/(dashboard)/settings/layout/header.tsx
index 3fe567b81..5722d1985 100644
--- a/apps/web/src/components/(dashboard)/settings/layout/header.tsx
+++ b/apps/web/src/components/(dashboard)/settings/layout/header.tsx
@@ -1,15 +1,18 @@
import React from 'react';
+import { cn } from '@documenso/ui/lib/utils';
+
export type SettingsHeaderProps = {
title: string;
subtitle: string;
children?: React.ReactNode;
+ className?: string;
};
-export const SettingsHeader = ({ children, title, subtitle }: SettingsHeaderProps) => {
+export const SettingsHeader = ({ children, title, subtitle, className }: SettingsHeaderProps) => {
return (
<>
-
+
;
+
+export type ClaimPublicProfileDialogFormProps = {
+ open: boolean;
+ onOpenChange?: (open: boolean) => void;
+ onClaimed?: () => void;
+ user: User;
+};
+
+export const ClaimPublicProfileDialogForm = ({
+ open,
+ onOpenChange,
+ onClaimed,
+ user,
+}: ClaimPublicProfileDialogFormProps) => {
+ const { toast } = useToast();
+
+ const [claimed, setClaimed] = useState(false);
+
+ const baseUrl = new URL(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000');
+
+ const form = useForm({
+ values: {
+ url: user.url || '',
+ },
+ resolver: zodResolver(ZClaimPublicProfileFormSchema),
+ });
+
+ const { mutateAsync: updatePublicProfile } = trpc.profile.updatePublicProfile.useMutation();
+
+ const isSubmitting = form.formState.isSubmitting;
+
+ const onFormSubmit = async ({ url }: TClaimPublicProfileFormSchema) => {
+ try {
+ await updatePublicProfile({
+ url,
+ });
+
+ setClaimed(true);
+ onClaimed?.();
+ } catch (err) {
+ const error = AppError.parseError(err);
+
+ if (error.code === AppErrorCode.PROFILE_URL_TAKEN) {
+ form.setError('url', {
+ type: 'manual',
+ message: 'This username is already taken',
+ });
+ } else if (error.code === AppErrorCode.PREMIUM_PROFILE_URL) {
+ form.setError('url', {
+ type: 'manual',
+ message: error.message,
+ });
+ } else if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
+ toast({
+ title: 'An error occurred',
+ description: error.userMessage ?? error.message,
+ variant: 'destructive',
+ });
+ } else {
+ toast({
+ title: 'An unknown error occurred',
+ variant: 'destructive',
+ description:
+ 'We encountered an unknown error while attempting to save your details. Please try again later.',
+ });
+ }
+ }
+ };
+
+ return (
+
+ );
+};
diff --git a/apps/web/src/components/forms/signin.tsx b/apps/web/src/components/forms/signin.tsx
index ec690a568..1d6d32f1f 100644
--- a/apps/web/src/components/forms/signin.tsx
+++ b/apps/web/src/components/forms/signin.tsx
@@ -2,6 +2,7 @@
import { useState } from 'react';
+import Link from 'next/link';
import { useRouter } from 'next/navigation';
import { zodResolver } from '@hookform/resolvers/zod';
@@ -195,9 +196,11 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
render={({ field }) => (
Email
+
+
)}
@@ -209,9 +212,19 @@ export const SignInForm = ({ className, initialEmail, isGoogleSSOEnabled }: Sign
render={({ field }) => (
Password
+
+
+
)}
diff --git a/apps/web/src/components/forms/v2/signup.tsx b/apps/web/src/components/forms/v2/signup.tsx
new file mode 100644
index 000000000..189116e01
--- /dev/null
+++ b/apps/web/src/components/forms/v2/signup.tsx
@@ -0,0 +1,460 @@
+'use client';
+
+import { useState } from 'react';
+
+import Image from 'next/image';
+import Link from 'next/link';
+import { useRouter, useSearchParams } from 'next/navigation';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { AnimatePresence, motion } from 'framer-motion';
+import { signIn } from 'next-auth/react';
+import { useForm } from 'react-hook-form';
+import { FcGoogle } from 'react-icons/fc';
+import { z } from 'zod';
+
+import communityCardsImage from '@documenso/assets/images/community-cards.png';
+import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { TRPCClientError } from '@documenso/trpc/client';
+import { trpc } from '@documenso/trpc/react';
+import { ZPasswordSchema } from '@documenso/trpc/server/auth-router/schema';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+ Form,
+ FormControl,
+ FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+} from '@documenso/ui/primitives/form/form';
+import { Input } from '@documenso/ui/primitives/input';
+import { PasswordInput } from '@documenso/ui/primitives/password-input';
+import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { UserProfileSkeleton } from '~/components/ui/user-profile-skeleton';
+import { UserProfileTimur } from '~/components/ui/user-profile-timur';
+
+const SIGN_UP_REDIRECT_PATH = '/documents';
+
+type SignUpStep = 'BASIC_DETAILS' | 'CLAIM_USERNAME';
+
+export const ZSignUpFormV2Schema = z
+ .object({
+ name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
+ email: z.string().email().min(1),
+ password: ZPasswordSchema,
+ signature: z.string().min(1, { message: 'We need your signature to sign documents' }),
+ url: z
+ .string()
+ .trim()
+ .toLowerCase()
+ .min(1, { message: 'We need a username to create your profile' })
+ .regex(/^[a-z0-9-]+$/, {
+ message: 'Username can only container alphanumeric characters and dashes.',
+ }),
+ })
+ .refine(
+ (data) => {
+ const { name, email, password } = data;
+ return !password.includes(name) && !password.includes(email.split('@')[0]);
+ },
+ {
+ message: 'Password should not be common or based on personal information',
+ },
+ );
+
+export type TSignUpFormV2Schema = z.infer;
+
+export type SignUpFormV2Props = {
+ className?: string;
+ initialEmail?: string;
+ isGoogleSSOEnabled?: boolean;
+};
+
+export const SignUpFormV2 = ({
+ className,
+ initialEmail,
+ isGoogleSSOEnabled,
+}: SignUpFormV2Props) => {
+ const { toast } = useToast();
+ const analytics = useAnalytics();
+ const router = useRouter();
+ const searchParams = useSearchParams();
+
+ const [step, setStep] = useState('BASIC_DETAILS');
+
+ const utmSrc = searchParams?.get('utm_source') ?? null;
+
+ const baseUrl = new URL(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000');
+
+ const form = useForm({
+ values: {
+ name: '',
+ email: initialEmail ?? '',
+ password: '',
+ signature: '',
+ url: '',
+ },
+ mode: 'onBlur',
+ resolver: zodResolver(ZSignUpFormV2Schema),
+ });
+
+ const isSubmitting = form.formState.isSubmitting;
+
+ const name = form.watch('name');
+ const url = form.watch('url');
+
+ // To continue we need to make sure name, email, password and signature are valid
+ const canContinue =
+ form.formState.dirtyFields.name &&
+ form.formState.errors.name === undefined &&
+ form.formState.dirtyFields.email &&
+ form.formState.errors.email === undefined &&
+ form.formState.dirtyFields.password &&
+ form.formState.errors.password === undefined &&
+ form.formState.dirtyFields.signature &&
+ form.formState.errors.signature === undefined;
+
+ const { mutateAsync: signup } = trpc.auth.signup.useMutation();
+
+ const onFormSubmit = async ({ name, email, password, signature, url }: TSignUpFormV2Schema) => {
+ try {
+ await signup({ name, email, password, signature, url });
+
+ router.push(`/unverified-account`);
+
+ toast({
+ title: 'Registration Successful',
+ description:
+ 'You have successfully registered. Please verify your account by clicking on the link you received in the email.',
+ duration: 5000,
+ });
+
+ analytics.capture('App: User Sign Up', {
+ email,
+ timestamp: new Date().toISOString(),
+ custom_campaign_params: { src: utmSrc },
+ });
+ } catch (err) {
+ const error = AppError.parseError(err);
+
+ if (error.code === AppErrorCode.PROFILE_URL_TAKEN) {
+ form.setError('url', {
+ type: 'manual',
+ message: 'This username has already been taken',
+ });
+ } else if (error.code === AppErrorCode.PREMIUM_PROFILE_URL) {
+ form.setError('url', {
+ type: 'manual',
+ message: error.message,
+ });
+ } else if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
+ toast({
+ title: 'An error occurred',
+ description: err.message,
+ variant: 'destructive',
+ });
+ } else {
+ toast({
+ title: 'An unknown error occurred',
+ description:
+ 'We encountered an unknown error while attempting to sign you up. Please try again later.',
+ variant: 'destructive',
+ });
+ }
+ }
+ };
+
+ const onSignUpWithGoogleClick = async () => {
+ try {
+ await signIn('google', { callbackUrl: SIGN_UP_REDIRECT_PATH });
+ } catch (err) {
+ toast({
+ title: 'An unknown error occurred',
+ description:
+ 'We encountered an unknown error while attempting to sign you Up. Please try again later.',
+ variant: 'destructive',
+ });
+ }
+ };
+
+ return (
+ ;
+ rows?: number;
+};
+
+export const UserProfileSkeleton = ({ className, user, rows = 2 }: UserProfileSkeletonProps) => {
+ const baseUrl = new URL(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000');
+
+ return (
+ = {
app_teams: true,
app_document_page_view_history_sheet: false,
marketing_header_single_player_mode: false,
+ marketing_profiles_announcement_bar: true,
} as const;
/**
diff --git a/packages/lib/errors/app-error.ts b/packages/lib/errors/app-error.ts
index 3337bab4c..f43f9c3ba 100644
--- a/packages/lib/errors/app-error.ts
+++ b/packages/lib/errors/app-error.ts
@@ -18,6 +18,8 @@ export enum AppErrorCode {
'RETRY_EXCEPTION' = 'RetryException',
'SCHEMA_FAILED' = 'SchemaFailed',
'TOO_MANY_REQUESTS' = 'TooManyRequests',
+ 'PROFILE_URL_TAKEN' = 'ProfileUrlTaken',
+ 'PREMIUM_PROFILE_URL' = 'PremiumProfileUrl',
}
const genericErrorCodeToTrpcErrorCodeMap: Record = {
@@ -32,6 +34,8 @@ const genericErrorCodeToTrpcErrorCodeMap: Record = {
[AppErrorCode.RETRY_EXCEPTION]: 'INTERNAL_SERVER_ERROR',
[AppErrorCode.SCHEMA_FAILED]: 'INTERNAL_SERVER_ERROR',
[AppErrorCode.TOO_MANY_REQUESTS]: 'TOO_MANY_REQUESTS',
+ [AppErrorCode.PROFILE_URL_TAKEN]: 'BAD_REQUEST',
+ [AppErrorCode.PREMIUM_PROFILE_URL]: 'BAD_REQUEST',
};
export const ZAppErrorJsonSchema = z.object({
diff --git a/packages/lib/server-only/admin/get-entire-document.ts b/packages/lib/server-only/admin/get-entire-document.ts
new file mode 100644
index 000000000..e74ee4c7b
--- /dev/null
+++ b/packages/lib/server-only/admin/get-entire-document.ts
@@ -0,0 +1,26 @@
+import { prisma } from '@documenso/prisma';
+
+export type GetEntireDocumentOptions = {
+ id: number;
+};
+
+export const getEntireDocument = async ({ id }: GetEntireDocumentOptions) => {
+ const document = await prisma.document.findFirstOrThrow({
+ where: {
+ id,
+ },
+ include: {
+ Recipient: {
+ include: {
+ Field: {
+ include: {
+ Signature: true,
+ },
+ },
+ },
+ },
+ },
+ });
+
+ return document;
+};
diff --git a/packages/lib/server-only/admin/update-recipient.ts b/packages/lib/server-only/admin/update-recipient.ts
new file mode 100644
index 000000000..dcd826476
--- /dev/null
+++ b/packages/lib/server-only/admin/update-recipient.ts
@@ -0,0 +1,30 @@
+import { prisma } from '@documenso/prisma';
+import { SigningStatus } from '@documenso/prisma/client';
+
+export type UpdateRecipientOptions = {
+ id: number;
+ name: string | undefined;
+ email: string | undefined;
+};
+
+export const updateRecipient = async ({ id, name, email }: UpdateRecipientOptions) => {
+ const recipient = await prisma.recipient.findFirstOrThrow({
+ where: {
+ id,
+ },
+ });
+
+ if (recipient.signingStatus === SigningStatus.SIGNED) {
+ throw new Error('Cannot update a recipient that has already signed.');
+ }
+
+ return await prisma.recipient.update({
+ where: {
+ id,
+ },
+ data: {
+ name,
+ email,
+ },
+ });
+};
diff --git a/packages/lib/server-only/document/get-document-by-token.ts b/packages/lib/server-only/document/get-document-by-token.ts
index 18f9a5161..d242e72fd 100644
--- a/packages/lib/server-only/document/get-document-by-token.ts
+++ b/packages/lib/server-only/document/get-document-by-token.ts
@@ -70,6 +70,6 @@ export const getDocumentAndRecipientByToken = async ({
return {
...result,
- Recipient: result.Recipient[0],
+ Recipient: result.Recipient,
};
};
diff --git a/packages/lib/server-only/document/seal-document.ts b/packages/lib/server-only/document/seal-document.ts
index 8f39e3d25..95b7d9dc4 100644
--- a/packages/lib/server-only/document/seal-document.ts
+++ b/packages/lib/server-only/document/seal-document.ts
@@ -2,7 +2,7 @@
import { nanoid } from 'nanoid';
import path from 'node:path';
-import { PDFDocument } from 'pdf-lib';
+import { PDFDocument, PDFSignature, rectangle } from 'pdf-lib';
import PostHogServerClient from '@documenso/lib/server-only/feature-flags/get-post-hog-server-client';
import { DOCUMENT_AUDIT_LOG_TYPE } from '@documenso/lib/types/document-audit-logs';
@@ -22,12 +22,14 @@ import { sendCompletedEmail } from './send-completed-email';
export type SealDocumentOptions = {
documentId: number;
sendEmail?: boolean;
+ isResealing?: boolean;
requestMetadata?: RequestMetadata;
};
export const sealDocument = async ({
documentId,
sendEmail = true,
+ isResealing = false,
requestMetadata,
}: SealDocumentOptions) => {
'use server';
@@ -78,11 +80,43 @@ export const sealDocument = async ({
throw new Error(`Document ${document.id} has unsigned fields`);
}
+ if (isResealing) {
+ // If we're resealing we want to use the initial data for the document
+ // so we aren't placing fields on top of eachother.
+ documentData.data = documentData.initialData;
+ }
+
// !: Need to write the fields onto the document as a hard copy
const pdfData = await getFile(documentData);
const doc = await PDFDocument.load(pdfData);
+ const form = doc.getForm();
+
+ // Remove old signatures
+ for (const field of form.getFields()) {
+ if (field instanceof PDFSignature) {
+ field.acroField.getWidgets().forEach((widget) => {
+ widget.ensureAP();
+
+ try {
+ widget.getNormalAppearance();
+ } catch (e) {
+ const { context } = widget.dict;
+
+ const xobj = context.formXObject([rectangle(0, 0, 0, 0)]);
+
+ const streamRef = context.register(xobj);
+
+ widget.setNormalAppearance(streamRef);
+ }
+ });
+ }
+ }
+
+ // Flatten the form to stop annotation layers from appearing above documenso fields
+ form.flatten();
+
for (const field of fields) {
await insertFieldInPDF(doc, field);
}
@@ -134,7 +168,7 @@ export const sealDocument = async ({
});
});
- if (sendEmail) {
+ if (sendEmail && !isResealing) {
await sendCompletedEmail({ documentId, requestMetadata });
}
diff --git a/packages/lib/server-only/user/create-user.ts b/packages/lib/server-only/user/create-user.ts
index 1852dc12e..dbcec9efb 100644
--- a/packages/lib/server-only/user/create-user.ts
+++ b/packages/lib/server-only/user/create-user.ts
@@ -7,15 +7,17 @@ import { IdentityProvider, Prisma, TeamMemberInviteStatus } from '@documenso/pri
import { IS_BILLING_ENABLED } from '../../constants/app';
import { SALT_ROUNDS } from '../../constants/auth';
+import { AppError, AppErrorCode } from '../../errors/app-error';
export interface CreateUserOptions {
name: string;
email: string;
password: string;
signature?: string | null;
+ url?: string;
}
-export const createUser = async ({ name, email, password, signature }: CreateUserOptions) => {
+export const createUser = async ({ name, email, password, signature, url }: CreateUserOptions) => {
const hashedPassword = await hash(password, SALT_ROUNDS);
const userExists = await prisma.user.findFirst({
@@ -28,6 +30,22 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
throw new Error('User already exists');
}
+ if (url) {
+ const urlExists = await prisma.user.findFirst({
+ where: {
+ url,
+ },
+ });
+
+ if (urlExists) {
+ throw new AppError(
+ AppErrorCode.PROFILE_URL_TAKEN,
+ 'Profile username is taken',
+ 'The profile username is already taken',
+ );
+ }
+ }
+
const user = await prisma.user.create({
data: {
name,
@@ -35,6 +53,7 @@ export const createUser = async ({ name, email, password, signature }: CreateUse
password: hashedPassword,
signature,
identityProvider: IdentityProvider.DOCUMENSO,
+ url,
},
});
diff --git a/packages/lib/server-only/user/delete-user.ts b/packages/lib/server-only/user/delete-user.ts
index d6d4284b4..71f579c26 100644
--- a/packages/lib/server-only/user/delete-user.ts
+++ b/packages/lib/server-only/user/delete-user.ts
@@ -4,20 +4,18 @@ import { DocumentStatus } from '@documenso/prisma/client';
import { deletedAccountServiceAccount } from './service-accounts/deleted-account';
export type DeleteUserOptions = {
- email: string;
+ id: number;
};
-export const deleteUser = async ({ email }: DeleteUserOptions) => {
+export const deleteUser = async ({ id }: DeleteUserOptions) => {
const user = await prisma.user.findFirst({
where: {
- email: {
- contains: email,
- },
+ id,
},
});
if (!user) {
- throw new Error(`User with email ${email} not found`);
+ throw new Error(`User with ID ${id} not found`);
}
const serviceAccount = await deletedAccountServiceAccount();
diff --git a/packages/lib/server-only/user/update-public-profile.ts b/packages/lib/server-only/user/update-public-profile.ts
new file mode 100644
index 000000000..f70f02cf2
--- /dev/null
+++ b/packages/lib/server-only/user/update-public-profile.ts
@@ -0,0 +1,49 @@
+import { prisma } from '@documenso/prisma';
+
+import { AppError, AppErrorCode } from '../../errors/app-error';
+
+export type UpdatePublicProfileOptions = {
+ userId: number;
+ url: string;
+};
+
+export const updatePublicProfile = async ({ userId, url }: UpdatePublicProfileOptions) => {
+ const isUrlTaken = await prisma.user.findFirst({
+ select: {
+ id: true,
+ },
+ where: {
+ id: {
+ not: userId,
+ },
+ url,
+ },
+ });
+
+ if (isUrlTaken) {
+ throw new AppError(
+ AppErrorCode.PROFILE_URL_TAKEN,
+ 'Profile username is taken',
+ 'The profile username is already taken',
+ );
+ }
+
+ return await prisma.user.update({
+ where: {
+ id: userId,
+ },
+ data: {
+ url,
+ userProfile: {
+ upsert: {
+ create: {
+ bio: '',
+ },
+ update: {
+ bio: '',
+ },
+ },
+ },
+ },
+ });
+};
diff --git a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts
index d43d227ea..e0a5eaaaf 100644
--- a/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts
+++ b/packages/lib/server-only/webhooks/trigger/trigger-webhook.ts
@@ -2,6 +2,7 @@ import type { WebhookTriggerEvents } from '@documenso/prisma/client';
import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
import { sign } from '../../crypto/sign';
+import { getAllWebhooksByEventTrigger } from '../get-all-webhooks-by-event-trigger';
export type TriggerWebhookOptions = {
event: WebhookTriggerEvents;
@@ -19,6 +20,12 @@ export const triggerWebhook = async ({ event, data, userId, teamId }: TriggerWeb
teamId,
};
+ const registeredWebhooks = await getAllWebhooksByEventTrigger({ event, userId, teamId });
+
+ if (registeredWebhooks.length === 0) {
+ return;
+ }
+
const signature = sign(body);
await Promise.race([
diff --git a/packages/prisma/migrations/20240220115435_add_public_profile_url_bio/migration.sql b/packages/prisma/migrations/20240220115435_add_public_profile_url_bio/migration.sql
new file mode 100644
index 000000000..719968aff
--- /dev/null
+++ b/packages/prisma/migrations/20240220115435_add_public_profile_url_bio/migration.sql
@@ -0,0 +1,25 @@
+/*
+ Warnings:
+
+ - A unique constraint covering the columns `[profileURL]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN "profileURL" TEXT;
+
+-- CreateTable
+CREATE TABLE "UserProfile" (
+ "profileURL" TEXT NOT NULL,
+ "profileBio" TEXT,
+
+ CONSTRAINT "UserProfile_pkey" PRIMARY KEY ("profileURL")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserProfile_profileURL_key" ON "UserProfile"("profileURL");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_profileURL_key" ON "User"("profileURL");
+
+-- AddForeignKey
+ALTER TABLE "User" ADD CONSTRAINT "User_profileURL_fkey" FOREIGN KEY ("profileURL") REFERENCES "UserProfile"("profileURL") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/prisma/migrations/20240227111633_rework_user_profiles/migration.sql b/packages/prisma/migrations/20240227111633_rework_user_profiles/migration.sql
new file mode 100644
index 000000000..6bf9c0759
--- /dev/null
+++ b/packages/prisma/migrations/20240227111633_rework_user_profiles/migration.sql
@@ -0,0 +1,37 @@
+/*
+ Warnings:
+
+ - You are about to drop the column `profileURL` on the `User` table. All the data in the column will be lost.
+ - The primary key for the `UserProfile` table will be changed. If it partially fails, the table could be left without primary key constraint.
+ - You are about to drop the column `profileBio` on the `UserProfile` table. All the data in the column will be lost.
+ - You are about to drop the column `profileURL` on the `UserProfile` table. All the data in the column will be lost.
+ - A unique constraint covering the columns `[url]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+ - Added the required column `id` to the `UserProfile` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "User" DROP CONSTRAINT "User_profileURL_fkey";
+
+-- DropIndex
+DROP INDEX "User_profileURL_key";
+
+-- DropIndex
+DROP INDEX "UserProfile_profileURL_key";
+
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "profileURL",
+ADD COLUMN "url" TEXT;
+
+-- AlterTable
+ALTER TABLE "UserProfile" DROP CONSTRAINT "UserProfile_pkey",
+DROP COLUMN "profileBio",
+DROP COLUMN "profileURL",
+ADD COLUMN "bio" TEXT,
+ADD COLUMN "id" INTEGER NOT NULL,
+ADD CONSTRAINT "UserProfile_pkey" PRIMARY KEY ("id");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_url_key" ON "User"("url");
+
+-- AddForeignKey
+ALTER TABLE "UserProfile" ADD CONSTRAINT "UserProfile_id_fkey" FOREIGN KEY ("id") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index 0baf98bf2..b1bf9f985 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -43,7 +43,9 @@ model User {
twoFactorSecret String?
twoFactorEnabled Boolean @default(false)
twoFactorBackupCodes String?
+ url String? @unique
+ userProfile UserProfile?
VerificationToken VerificationToken[]
ApiToken ApiToken[]
Template Template[]
@@ -54,6 +56,13 @@ model User {
@@index([email])
}
+model UserProfile {
+ id Int @id
+ bio String?
+
+ User User? @relation(fields: [id], references: [id], onDelete: Cascade)
+}
+
enum UserSecurityAuditLogType {
ACCOUNT_PROFILE_UPDATE
ACCOUNT_SSO_LINK
diff --git a/packages/prisma/seed/pr-711-deletion-of-documents.ts b/packages/prisma/seed/pr-711-deletion-of-documents.ts
index 7542cdb84..5365ecf47 100644
--- a/packages/prisma/seed/pr-711-deletion-of-documents.ts
+++ b/packages/prisma/seed/pr-711-deletion-of-documents.ts
@@ -49,6 +49,7 @@ export const seedDatabase = async () => {
email: u.email,
password: hashSync(u.password),
emailVerified: new Date(),
+ url: u.email,
},
}),
),
diff --git a/packages/prisma/seed/pr-713-add-document-search-to-command-menu.ts b/packages/prisma/seed/pr-713-add-document-search-to-command-menu.ts
index 22e8897a9..0fe27b703 100644
--- a/packages/prisma/seed/pr-713-add-document-search-to-command-menu.ts
+++ b/packages/prisma/seed/pr-713-add-document-search-to-command-menu.ts
@@ -49,6 +49,7 @@ export const seedDatabase = async () => {
email: u.email,
password: hashSync(u.password),
emailVerified: new Date(),
+ url: u.email,
},
}),
),
diff --git a/packages/prisma/seed/pr-718-add-stepper-component.ts b/packages/prisma/seed/pr-718-add-stepper-component.ts
index 57a0ddc61..d436a97b1 100644
--- a/packages/prisma/seed/pr-718-add-stepper-component.ts
+++ b/packages/prisma/seed/pr-718-add-stepper-component.ts
@@ -23,6 +23,7 @@ export const seedDatabase = async () => {
email: TEST_USER.email,
password: hashSync(TEST_USER.password),
emailVerified: new Date(),
+ url: TEST_USER.email,
},
});
};
diff --git a/packages/prisma/seed/users.ts b/packages/prisma/seed/users.ts
index f4dd714ed..353683a1d 100644
--- a/packages/prisma/seed/users.ts
+++ b/packages/prisma/seed/users.ts
@@ -21,6 +21,7 @@ export const seedUser = async ({
email,
password: hashSync(password),
emailVerified: verified ? new Date() : undefined,
+ url: name,
},
});
};
diff --git a/packages/prisma/types/document-with-recipient.ts b/packages/prisma/types/document-with-recipient.ts
index c55b99e67..32ecd29cb 100644
--- a/packages/prisma/types/document-with-recipient.ts
+++ b/packages/prisma/types/document-with-recipient.ts
@@ -5,6 +5,6 @@ export type DocumentWithRecipients = Document & {
};
export type DocumentWithRecipient = Document & {
- Recipient: Recipient;
+ Recipient: Recipient[];
documentData: DocumentData;
};
diff --git a/packages/signing/helpers/addSigningPlaceholder.ts b/packages/signing/helpers/addSigningPlaceholder.ts
index 6c7bb18e3..211a534ea 100644
--- a/packages/signing/helpers/addSigningPlaceholder.ts
+++ b/packages/signing/helpers/addSigningPlaceholder.ts
@@ -1,5 +1,13 @@
import signer from 'node-signpdf';
-import { PDFArray, PDFDocument, PDFHexString, PDFName, PDFNumber, PDFString } from 'pdf-lib';
+import {
+ PDFArray,
+ PDFDocument,
+ PDFHexString,
+ PDFName,
+ PDFNumber,
+ PDFString,
+ rectangle,
+} from 'pdf-lib';
export type AddSigningPlaceholderOptions = {
pdf: Buffer;
@@ -39,6 +47,12 @@ export const addSigningPlaceholder = async ({ pdf }: AddSigningPlaceholderOption
P: pages[0].ref,
});
+ const xobj = widget.context.formXObject([rectangle(0, 0, 0, 0)]);
+
+ const streamRef = widget.context.register(xobj);
+
+ widget.set(PDFName.of('AP'), widget.context.obj({ N: streamRef }));
+
const widgetRef = doc.context.register(widget);
let widgets = pages[0].node.get(PDFName.of('Annots'));
diff --git a/packages/trpc/server/admin-router/router.ts b/packages/trpc/server/admin-router/router.ts
index 7d71ab346..5be3ad9db 100644
--- a/packages/trpc/server/admin-router/router.ts
+++ b/packages/trpc/server/admin-router/router.ts
@@ -1,14 +1,39 @@
import { TRPCError } from '@trpc/server';
+import { findDocuments } from '@documenso/lib/server-only/admin/get-all-documents';
+import { updateRecipient } from '@documenso/lib/server-only/admin/update-recipient';
import { updateUser } from '@documenso/lib/server-only/admin/update-user';
+import { sealDocument } from '@documenso/lib/server-only/document/seal-document';
import { upsertSiteSetting } from '@documenso/lib/server-only/site-settings/upsert-site-setting';
+import { deleteUser } from '@documenso/lib/server-only/user/delete-user';
+import { getUserById } from '@documenso/lib/server-only/user/get-user-by-id';
import { adminProcedure, router } from '../trpc';
-import { ZUpdateProfileMutationByAdminSchema, ZUpdateSiteSettingMutationSchema } from './schema';
+import {
+ ZAdminDeleteUserMutationSchema,
+ ZAdminFindDocumentsQuerySchema,
+ ZAdminResealDocumentMutationSchema,
+ ZAdminUpdateProfileMutationSchema,
+ ZAdminUpdateRecipientMutationSchema,
+ ZAdminUpdateSiteSettingMutationSchema,
+} from './schema';
export const adminRouter = router({
+ findDocuments: adminProcedure.input(ZAdminFindDocumentsQuerySchema).query(async ({ input }) => {
+ const { term, page, perPage } = input;
+
+ try {
+ return await findDocuments({ term, page, perPage });
+ } catch (err) {
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: 'We were unable to retrieve the documents. Please try again.',
+ });
+ }
+ }),
+
updateUser: adminProcedure
- .input(ZUpdateProfileMutationByAdminSchema)
+ .input(ZAdminUpdateProfileMutationSchema)
.mutation(async ({ input }) => {
const { id, name, email, roles } = input;
@@ -22,8 +47,23 @@ export const adminRouter = router({
}
}),
+ updateRecipient: adminProcedure
+ .input(ZAdminUpdateRecipientMutationSchema)
+ .mutation(async ({ input }) => {
+ const { id, name, email } = input;
+
+ try {
+ return await updateRecipient({ id, name, email });
+ } catch (err) {
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: 'We were unable to update the recipient provided.',
+ });
+ }
+ }),
+
updateSiteSetting: adminProcedure
- .input(ZUpdateSiteSettingMutationSchema)
+ .input(ZAdminUpdateSiteSettingMutationSchema)
.mutation(async ({ ctx, input }) => {
try {
const { id, enabled, data } = input;
@@ -41,4 +81,41 @@ export const adminRouter = router({
});
}
}),
+
+ resealDocument: adminProcedure
+ .input(ZAdminResealDocumentMutationSchema)
+ .mutation(async ({ input }) => {
+ const { id } = input;
+
+ try {
+ return await sealDocument({ documentId: id, isResealing: true });
+ } catch (err) {
+ console.log('resealDocument error', err);
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: 'We were unable to reseal the document provided.',
+ });
+ }
+ }),
+
+ deleteUser: adminProcedure.input(ZAdminDeleteUserMutationSchema).mutation(async ({ input }) => {
+ const { id, email } = input;
+
+ try {
+ const user = await getUserById({ id });
+
+ if (user.email !== email) {
+ throw new Error('Email does not match');
+ }
+
+ return await deleteUser({ id });
+ } catch (err) {
+ console.log(err);
+
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message: 'We were unable to delete the specified account. Please try again.',
+ });
+ }
+ }),
});
diff --git a/packages/trpc/server/admin-router/schema.ts b/packages/trpc/server/admin-router/schema.ts
index 0b99c8372..cfedb06ba 100644
--- a/packages/trpc/server/admin-router/schema.ts
+++ b/packages/trpc/server/admin-router/schema.ts
@@ -3,17 +3,48 @@ import z from 'zod';
import { ZSiteSettingSchema } from '@documenso/lib/server-only/site-settings/schema';
-export const ZUpdateProfileMutationByAdminSchema = z.object({
+export const ZAdminFindDocumentsQuerySchema = z.object({
+ term: z.string().optional(),
+ page: z.number().optional().default(1),
+ perPage: z.number().optional().default(20),
+});
+
+export type TAdminFindDocumentsQuerySchema = z.infer;
+
+export const ZAdminUpdateProfileMutationSchema = z.object({
id: z.number().min(1),
name: z.string().nullish(),
email: z.string().email().optional(),
roles: z.array(z.nativeEnum(Role)).optional(),
});
-export type TUpdateProfileMutationByAdminSchema = z.infer<
- typeof ZUpdateProfileMutationByAdminSchema
+export type TAdminUpdateProfileMutationSchema = z.infer;
+
+export const ZAdminUpdateRecipientMutationSchema = z.object({
+ id: z.number().min(1),
+ name: z.string().optional(),
+ email: z.string().email().optional(),
+});
+
+export type TAdminUpdateRecipientMutationSchema = z.infer<
+ typeof ZAdminUpdateRecipientMutationSchema
>;
-export const ZUpdateSiteSettingMutationSchema = ZSiteSettingSchema;
+export const ZAdminUpdateSiteSettingMutationSchema = ZSiteSettingSchema;
-export type TUpdateSiteSettingMutationSchema = z.infer;
+export type TAdminUpdateSiteSettingMutationSchema = z.infer<
+ typeof ZAdminUpdateSiteSettingMutationSchema
+>;
+
+export const ZAdminResealDocumentMutationSchema = z.object({
+ id: z.number().min(1),
+});
+
+export type TAdminResealDocumentMutationSchema = z.infer;
+
+export const ZAdminDeleteUserMutationSchema = z.object({
+ id: z.number().min(1),
+ email: z.string().email(),
+});
+
+export type TAdminDeleteUserMutationSchema = z.infer;
diff --git a/packages/trpc/server/auth-router/router.ts b/packages/trpc/server/auth-router/router.ts
index 65fe8d296..16b370b3e 100644
--- a/packages/trpc/server/auth-router/router.ts
+++ b/packages/trpc/server/auth-router/router.ts
@@ -1,6 +1,8 @@
import { TRPCError } from '@trpc/server';
import { env } from 'next-runtime-env';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
import { ErrorCode } from '@documenso/lib/next-auth/error-codes';
import { compareSync } from '@documenso/lib/server-only/auth/hash';
import { createUser } from '@documenso/lib/server-only/user/create-user';
@@ -21,14 +23,29 @@ export const authRouter = router({
});
}
- const { name, email, password, signature } = input;
+ const { name, email, password, signature, url } = input;
- const user = await createUser({ name, email, password, signature });
+ if (IS_BILLING_ENABLED() && url && url.length < 6) {
+ throw new AppError(
+ AppErrorCode.PREMIUM_PROFILE_URL,
+ 'Only subscribers can have a username shorter than 6 characters',
+ );
+ }
+
+ const user = await createUser({ name, email, password, signature, url });
await sendConfirmationToken({ email: user.email });
return user;
} catch (err) {
+ console.log(err);
+
+ const error = AppError.parseError(err);
+
+ if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
+ throw AppError.parseErrorToTRPCError(error);
+ }
+
let message =
'We were unable to create your account. Please review the information you provided and try again.';
diff --git a/packages/trpc/server/auth-router/schema.ts b/packages/trpc/server/auth-router/schema.ts
index dbe42a25c..9a52f7fc2 100644
--- a/packages/trpc/server/auth-router/schema.ts
+++ b/packages/trpc/server/auth-router/schema.ts
@@ -21,6 +21,15 @@ export const ZSignUpMutationSchema = z.object({
email: z.string().email(),
password: ZPasswordSchema,
signature: z.string().min(1, { message: 'A signature is required.' }),
+ url: z
+ .string()
+ .trim()
+ .toLowerCase()
+ .min(1)
+ .regex(/^[a-z0-9-]+$/, {
+ message: 'Username can only container alphanumeric characters and dashes.',
+ })
+ .optional(),
});
export type TSignUpMutationSchema = z.infer;
diff --git a/packages/trpc/server/profile-router/router.ts b/packages/trpc/server/profile-router/router.ts
index 2f636d87d..542ac2807 100644
--- a/packages/trpc/server/profile-router/router.ts
+++ b/packages/trpc/server/profile-router/router.ts
@@ -1,5 +1,8 @@
import { TRPCError } from '@trpc/server';
+import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscription/get-subscriptions-by-user-id';
import { deleteUser } from '@documenso/lib/server-only/user/delete-user';
import { findUserSecurityAuditLogs } from '@documenso/lib/server-only/user/find-user-security-audit-logs';
import { forgotPassword } from '@documenso/lib/server-only/user/forgot-password';
@@ -8,7 +11,9 @@ import { resetPassword } from '@documenso/lib/server-only/user/reset-password';
import { sendConfirmationToken } from '@documenso/lib/server-only/user/send-confirmation-token';
import { updatePassword } from '@documenso/lib/server-only/user/update-password';
import { updateProfile } from '@documenso/lib/server-only/user/update-profile';
+import { updatePublicProfile } from '@documenso/lib/server-only/user/update-public-profile';
import { extractNextApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
+import { SubscriptionStatus } from '@documenso/prisma/client';
import { adminProcedure, authenticatedProcedure, procedure, router } from '../trpc';
import {
@@ -19,6 +24,7 @@ import {
ZRetrieveUserByIdQuerySchema,
ZUpdatePasswordMutationSchema,
ZUpdateProfileMutationSchema,
+ ZUpdatePublicProfileMutationSchema,
} from './schema';
export const profileRouter = router({
@@ -74,6 +80,48 @@ export const profileRouter = router({
}
}),
+ updatePublicProfile: authenticatedProcedure
+ .input(ZUpdatePublicProfileMutationSchema)
+ .mutation(async ({ input, ctx }) => {
+ try {
+ const { url } = input;
+
+ if (IS_BILLING_ENABLED() && url.length <= 6) {
+ const subscriptions = await getSubscriptionsByUserId({
+ userId: ctx.user.id,
+ }).then((subscriptions) =>
+ subscriptions.filter((s) => s.status === SubscriptionStatus.ACTIVE),
+ );
+
+ if (subscriptions.length === 0) {
+ throw new AppError(
+ AppErrorCode.PREMIUM_PROFILE_URL,
+ 'Only subscribers can have a username shorter than 6 characters',
+ );
+ }
+ }
+
+ const user = await updatePublicProfile({
+ userId: ctx.user.id,
+ url,
+ });
+
+ return { success: true, url: user.url };
+ } catch (err) {
+ const error = AppError.parseError(err);
+
+ if (error.code !== AppErrorCode.UNKNOWN_ERROR) {
+ throw AppError.parseErrorToTRPCError(error);
+ }
+
+ throw new TRPCError({
+ code: 'BAD_REQUEST',
+ message:
+ 'We were unable to update your public profile. Please review the information you provided and try again.',
+ });
+ }
+ }),
+
updatePassword: authenticatedProcedure
.input(ZUpdatePasswordMutationSchema)
.mutation(async ({ input, ctx }) => {
@@ -159,9 +207,9 @@ export const profileRouter = router({
deleteAccount: authenticatedProcedure.mutation(async ({ ctx }) => {
try {
- const user = ctx.user;
-
- return await deleteUser(user);
+ return await deleteUser({
+ id: ctx.user.id,
+ });
} catch (err) {
let message = 'We were unable to delete your account. Please try again.';
diff --git a/packages/trpc/server/profile-router/schema.ts b/packages/trpc/server/profile-router/schema.ts
index 522b13552..dc62f83ba 100644
--- a/packages/trpc/server/profile-router/schema.ts
+++ b/packages/trpc/server/profile-router/schema.ts
@@ -16,6 +16,17 @@ export const ZUpdateProfileMutationSchema = z.object({
signature: z.string(),
});
+export const ZUpdatePublicProfileMutationSchema = z.object({
+ url: z
+ .string()
+ .trim()
+ .toLowerCase()
+ .min(1, { message: 'Please enter a valid username.' })
+ .regex(/^[a-z0-9-]+$/, {
+ message: 'Username can only container alphanumeric characters and dashes.',
+ }),
+});
+
export const ZUpdatePasswordMutationSchema = z.object({
currentPassword: ZCurrentPasswordSchema,
password: ZPasswordSchema,
diff --git a/packages/ui/icons/verified.tsx b/packages/ui/icons/verified.tsx
new file mode 100644
index 000000000..5984e603d
--- /dev/null
+++ b/packages/ui/icons/verified.tsx
@@ -0,0 +1,31 @@
+import { forwardRef } from 'react';
+
+import type { LucideIcon } from 'lucide-react/dist/lucide-react';
+
+export const VerifiedIcon: LucideIcon = forwardRef(
+ ({ size = 24, color = 'currentColor', ...props }, ref) => {
+ return (
+
+ );
+ },
+);
+
+VerifiedIcon.displayName = 'VerifiedIcon';
diff --git a/packages/ui/primitives/input.tsx b/packages/ui/primitives/input.tsx
index 1a5fba1bb..71b3cb521 100644
--- a/packages/ui/primitives/input.tsx
+++ b/packages/ui/primitives/input.tsx
@@ -10,7 +10,7 @@ const Input = React.forwardRef(
{title}
diff --git a/apps/web/src/components/forms/public-profile-claim-dialog.tsx b/apps/web/src/components/forms/public-profile-claim-dialog.tsx new file mode 100644 index 000000000..dbd52fd27 --- /dev/null +++ b/apps/web/src/components/forms/public-profile-claim-dialog.tsx @@ -0,0 +1,197 @@ +'use client'; + +import React, { useState } from 'react'; + +import Image from 'next/image'; + +import { zodResolver } from '@hookform/resolvers/zod'; +import { useForm } from 'react-hook-form'; +import { z } from 'zod'; + +import profileClaimTeaserImage from '@documenso/assets/images/profile-claim-teaser.png'; +import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app'; +import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error'; +import type { User } from '@documenso/prisma/client'; +import { trpc } from '@documenso/trpc/react'; +import { cn } from '@documenso/ui/lib/utils'; +import { Button } from '@documenso/ui/primitives/button'; +import { + Dialog, + DialogContent, + DialogDescription, + DialogHeader, + DialogTitle, +} from '@documenso/ui/primitives/dialog'; +import { + Form, + FormControl, + FormField, + FormItem, + FormLabel, + FormMessage, +} from '@documenso/ui/primitives/form/form'; +import { Input } from '@documenso/ui/primitives/input'; +import { useToast } from '@documenso/ui/primitives/use-toast'; + +import { UserProfileSkeleton } from '../ui/user-profile-skeleton'; + +export const ZClaimPublicProfileFormSchema = z.object({ + url: z + .string() + .trim() + .toLowerCase() + .min(1, { message: 'Please enter a valid username.' }) + .regex(/^[a-z0-9-]+$/, { + message: 'Username can only container alphanumeric characters and dashes.', + }), +}); + +export type TClaimPublicProfileFormSchema = z.infer+ + Forgot your password? + +
+
+ );
+};
diff --git a/apps/web/src/components/ui/user-profile-skeleton.tsx b/apps/web/src/components/ui/user-profile-skeleton.tsx
new file mode 100644
index 000000000..1c8f35b64
--- /dev/null
+++ b/apps/web/src/components/ui/user-profile-skeleton.tsx
@@ -0,0 +1,84 @@
+'use client';
+
+import { File, User2 } from 'lucide-react';
+
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import type { User } from '@documenso/prisma/client';
+import { VerifiedIcon } from '@documenso/ui/icons/verified';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+
+export type UserProfileSkeletonProps = {
+ className?: string;
+ user: Pick
+
+
+
+
+
+
+
+
+
+ {step === 'BASIC_DETAILS' ? (
+
+
+ ) : (
+
+
+ )}
+
+
+
+
+
+ User profiles are coming soon!
+
+
+
+ {step === 'BASIC_DETAILS' && (
+
+ + + +
+
+
+ )}
+
+ {step === 'CLAIM_USERNAME' && (
+ Create a new account
+ ++ Create your account and start using state-of-the-art document signing. Open and + beautiful signing is within your grasp. +
+
+
+ )}
+
+ Claim your username now
+ ++ You will get notified & be able to set up your documenso public profile when we launch + the feature. +
++ + + +
+
+ );
+};
diff --git a/apps/web/src/components/ui/user-profile-timur.tsx b/apps/web/src/components/ui/user-profile-timur.tsx
new file mode 100644
index 000000000..e99a314b4
--- /dev/null
+++ b/apps/web/src/components/ui/user-profile-timur.tsx
@@ -0,0 +1,87 @@
+'use client';
+
+import Image from 'next/image';
+
+import { File } from 'lucide-react';
+
+import timurImage from '@documenso/assets/images/timur.png';
+import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
+import { VerifiedIcon } from '@documenso/ui/icons/verified';
+import { cn } from '@documenso/ui/lib/utils';
+import { Button } from '@documenso/ui/primitives/button';
+
+export type UserProfileTimurProps = {
+ className?: string;
+ rows?: number;
+};
+
+export const UserProfileTimur = ({ className, rows = 2 }: UserProfileTimurProps) => {
+ const baseUrl = new URL(NEXT_PUBLIC_WEBAPP_URL() ?? 'http://localhost:3000');
+
+ return (
+
+ {baseUrl.host}/u/
+ {user.url}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {user.name}
+ +
+
+
+
+
+ Documents
+
+
+ {Array(rows)
+ .fill(0)
+ .map((_, index) => (
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/apps/web/src/providers/posthog.tsx b/apps/web/src/providers/posthog.tsx
index 4bed6960e..dd90c813b 100644
--- a/apps/web/src/providers/posthog.tsx
+++ b/apps/web/src/providers/posthog.tsx
@@ -32,6 +32,7 @@ export function PostHogPageview() {
// Do nothing.
});
},
+ custom_campaign_params: ['src'],
});
}
diff --git a/package.json b/package.json
index 853de1c6b..96dc3e9b4 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"dx": "npm i && npm run dx:up && npm run prisma:migrate-dev",
"dx:up": "docker compose -f docker/compose-services.yml up -d",
"dx:down": "docker compose -f docker/compose-services.yml down",
- "ci": "turbo run build test:e2e",
+ "ci": "turbo run test:e2e",
"prisma:generate": "npm run with:env -- npm run prisma:generate -w @documenso/prisma",
"prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma",
"prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma",
diff --git a/packages/api/v1/api-documentation.tsx b/packages/api/v1/api-documentation.tsx
index 6082d2d7f..fe394e603 100644
--- a/packages/api/v1/api-documentation.tsx
+++ b/packages/api/v1/api-documentation.tsx
@@ -8,3 +8,5 @@ import { OpenAPIV1 } from '@documenso/api/v1/openapi';
export const OpenApiDocsPage = () => {
return
+ {baseUrl.host}/u/timur
+
+
+
+
+
+
+
+
+
+
+
+ Timur Ercan
+ +Hey Iโm Timur
+ ++ Pick any of the following agreements below and start signing to get started +
+
+
+
+
+
+ Documents
+
+
+ {Array(rows)
+ .fill(0)
+ .map((_, index) => (
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+