diff --git a/.env.example b/.env.example index a1faef3f0..f5c2486fe 100644 --- a/.env.example +++ b/.env.example @@ -4,8 +4,8 @@ # Option 3: Use the provided dx setup (RECOMMENDED) # => postgres://documenso:password@127.0.0.1:54320/documenso # -# ⚠ WARNING: The test database can be resetted or taken offline at any point. -# ⚠ WARNING: Please be aware that nothing written to the test databae is private. +# ⚠ WARNING: The test database can be reset or taken offline at any point. +# ⚠ WARNING: Please be aware that nothing written to the test database is private. DATABASE_URL='' # URL @@ -51,4 +51,4 @@ NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID= #FEATURE FLAGS # Allow users to register via the /signup page. Otherwise they will be redirect to the home page. NEXT_PUBLIC_ALLOW_SIGNUP=true -NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS=true \ No newline at end of file +NEXT_PUBLIC_ALLOW_SUBSCRIPTIONS=false diff --git a/.gitignore b/.gitignore index 9965f5ca6..d7f66a11a 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ yarn-error.log* next-env.d.ts .env .env.example + +# turborepo +.turbo \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 46768040d..5aeb61c1b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ The development branch is main. All pull request should be made aga [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device. 2. Create a new branch: -- Create a new branch (include the issue id and somthing readable): +- Create a new branch (include the issue id and something readable): ```sh git checkout -b doc-999-my-feature-or-fix diff --git a/README.md b/README.md index cf5b78ba1..97ebe6555 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,4 @@ -> We are launching TOMORROW on Product Hunt soon! Sign up to support the launch: ->
Product Hunt
- -

+

Documenso Logo @@ -14,7 +11,7 @@ Learn more »

- Slack + Slack · Website · @@ -25,7 +22,7 @@

