Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add better email validation to user invites and login page
Marc Seitz08064d8adbdc
diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsxindex 7fc90c1b..da35c01d 100644--- a/app/(auth)/login/page.tsx+++ b/app/(auth)/login/page.tsx@@ -8,6 +8,7 @@ import { useState } from "react";import { signInWithPasskey } from "@teamhanko/passkeys-next-auth-provider/client";import { signIn } from "next-auth/react";import { toast } from "sonner";+import { z } from "zod";import { LastUsed, useLastUsed } from "@/components/hooks/useLastUsed";import Google from "@/components/shared/icons/google";@@ -34,7 +35,15 @@ export default function Login() {"Continue with Email",);- const isValidEmail = email.length > 0 && validateEmail(email);+ // const isValidEmail = email.length > 0 && validateEmail(email);+ const emailSchema = z+ .string()+ .trim()+ .toLowerCase()+ .min(3, { message: "Please enter a valid email." })+ .email({ message: "Please enter a valid email." });++ const emailValidation = emailSchema.safeParse(email);return (<div className="flex h-screen w-full flex-wrap">@@ -59,11 +68,14 @@ export default function Login() {className="flex flex-col gap-4 px-4 pt-8 sm:px-16"onSubmit={(e) => {e.preventDefault();- if (!isValidEmail) return;+ if (!emailValidation.success) {+ toast.error(emailValidation.error.errors[0].message);+ return;+ }setClickedMethod("email");signIn("email", {- email: email,+ email: emailValidation.data,redirect: false,...(next && next.length > 0 ? { callbackUrl: next } : {}),}).then((res) => {@@ -96,7 +108,7 @@ export default function Login() {onChange={(e) => setEmail(e.target.value)}className={cn("flex h-10 w-full rounded-md border-0 bg-background bg-white px-3 py-2 text-sm text-gray-900 ring-1 ring-gray-200 transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 dark:bg-white",- email.length > 0 && !isValidEmail+ email.length > 0 && !emailValidation.success? "ring-red-500": "ring-gray-200",)}@@ -105,7 +117,7 @@ export default function Login() {<Buttontype="submit"loading={clickedMethod === "email"}- disabled={!isValidEmail || !!clickedMethod}+ disabled={!emailValidation.success || !!clickedMethod}className={cn("focus:shadow-outline w-full transform rounded px-4 py-2 text-white transition-colors duration-300 ease-in-out focus:outline-none",clickedMethod === "email"diff --git a/components/teams/add-team-member-modal.tsx b/components/teams/add-team-member-modal.tsxindex a9199f46..b0fc8456 100644--- a/components/teams/add-team-member-modal.tsx+++ b/components/teams/add-team-member-modal.tsx@@ -1,5 +1,3 @@-import { useRouter } from "next/router";-import { useState } from "react";import { useTeam } from "@/context/team-context";@@ -34,9 +32,12 @@ export function AddTeamMembers({const [email, setEmail] = useState<string>("");const [loading, setLoading] = useState<boolean>(false);const teamInfo = useTeam();+ const teamId = teamInfo?.currentTeam?.id;const analytics = useAnalytics();const emailSchema = z.string()+ .trim()+ .toLowerCase().min(3, { message: "Please enter a valid email." }).email({ message: "Please enter a valid email." });@@ -51,18 +52,15 @@ export function AddTeamMembers({}setLoading(true);- const response = await fetch(- `/api/teams/${teamInfo?.currentTeam?.id}/invite`,- {- method: "POST",- headers: {- "Content-Type": "application/json",- },- body: JSON.stringify({- email: email,- }),+ const response = await fetch(`/api/teams/${teamId}/invite`, {+ method: "POST",+ headers: {+ "Content-Type": "application/json",},- );+ body: JSON.stringify({+ email: validation.data,+ }),+ });if (!response.ok) {const error = await response.json();@@ -73,11 +71,11 @@ export function AddTeamMembers({}analytics.capture("Team Member Invitation Sent", {- email: email,- teamId: teamInfo?.currentTeam?.id,+ email: validation.data,+ teamId: teamId,});- mutate(`/api/teams/${teamInfo?.currentTeam?.id}/invitations`);+ mutate(`/api/teams/${teamId}/invitations`);toast.success("An invitation email has been sent!");setOpen(false);diff --git a/lib/utils/validate-email.ts b/lib/utils/validate-email.tsindex 44e618be..f99c089e 100644--- a/lib/utils/validate-email.ts+++ b/lib/utils/validate-email.ts@@ -7,5 +7,5 @@ export const simpleEmailRegex =/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z]{2,})+$/;export const validateEmail = (email: string) => {- return simpleEmailRegex.test(email.toLowerCase());+ return simpleEmailRegex.test(email.toLowerCase().trim());};