Merge pull request #252 from linkwarden/dev

Dev

components/SubmitButton.tsx

@@ -2,11 +2,12 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { IconProp } from "@fortawesome/fontawesome-svg-core";
 
 type Props = {
-  onClick: Function;
+  onClick?: Function;
   icon?: IconProp;
   label: string;
   loading: boolean;
   className?: string;
+  type?: "button" | "submit" | "reset" | undefined;
 };
 
 export default function SubmitButton({
@@ -15,20 +16,22 @@ export default function SubmitButton({
   label,
   loading,
   className,
+  type,
 }: Props) {
   return (
-    <div
+    <button
+      type={type ? type : undefined}
       className={`text-white flex items-center gap-2 py-2 px-5 rounded-md text-lg tracking-wide select-none font-semibold duration-100 w-fit ${
         loading
           ? "bg-sky-600 cursor-auto"
           : "bg-sky-700 hover:bg-sky-600 cursor-pointer"
       } ${className}`}
       onClick={() => {
-        if (!loading) onClick();
+        if (!loading && onClick) onClick();
       }}
     >
-      {icon && <FontAwesomeIcon icon={icon} className="h-5 select-none" />}
+      {icon && <FontAwesomeIcon icon={icon} className="h-5" />}
-      <p className="text-center w-full select-none">{label}</p>
+      <p className="text-center w-full">{label}</p>
-    </div>
+    </button>
   );
 }

lib/api/controllers/users/postUser.ts

@@ -54,10 +54,10 @@ export default async function postUser(
   const checkIfUserExists = await prisma.user.findFirst({
     where: emailEnabled
       ? {
-          email: body.email?.toLowerCase(),
+          email: body.email?.toLowerCase().trim(),
         }
       : {
-          username: (body.username as string).toLowerCase(),
+          username: (body.username as string).toLowerCase().trim(),
         },
   });
 
@@ -71,8 +71,8 @@ export default async function postUser(
         name: body.name,
         username: emailEnabled
           ? undefined
-          : (body.username as string).toLowerCase(),
+          : (body.username as string).toLowerCase().trim(),
-        email: emailEnabled ? body.email?.toLowerCase() : undefined,
+        email: emailEnabled ? body.email?.toLowerCase().trim() : undefined,
         password: hashedPassword,
       },
     });

lib/api/controllers/users/userId/updateUserById.ts

@@ -29,6 +29,15 @@ export default async function updateUser(
       status: 400,
     };
 
+  // Check email (if enabled)
+  const checkEmail =
+    /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
+  if (emailEnabled && !checkEmail.test(data.email?.toLowerCase() || ""))
+    return {
+      response: "Please enter a valid email.",
+      status: 400,
+    };
+
   const checkUsername = RegExp("^[a-z0-9_-]{3,31}$");
 
   if (!checkUsername.test(data.username.toLowerCase()))
@@ -58,11 +67,25 @@ export default async function updateUser(
     },
   });
 
-  if (userIsTaken)
+  if (userIsTaken) {
+    if (data.email?.toLowerCase().trim() === userIsTaken.email?.trim())
+      return {
+        response: "Email is taken.",
+        status: 400,
+      };
+    else if (
+      data.username?.toLowerCase().trim() === userIsTaken.username?.trim()
+    )
+      return {
+        response: "Username is taken.",
+        status: 400,
+      };
+
     return {
       response: "Username/Email is taken.",
       status: 400,
     };
+  }
 
   // Avatar Settings
 
