Merge pull request #28 from boringContributor/auth-form

refactor: improve the auth component

client/components/auth/auth.module.css

@@ -5,17 +5,18 @@
 }
 
 .form {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
+  display: grid;
+  place-items: center;
 }
 
 .formGroup {
-  margin-bottom: 1rem;
+  display: flex;
+  flex-direction: column;
+  place-items: center;
+  gap: 10px;
 }
 
-.formHeader {
+.formContentSpace {
   margin-bottom: 1rem;
+  text-align: center;
 }

client/components/auth/index.tsx

@@ -1,23 +1,24 @@
 import { FormEvent, useState } from 'react'
-import { Button, Card, Input, Text } from '@geist-ui/core'
+import { Button, Input, Text, useToasts, Note } from '@geist-ui/core'
 import styles from './auth.module.css'
 import { useRouter } from 'next/router'
 import Link from '../Link'
 
+const NO_EMPTY_SPACE_REGEX = /^\S*$/;
+const ERROR_MESSAGE = "Provide a non empty username and a password with at least 6 characters";
+
 const Auth = ({ page }: { page: "signup" | "signin" }) => {
     const router = useRouter();
 
     const [username, setUsername] = useState('');
     const [password, setPassword] = useState('');
-    const [error, setError] = useState('');
+    const [errorMsg, setErrorMsg] = useState('');
+
+    const { setToast } = useToasts();
 
     const signingIn = page === 'signin'
 
-    const NO_EMPTY_SPACE_REGEX = /^\S*$/;
-
     const handleJson = (json: any) => {
-        if (json.error) return setError(json.error.message)
-
         localStorage.setItem('drift-token', json.token)
         localStorage.setItem('drift-userid', json.userId)
         router.push('/')
@@ -27,11 +28,8 @@ const Auth = ({ page }: { page: "signup" | "signin" }) => {
     const handleSubmit = async (e: FormEvent<HTMLFormElement>) => {
         e.preventDefault()
 
-        if (!username.match(NO_EMPTY_SPACE_REGEX))
-            return setError("Username can't be empty")
-
-        if (!password.match(NO_EMPTY_SPACE_REGEX))
-            return setError("Password can't be empty")
+        if (!NO_EMPTY_SPACE_REGEX.test(username) || password.length < 6) return setErrorMsg(ERROR_MESSAGE)
+        else setErrorMsg('');
 
         const reqOpts = {
             method: 'POST',
@@ -50,18 +48,17 @@ const Auth = ({ page }: { page: "signup" | "signin" }) => {
 
             handleJson(json)
         } catch (err: any) {
-            setError(err.message || "Something went wrong")
+            setToast({ text: "Something went wrong", type: 'error' })
         }
     }
 
     return (
         <div className={styles.container}>
             <div className={styles.form}>
-                <div className={styles.formHeader}>
+                <div className={styles.formContentSpace}>
                     <h1>{signingIn ? 'Sign In' : 'Sign Up'}</h1>
                 </div>
                 <form onSubmit={handleSubmit}>
-                    <Card>
                     <div className={styles.formGroup}>
                         <Input
                             htmlType="text"
@@ -70,10 +67,8 @@ const Auth = ({ page }: { page: "signup" | "signin" }) => {
                             onChange={(event) => setUsername(event.target.value)}
                             placeholder="Username"
                             required
-                                label='Username'
+                            scale={4 / 3}
                         />
-                        </div>
-                        <div className={styles.formGroup}>
                         <Input
                             htmlType='password'
                             id="password"
@@ -81,13 +76,11 @@ const Auth = ({ page }: { page: "signup" | "signin" }) => {
                             onChange={(event) => setPassword(event.target.value)}
                             placeholder="Password"
                             required
-                                label='Password'
+                            scale={4 / 3}
                         />
+                        <Button type="success" htmlType="submit">{signingIn ? 'Sign In' : 'Sign Up'}</Button>
                     </div>
-                        <div style={{ display: 'flex', justifyContent: 'center' }}>
-                            <Button type="success" ghost htmlType="submit">{signingIn ? 'Sign In' : 'Sign Up'}</Button>
-                        </div>
-                        <div className={styles.formGroup}>
+                    <div className={styles.formContentSpace}>
                         {signingIn ? (
                             <Text>
                                 Don&apos;t have an account?{" "}
@@ -100,8 +93,7 @@ const Auth = ({ page }: { page: "signup" | "signin" }) => {
                             </Text>
                         )}
                     </div>
-                        {error && <Text type='error'>{error}</Text>}
-                    </Card>
+                    {errorMsg && <Note scale={0.75} type='error'>{errorMsg}</Note>}
                 </form>
             </div>
         </div >

server/src/routes/auth.ts

@@ -1,18 +1,23 @@
 import { Router } from 'express'
-// import { Movie } from '../models/Post'
 import { genSalt, hash, compare } from "bcrypt"
 import { User } from '../../lib/models/User'
 import { sign } from 'jsonwebtoken'
 import config from '../../lib/config'
 import jwt from '../../lib/middleware/jwt'
 
+const NO_EMPTY_SPACE_REGEX = /^\S*$/
+
 export const auth = Router()
 
+const validateAuthPayload = (username: string, password: string): void => {
+    if (!NO_EMPTY_SPACE_REGEX.test(username) || password.length < 6) {
+        throw new Error("Authentication data does not fulfill requirements")
+    }
+}
+
 auth.post('/signup', async (req, res, next) => {
     try {
-        if (!req.body.username || !req.body.password) {
-            throw new Error("Please provide a username and password")
-        }
+        validateAuthPayload(req.body.username, req.body.password)
 
         const username = req.body.username.toLowerCase();
 
@@ -39,9 +44,7 @@ auth.post('/signup', async (req, res, next) => {
 
 auth.post('/signin', async (req, res, next) => {
     try {
-        if (!req.body.username || !req.body.password) {
-            throw new Error("Missing username or password")
-        }
+        validateAuthPayload(req.body.username, req.body.password)
 
         const username = req.body.username.toLowerCase();
         const user = await User.findOne({ where: { username: username } });