- Join Documenso on Slack + Join Documenso on Slack Github Stars License Commits-per-month @@ -59,13 +56,18 @@ Signing documents digitally is fast, easy and should be best practice for every document signed worldwide. This is technically quite easy today, but it also introduces a new party to every signature: The signing tool providers. While this is not a problem in itself, it should make us think about how we want these providers of trust to work. Documenso aims to be the world's most trusted document signing tool. This trust is built by empowering you to self-host Documenso and review how it works under the hood. Join us in creating the next generation of open trust infrastructure. +## Recognition + +Documenso - The open source DocuSign alternative | Product Hunt +Documenso - The Open Source DocuSign Alternative. | Product Hunt + ## Community and Next Steps 🎯 -The current project goal is to [release a production ready version](https://github.com/documenso/documenso/milestone/1) for self-hosting as soon as possible. If you want to help making that happen you can: +We're currently working on a redesign of the application including a revamp of the codebase so Documenso can be more intuitive to use and robust to develop upon. - Check out the first source code release in this repository and test it - Tell us what you think in the current [Discussions](https://github.com/documenso/documenso/discussions) -- Join the [Slack Channel](https://join.slack.com/t/documenso/shared_invite/zt-1qwxxsvli-nDyojjt~wakhgBGl9JRl2w) for any questions and getting to know to other community members +- Join the [Slack Channel](https://documen.so/slack) for any questions and getting to know to other community members - ⭐ the repository to help us raise awareness - Spread the word on Twitter, that Documenso is working towards a more open signing tool - Fix or create [issues](https://github.com/documenso/documenso/issues), that are needed for the first production release @@ -74,8 +76,6 @@ The current project goal is to [release a production ready version](https://g - To contribute please see our [contribution guide](https://github.com/documenso/documenso/blob/main/CONTRIBUTING.md). - - # Tech Documenso is built using awesome open source tech including: @@ -119,7 +119,7 @@ Want to get up and running quickly? Follow these steps: - This will spin up a postgres database and inbucket mail server in docker containers. - Run `npm run dev` in the root directory - Want it even faster? Just use - ```sh + ```sh npm run d ``` @@ -137,31 +137,33 @@ Follow these steps to setup documenso on you local machine: ```sh git clone https://github.com/documenso/documenso ``` -- Run npm i in root directory -- Rename .env.example to .env +- Run `npm i` in root directory +- Rename `.env.example` to `.env` - Set DATABASE_URL value in .env file - You can use the provided test database url (may be wiped at any point) - Or setup a local postgres sql instance (recommended) -- Create the database scheme by running db-migrate:dev +- Create the database scheme by running `db-migrate:dev` - Setup your mail provider - - Set SENDGRID_API_KEY value in .env file + - Set `SENDGRID_API_KEY` value in .env file - You need a SendGrid account, which you can create [here](https://signup.sendgrid.com/). - - Documenso uses [Nodemailer](https://nodemailer.com/about/) so you can easily use your own SMTP server by setting the SMTP\_\* variables in your .env -- Run npm run dev root directory to start + - Documenso uses [Nodemailer](https://nodemailer.com/about/) so you can easily use your own SMTP server by setting the `SMTP + \_ + * variables` in your .env +- Run `npm run dev` root directory to start - Register a new user at http://localhost:3000/signup --- -- Optional: Seed the database using npm run db-seed to create a test user and document -- Optional: Upload and sign apps/web/ressources/example.pdf manually to test your setup +- Optional: Seed the database using `npm run db-seed` to create a test user and document +- Optional: Upload and sign `apps/web/resources/example.pdf` manually to test your setup - Optional: Create your own signing certificate - - A demo certificate is provided in `/app/web/ressources/certificate.p12` + - A demo certificate is provided in `/app/web/resources/certificate.p12` - To generate your own using these steps and a Linux Terminal or Windows Subsystem for Linux (WSL) see **[Create your own signing certificate](#creating-your-own-signing-certificate)**. ## Updating -- If you pull the newest version from main, using git pull, it may be necessary to regenerate your database client +- If you pull the newest version from main, using `git pull`, it may be necessary to regenerate your database client - You can do this by running the generate command in `/packages/prisma`: ```sh npx prisma generate @@ -172,16 +174,22 @@ Follow these steps to setup documenso on you local machine: For the digital signature of your documents you need a signing certificate in .p12 format (public and private key). You can buy one (not recommended for dev) or use the steps to create a self-signed one: -1. Generate a private key using the OpenSSL command. You can run the following command to generate a 2048-bit RSA key:\ - openssl genrsa -out private.key 2048 +1. Generate a private key using the OpenSSL command. You can run the following command to generate a 2048-bit RSA key: + + `openssl genrsa -out private.key 2048` + +2. Generate a self-signed certificate using the private key. You can run the following command to generate a self-signed certificate: + + `openssl req -new -x509 -key private.key -out certificate.crt -days 365` -2. Generate a self-signed certificate using the private key. You can run the following command to generate a self-signed certificate:\ - openssl req -new -x509 -key private.key -out certificate.crt -days 365 \ This will prompt you to enter some information, such as the Common Name (CN) for the certificate. Make sure you enter the correct information. The -days parameter sets the number of days for which the certificate is valid. -3. Combine the private key and the self-signed certificate to create the p12 certificate. You can run the following command to do this: \ - openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt + +3. Combine the private key and the self-signed certificate to create the p12 certificate. You can run the following command to do this: + + `openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt` + 4. You will be prompted to enter a password for the p12 file. Choose a strong password and remember it, as you will need it to use the certificate (**can be empty for dev certificates**) -5. Place the certificate /apps/web/ressource/certificate.p12 +5. Place the certificate `/apps/web/resources/certificate.p12` # Docker @@ -195,4 +203,39 @@ Want to create a production ready docker image? Follow these steps: # Deploying - Coming Soon™ - Docker support -- One-Click-Deploy on Render.com Deploy +- One-Click-Deploy on Render.com + +# Troubleshooting + +## I'm not receiving any emails when using the developer quickstart + +When using the developer quickstart an [Inbucket](https://inbucket.org/) server will be spun up in a docker container that will store all outgoing email locally for you to view. + +The Web UI can be found at http://localhost:9000 while the SMTP port will be on localhost:2500. + +## Support IPv6 + +In case you are deploying to a cluster that uses only IPv6. You can use a custom command to pass a parameter to the NextJS start command + +For local docker run + +```bash +docker run -it documenso:latest npm run start -- -H :: +``` + +For k8s or docker-compose + +```yaml +containers: + - name: documenso + image: documenso:latest + imagePullPolicy: IfNotPresent + command: + - npm + args: + - run + - start + - -- + - -H + - "::" +``` diff --git a/apps/web/components/editor/pdf-editor.tsx b/apps/web/components/editor/pdf-editor.tsx index dd9418a24..62fb9ade0 100644 --- a/apps/web/components/editor/pdf-editor.tsx +++ b/apps/web/components/editor/pdf-editor.tsx @@ -30,7 +30,7 @@ export default function PDFEditor(props: any) { movedField.positionY = position.y.toFixed(0); createOrUpdateField(props.document, movedField); - // no instant redraw neccessary, postion information for saving or later rerender is enough + // no instant redraw neccessary, position information for saving or later rerender is enough // setFields(newFields); } diff --git a/apps/web/components/editor/pdf-signer.tsx b/apps/web/components/editor/pdf-signer.tsx index a3bb08389..392dd0508 100644 --- a/apps/web/components/editor/pdf-signer.tsx +++ b/apps/web/components/editor/pdf-signer.tsx @@ -71,7 +71,7 @@ export default function PDFSigner(props: any) {

- +

Documenso

diff --git a/apps/web/components/forgot-password.tsx b/apps/web/components/forgot-password.tsx new file mode 100644 index 000000000..8235a80d9 --- /dev/null +++ b/apps/web/components/forgot-password.tsx @@ -0,0 +1,115 @@ +import { useState } from "react"; +import Link from "next/link"; +import { Button } from "@documenso/ui"; +import Logo from "./logo"; +import { ArrowLeftIcon } from "@heroicons/react/24/outline"; +import { FormProvider, useForm } from "react-hook-form"; +import { toast } from "react-hot-toast"; + +interface ForgotPasswordForm { + email: string; +} + +export default function ForgotPassword() { + const { register, formState, resetField, handleSubmit } = useForm(); + const [resetSuccessful, setResetSuccessful] = useState(false); + + const onSubmit = async (values: ForgotPasswordForm) => { + const response = await toast.promise( + fetch(`/api/auth/forgot-password`, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify(values), + }), + { + loading: "Sending...", + success: "Reset link sent.", + error: "Could not send reset link :/", + } + ); + + if (!response.ok) { + toast.dismiss(); + + if (response.status == 404) { + toast.error("Email address not found."); + } + + if (response.status == 400) { + toast.error("Password reset requested."); + } + + if (response.status == 500) { + toast.error("Something went wrong."); + } + + return; + } + + if (response.ok) { + setResetSuccessful(true); + } + + resetField("email"); + }; + + return ( + <> +
+
+
+ +

+ {resetSuccessful ? "Reset Password" : "Forgot Password?"} +

+

+ {resetSuccessful + ? "Please check your email for reset instructions." + : "No worries, we'll send you reset instructions."} +

+
+ {!resetSuccessful && ( +
+
+
+ + +
+
+ +
+ +
+
+ )} +
+ +
+ + Back to log in +
+ +
+
+
+ + ); +} diff --git a/apps/web/components/layout.tsx b/apps/web/components/layout.tsx index 06a5bb2de..aa0fad8dc 100644 --- a/apps/web/components/layout.tsx +++ b/apps/web/components/layout.tsx @@ -3,11 +3,11 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib/constants"; import { useSubscription } from "@documenso/lib/stripe"; +import { BillingWarning } from "./billing-warning"; import Navigation from "./navigation"; import { PaperAirplaneIcon } from "@heroicons/react/24/outline"; import { SubscriptionStatus } from "@prisma/client"; import { useSession } from "next-auth/react"; -import { BillingWarning } from "./billing-warning"; function useRedirectToLoginIfUnauthenticated() { const { data: session, status } = useSession(); diff --git a/apps/web/components/login.tsx b/apps/web/components/login.tsx index 4f086a8e1..6c1ec2896 100644 --- a/apps/web/components/login.tsx +++ b/apps/web/components/login.tsx @@ -69,7 +69,7 @@ export default function Login(props: any) {
- +