@@ -105,8 +128,8 @@ export default async function updateUser(
     },
     data: {
       name: data.name,
-      username: data.username.toLowerCase(),
+      username: data.username.toLowerCase().trim(),
-      email: data.email?.toLowerCase(),
+      email: data.email?.toLowerCase().trim(),
       isPrivate: data.isPrivate,
       archiveAsScreenshot: data.archiveAsScreenshot,
       archiveAsPDF: data.archiveAsPDF,

pages/choose-username.tsx

@@ -1,6 +1,6 @@
 import SubmitButton from "@/components/SubmitButton";
 import { signOut } from "next-auth/react";
-import { useState } from "react";
+import { FormEvent, useState } from "react";
 import { toast } from "react-hot-toast";
 import { useSession } from "next-auth/react";
 import useAccountStore from "@/store/account";
@@ -15,7 +15,9 @@ export default function ChooseUsername() {
 
   const { updateAccount, account } = useAccountStore();
 
-  async function submitUsername() {
+  async function submitUsername(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     setSubmitLoader(true);
 
     const redirectionToast = toast.loading("Applying...");
@@ -38,6 +40,7 @@ export default function ChooseUsername() {
 
   return (
     <CenteredForm>
+      <form onSubmit={submitUsername}>
         <div className="p-4 mx-auto flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
           <p className="text-2xl text-center text-black dark:text-white font-bold">
             Choose a Username (Last step)
@@ -49,6 +52,7 @@ export default function ChooseUsername() {
             </p>
 
             <TextInput
+              autoFocus
               placeholder="john"
               value={inputedUsername}
               className="bg-white"
@@ -69,7 +73,7 @@ export default function ChooseUsername() {
           </div>
 
           <SubmitButton
-          onClick={submitUsername}
+            type="submit"
             label="Complete Registration"
             className="mt-2 w-full text-center"
             loading={submitLoader}
@@ -82,6 +86,7 @@ export default function ChooseUsername() {
             Sign Out
           </div>
         </div>
+      </form>
     </CenteredForm>
   );
 }

pages/forgot.tsx

@@ -3,7 +3,7 @@ import TextInput from "@/components/TextInput";
 import CenteredForm from "@/layouts/CenteredForm";
 import { signIn } from "next-auth/react";
 import Link from "next/link";
-import { useState } from "react";
+import { FormEvent, useState } from "react";
 import { toast } from "react-hot-toast";
 
 interface FormData {
@@ -17,7 +17,9 @@ export default function Forgot() {
     email: "",
   });
 
-  async function loginUser() {
+  async function sendConfirmation(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     if (form.email !== "") {
       setSubmitLoader(true);
 
@@ -40,14 +42,15 @@ export default function Forgot() {
 
   return (
     <CenteredForm>
+      <form onSubmit={sendConfirmation}>
         <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:border-neutral-700 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100">
           <p className="text-2xl text-center text-black dark:text-white font-bold">
             Password Recovery
           </p>
           <div>
             <p className="text-md text-black dark:text-white">
-            Enter your Email so we can send you a link to recover your account.
+              Enter your Email so we can send you a link to recover your
-            Make sure to change your password in the profile settings
+              account. Make sure to change your password in the profile settings
               afterwards.
             </p>
             <p className="text-sm text-gray-500 dark:text-gray-400">
@@ -60,6 +63,7 @@ export default function Forgot() {
             </p>
 
             <TextInput
+              autoFocus
               type="email"
               placeholder="johnny@example.com"
               value={form.email}
@@ -69,7 +73,7 @@ export default function Forgot() {
           </div>
 
           <SubmitButton
-          onClick={loginUser}
+            type="submit"
             label="Send Login Link"
             className="mt-2 w-full text-center"
             loading={submitLoader}
@@ -83,6 +87,7 @@ export default function Forgot() {
             </Link>
           </div>
         </div>
+      </form>
     </CenteredForm>
   );
 }

pages/login.tsx

@@ -3,7 +3,7 @@ import TextInput from "@/components/TextInput";
 import CenteredForm from "@/layouts/CenteredForm";
 import { signIn } from "next-auth/react";
 import Link from "next/link";
-import { useState } from "react";
+import { useState, FormEvent } from "react";
 import { toast } from "react-hot-toast";
 
 interface FormData {
@@ -21,7 +21,9 @@ export default function Login() {
     password: "",
   });
 
-  async function loginUser() {
+  async function loginUser(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     if (form.username !== "" && form.password !== "") {
       setSubmitLoader(true);
 
@@ -47,6 +49,7 @@ export default function Login() {
 
   return (
     <CenteredForm text="Sign in to your account">
+      <form onSubmit={loginUser}>
         <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100 dark:border-neutral-700">
           <p className="text-2xl text-black dark:text-white text-center font-bold">
             Enter your credentials
@@ -59,6 +62,7 @@ export default function Login() {
             </p>
 
             <TextInput
+              autoFocus={true}
               placeholder="johnny"
               value={form.username}
               className="bg-white"
@@ -91,14 +95,17 @@ export default function Login() {
           </div>
 
           <SubmitButton
-          onClick={loginUser}
+            type="submit"
             label="Login"
             className=" w-full text-center"
             loading={submitLoader}
           />
-        {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION === "true" ? undefined : (
+          {process.env.NEXT_PUBLIC_DISABLE_REGISTRATION ===
+          "true" ? undefined : (
             <div className="flex items-baseline gap-1 justify-center">
-            <p className="w-fit text-gray-500 dark:text-gray-400">New here?</p>
+              <p className="w-fit text-gray-500 dark:text-gray-400">
+                New here?
+              </p>
               <Link
                 href={"/register"}
                 className="block text-black dark:text-white font-semibold"
@@ -108,6 +115,7 @@ export default function Login() {
             </div>
           )}
         </div>
+      </form>
     </CenteredForm>
   );
 }

pages/register.tsx

@@ -1,5 +1,5 @@
 import Link from "next/link";
-import { useState } from "react";
+import { useState, FormEvent } from "react";
 import { toast } from "react-hot-toast";
 import SubmitButton from "@/components/SubmitButton";
 import { signIn } from "next-auth/react";
@@ -29,7 +29,9 @@ export default function Register() {
     passwordConfirmation: "",
   });
 
-  async function registerUser() {
+  async function registerUser(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+
     const checkFields = () => {
       if (emailEnabled) {
         return (
@@ -107,6 +109,7 @@ export default function Register() {
           </p>
         </div>
       ) : (
+        <form onSubmit={registerUser}>
           <div className="p-4 flex flex-col gap-3 justify-between sm:w-[30rem] w-80 bg-slate-50 dark:bg-neutral-800 rounded-2xl shadow-md border border-sky-100 dark:border-neutral-700">
             <p className="text-2xl text-black dark:text-white text-center font-bold">
               Enter your details
@@ -117,6 +120,7 @@ export default function Register() {
               </p>
 
               <TextInput
+                autoFocus={true}
                 placeholder="Johnny"
                 value={form.name}
                 className="bg-white"
@@ -134,7 +138,9 @@ export default function Register() {
                   placeholder="john"
                   value={form.username}
                   className="bg-white"
-                onChange={(e) => setForm({ ...form, username: e.target.value })}
+                  onChange={(e) =>
+                    setForm({ ...form, username: e.target.value })
+                  }
                 />
               </div>
             )}
@@ -218,7 +224,7 @@ export default function Register() {
             ) : undefined}
 
             <SubmitButton
-            onClick={registerUser}
+              type="submit"
               label="Sign Up"
               className="mt-2 w-full text-center"
               loading={submitLoader}
@@ -235,6 +241,7 @@ export default function Register() {
               </Link>
             </div>
           </div>
+        </form>
       )}
     </CenteredForm>
   );