Sign in to your account

@@ -111,9 +111,11 @@ export default function Login(props: any) {
diff --git a/apps/web/components/logo.tsx b/apps/web/components/logo.tsx index 64d61bc76..2534c95e1 100644 --- a/apps/web/components/logo.tsx +++ b/apps/web/components/logo.tsx @@ -8,71 +8,71 @@ export default function Logo(props: any) { diff --git a/apps/web/components/navigation.tsx b/apps/web/components/navigation.tsx index c09d5b912..7d0c4edfa 100644 --- a/apps/web/components/navigation.tsx +++ b/apps/web/components/navigation.tsx @@ -115,8 +115,7 @@ export default function TopNavigation() { - -

Documenso

+
diff --git a/apps/web/components/reset-password.tsx b/apps/web/components/reset-password.tsx new file mode 100644 index 000000000..9f5f1d466 --- /dev/null +++ b/apps/web/components/reset-password.tsx @@ -0,0 +1,143 @@ +import { useState } from "react"; +import Link from "next/link"; +import { useRouter } from "next/router"; +import { Button } from "@documenso/ui"; +import Logo from "./logo"; +import { ArrowLeftIcon } from "@heroicons/react/24/outline"; +import { zodResolver } from "@hookform/resolvers/zod"; +import { useForm } from "react-hook-form"; +import { toast } from "react-hot-toast"; +import * as z from "zod"; + +const ZResetPasswordFormSchema = z + .object({ + password: z.string().min(8, { message: "Password must be at least 8 characters" }), + confirmPassword: z.string().min(8, { message: "Password must be at least 8 characters" }), + }) + .refine((data) => data.password === data.confirmPassword, { + path: ["confirmPassword"], + message: "Password don't match", + }); + +type TResetPasswordFormSchema = z.infer; + +export default function ResetPassword() { + const router = useRouter(); + const { token } = router.query; + + const { + register, + formState: { errors, isSubmitting }, + handleSubmit, + } = useForm({ + resolver: zodResolver(ZResetPasswordFormSchema), + }); + + const [resetSuccessful, setResetSuccessful] = useState(false); + + const onSubmit = async ({ password }: TResetPasswordFormSchema) => { + const response = await toast.promise( + fetch(`/api/auth/reset-password`, { + method: "POST", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ password, token }), + }), + { + loading: "Resetting...", + success: `Reset password successful`, + error: "Could not reset password :/", + } + ); + + if (!response.ok) { + toast.dismiss(); + const error = await response.json(); + toast.error(error.message); + } + + if (response.ok) { + setResetSuccessful(true); + setTimeout(() => { + router.push("/login"); + }, 3000); + } + }; + + return ( + <> +
+
+
+ +

+ Reset Password +

+

+ {resetSuccessful ? "Your password has been reset." : "Please chose your new password"} +

+
+ {!resetSuccessful && ( +
+
+
+ + +
+ +
+ + +
+
+ + {errors && ( + {errors.confirmPassword?.message} + )} + +
+ +
+
+ )} + +
+ +
+ + Back to log in +
+ +
+
+
+ + ); +} diff --git a/apps/web/next.config.js b/apps/web/next.config.js index c7b94279e..1ea48cefb 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -4,22 +4,15 @@ require("dotenv").config({ path: "../../.env" }); const nextConfig = { reactStrictMode: true, swcMinify: false, + transpilePackages: [ + "@documenso/prisma", + "@documenso/lib", + "@documenso/ui", + "@documenso/pdf", + "@documenso/features", + "@documenso/signing", + "react-signature-canvas", + ], }; -const transpileModules = require("next-transpile-modules")([ - "@documenso/prisma", - "@documenso/lib", - "@documenso/ui", - "@documenso/pdf", - "@documenso/features", - "@documenso/signing", - "react-signature-canvas", -]); - -const plugins = [ - transpileModules -]; - -const moduleExports = () => plugins.reduce((acc, next) => next(acc), nextConfig); - -module.exports = moduleExports; +module.exports = nextConfig; diff --git a/apps/web/package.json b/apps/web/package.json index a104e0fde..349936c8a 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -56,11 +56,10 @@ "eslint": "8.27.0", "eslint-config-next": "13.0.3", "file-loader": "^6.2.0", - "next-transpile-modules": "^10.0.0", "postcss": "^8.4.19", "sass": "^1.57.1", "stripe-cli": "^0.1.0", "tailwindcss": "^3.2.4", "typescript": "4.8.4" } -} \ No newline at end of file +} diff --git a/apps/web/pages/404.jsx b/apps/web/pages/404.jsx index cbf22dea6..2c8ffe7ac 100644 --- a/apps/web/pages/404.jsx +++ b/apps/web/pages/404.jsx @@ -8,7 +8,7 @@ export default function Custom404() { <>
- +

Documenso

diff --git a/apps/web/pages/500.jsx b/apps/web/pages/500.jsx index 3589da952..c90157fe4 100644 --- a/apps/web/pages/500.jsx +++ b/apps/web/pages/500.jsx @@ -1,15 +1,15 @@ +import Link from "next/link"; import { Button } from "@documenso/ui"; import Logo from "../components/logo"; import { ArrowSmallLeftIcon } from "@heroicons/react/20/solid"; import { EllipsisVerticalIcon } from "@heroicons/react/20/solid"; -import Link from "next/link"; export default function Custom500() { return ( <>
- - + +

Documenso

diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx index cd5541cbb..a1193a681 100644 --- a/apps/web/pages/_app.tsx +++ b/apps/web/pages/_app.tsx @@ -1,6 +1,7 @@ import { ReactElement, ReactNode } from "react"; import { NextPage } from "next"; import type { AppProps } from "next/app"; +import { Montserrat, Qwigley } from "next/font/google"; import { SubscriptionProvider } from "@documenso/lib/stripe/providers/subscription-provider"; import "../../../node_modules/placeholder-loading/src/scss/placeholder-loading.scss"; import "../../../node_modules/react-resizable/css/styles.css"; @@ -11,6 +12,20 @@ import "react-tooltip/dist/react-tooltip.css"; export { coloredConsole } from "@documenso/lib"; +const montserrat = Montserrat({ + subsets: ["latin"], + weight: ["400", "700"], + display: "swap", + variable: "--font-sans", +}); + +const qwigley = Qwigley({ + subsets: ["latin"], + weight: ["400"], + display: "swap", + variable: "--font-qwigley", +}); + export type NextPageWithLayout

= NextPage & { getLayout?: (page: ReactElement) => ReactNode; }; @@ -27,8 +42,10 @@ export default function App({ return ( - - {getLayout()} +

+ + {getLayout()} +
); diff --git a/apps/web/pages/api/auth/forgot-password.ts b/apps/web/pages/api/auth/forgot-password.ts new file mode 100644 index 000000000..98e4a6676 --- /dev/null +++ b/apps/web/pages/api/auth/forgot-password.ts @@ -0,0 +1,63 @@ +import { NextApiRequest, NextApiResponse } from "next"; +import { sendResetPassword } from "@documenso/lib/mail"; +import { defaultHandler, defaultResponder } from "@documenso/lib/server"; +import prisma from "@documenso/prisma"; +import crypto from "crypto"; + +async function postHandler(req: NextApiRequest, res: NextApiResponse) { + const { email } = req.body; + const cleanEmail = email.toLowerCase(); + + if (!cleanEmail || !/.+@.+/.test(cleanEmail)) { + res.status(400).json({ message: "Invalid email" }); + return; + } + + const user = await prisma.user.findFirst({ + where: { + email: cleanEmail, + }, + }); + + if (!user) { + return res.status(200).json({ message: "A password reset email has been sent." }); + } + + const existingToken = await prisma.passwordResetToken.findFirst({ + where: { + userId: user.id, + createdAt: { + gte: new Date(Date.now() - 1000 * 60 * 60), + }, + }, + }); + + if (existingToken) { + return res.status(200).json({ message: "A password reset email has been sent." }); + } + + const token = crypto.randomBytes(64).toString("hex"); + const expiry = new Date(); + expiry.setHours(expiry.getHours() + 24); // Set expiry to one hour from now + + let passwordResetToken; + try { + passwordResetToken = await prisma.passwordResetToken.create({ + data: { + token, + expiry, + userId: user.id, + }, + }); + } catch (error) { + return res.status(500).json({ message: "Something went wrong" }); + } + + await sendResetPassword(user, passwordResetToken.token); + + return res.status(200).json({ message: "A password reset email has been sent." }); +} + +export default defaultHandler({ + POST: Promise.resolve({ default: defaultResponder(postHandler) }), +}); diff --git a/apps/web/pages/api/auth/reset-password.ts b/apps/web/pages/api/auth/reset-password.ts new file mode 100644 index 000000000..78a81b7d4 --- /dev/null +++ b/apps/web/pages/api/auth/reset-password.ts @@ -0,0 +1,69 @@ +import { NextApiRequest, NextApiResponse } from "next"; +import { hashPassword, verifyPassword } from "@documenso/lib/auth"; +import { sendResetPasswordSuccessMail } from "@documenso/lib/mail"; +import { defaultHandler, defaultResponder } from "@documenso/lib/server"; +import prisma from "@documenso/prisma"; + +async function postHandler(req: NextApiRequest, res: NextApiResponse) { + const { token, password } = req.body; + + if (!token) { + res.status(400).json({ message: "Invalid token" }); + return; + } + + const foundToken = await prisma.passwordResetToken.findUnique({ + where: { + token, + }, + include: { + User: true, + }, + }); + + if (!foundToken) { + return res.status(404).json({ message: "Invalid token." }); + } + + const now = new Date(); + + if (now > foundToken.expiry) { + return res.status(400).json({ message: "Token has expired" }); + } + + const isSamePassword = await verifyPassword(password, foundToken.User.password!); + + if (isSamePassword) { + return res.status(400).json({ message: "New password must be different" }); + } + + const hashedPassword = await hashPassword(password); + + const transaction = await prisma.$transaction([ + prisma.user.update({ + where: { + id: foundToken.userId, + }, + data: { + password: hashedPassword, + }, + }), + prisma.passwordResetToken.deleteMany({ + where: { + userId: foundToken.userId, + }, + }), + ]); + + if (!transaction) { + return res.status(500).json({ message: "Error resetting password." }); + } + + await sendResetPasswordSuccessMail(foundToken.User); + + res.status(200).json({ message: "Password reset successful." }); +} + +export default defaultHandler({ + POST: Promise.resolve({ default: defaultResponder(postHandler) }), +}); diff --git a/apps/web/pages/api/auth/signup.ts b/apps/web/pages/api/auth/signup.ts index b82bf5ea2..b67f1b50f 100644 --- a/apps/web/pages/api/auth/signup.ts +++ b/apps/web/pages/api/auth/signup.ts @@ -8,13 +8,13 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) { const { email, password, source } = req.body; const cleanEmail = email.toLowerCase(); - if (!cleanEmail || !cleanEmail.includes("@")) { - res.status(422).json({ message: "Invalid email" }); + if (!cleanEmail || !/.+@.+/.test(cleanEmail)) { + res.status(400).json({ message: "Invalid email" }); return; } if (!password || password.trim().length < 7) { - return res.status(422).json({ + return res.status(400).json({ message: "Password should be at least 7 characters long.", }); } diff --git a/apps/web/pages/api/documents/[id]/send.ts b/apps/web/pages/api/documents/[id]/send.ts index 302e75001..ea3e91adc 100644 --- a/apps/web/pages/api/documents/[id]/send.ts +++ b/apps/web/pages/api/documents/[id]/send.ts @@ -6,53 +6,62 @@ import prisma from "@documenso/prisma"; import { Document as PrismaDocument, SendStatus } from "@prisma/client"; async function postHandler(req: NextApiRequest, res: NextApiResponse) { - const user = await getUserFromToken(req, res); - const { id: documentId } = req.query; - const { resendTo: resendTo = [] } = req.body; + try { + const user = await getUserFromToken(req, res); + const { id: documentId } = req.query; + const { resendTo: resendTo = [] } = req.body; - if (!user) return; + if (!user) { + return res.status(401).send("Unauthorized"); + } - if (!documentId) { - res.status(400).send("Missing parameter documentId."); - return; - } + if (!documentId) { + return res.status(400).send("Missing parameter documentId."); + } - const document: PrismaDocument = await getDocument(+documentId, req, res); + const document: PrismaDocument = await getDocument(+documentId, req, res); - if (!document) res.status(404).end(`No document with id ${documentId} found.`); + if (!document) { + res.status(404).end(`No document with id ${documentId} found.`); + } - let recipientCondition: any = { - documentId: +documentId, - sendStatus: SendStatus.NOT_SENT, - }; - - if (resendTo.length) { - recipientCondition = { + let recipientCondition: any = { documentId: +documentId, - id: { in: resendTo }, + sendStatus: SendStatus.NOT_SENT, }; - } - const recipients = await prisma.recipient.findMany({ - where: { - ...recipientCondition, - }, - }); + if (resendTo.length) { + recipientCondition = { + documentId: +documentId, + id: { in: resendTo }, + }; + } - if (!recipients.length) return res.status(200).send(recipients.length); - - let sentRequests = 0; - recipients.forEach(async (recipient) => { - await sendSigningRequest(recipient, document, user).catch((err) => { - console.log(err); - return res.status(502).end("Coud not send request for signing."); + const recipients = await prisma.recipient.findMany({ + where: { + ...recipientCondition, + }, + }); + + if (!recipients.length) { + return res.status(200).send(recipients.length); + } + + let sentRequests = 0; + recipients.forEach(async (recipient) => { + await sendSigningRequest(recipient, document, user); + + sentRequests++; }); - sentRequests++; if (sentRequests === recipients.length) { return res.status(200).send(recipients.length); } - }); + + return res.status(502).end("Coud not send request for signing."); + } catch (err) { + return res.status(502).end("Coud not send request for signing."); + } } export default defaultHandler({ diff --git a/apps/web/pages/auth/reset/[token].tsx b/apps/web/pages/auth/reset/[token].tsx new file mode 100644 index 000000000..33868f762 --- /dev/null +++ b/apps/web/pages/auth/reset/[token].tsx @@ -0,0 +1,30 @@ +import Head from "next/head"; +import { getUserFromToken } from "@documenso/lib/server"; +import ResetPassword from "../../../components/reset-password"; + +export default function ResetPasswordPage() { + return ( + <> + + Reset Password | Documenso + + + + ); +} + +export async function getServerSideProps(context: any) { + const user = await getUserFromToken(context.req, context.res); + if (user) + return { + redirect: { + source: "/login", + destination: "/dashboard", + permanent: false, + }, + }; + + return { + props: {}, + }; +} diff --git a/apps/web/pages/auth/reset/index.tsx b/apps/web/pages/auth/reset/index.tsx new file mode 100644 index 000000000..f21145422 --- /dev/null +++ b/apps/web/pages/auth/reset/index.tsx @@ -0,0 +1,20 @@ +import React from "react"; +import Logo from "../../../components/logo"; + +export default function ResetPage() { + return ( +
+
+
+ +

+ Reset Password +

+

+ The token you provided is invalid. Please try again. +

+
+
+
+ ); +} diff --git a/apps/web/pages/documents.tsx b/apps/web/pages/documents.tsx index 905f59d09..cea08623c 100644 --- a/apps/web/pages/documents.tsx +++ b/apps/web/pages/documents.tsx @@ -4,6 +4,7 @@ import Head from "next/head"; import { useRouter } from "next/router"; import { uploadDocument } from "@documenso/features"; import { deleteDocument, getDocuments } from "@documenso/lib/api"; +import { useSubscription } from "@documenso/lib/stripe"; import { Button, IconButton, SelectBox } from "@documenso/ui"; import Layout from "../components/layout"; import type { NextPageWithLayout } from "./_app"; @@ -20,7 +21,6 @@ import { } from "@heroicons/react/24/outline"; import { DocumentStatus } from "@prisma/client"; import { Tooltip as ReactTooltip } from "react-tooltip"; -import { useSubscription } from "@documenso/lib/stripe"; const DocumentsPage: NextPageWithLayout = (props: any) => { const router = useRouter(); @@ -145,24 +145,24 @@ const DocumentsPage: NextPageWithLayout = (props: any) => {
-
-
- {filteredDocuments.length != 1 ? filteredDocuments.length + " Documents" : "1 Document"} -
+
- + +
+ {filteredDocuments.length != 1 ? filteredDocuments.length + " Documents" : "1 Document"} +