Merge pull request #685 from getmaxun/email-valid

feat: validate credentials

server/src/routes/auth.ts

@@ -33,6 +33,14 @@ router.post("/register", async (req, res) => {
       });
     }
 
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(email)) {
+      return res.status(400).json({
+        error: "VALIDATION_ERROR",
+        code: "register.validation.invalid_email_format"
+      });
+    }
+
     if (!password || password.length < 6) {
       return res.status(400).json({
         error: "VALIDATION_ERROR",
@@ -150,23 +158,23 @@ router.post("/login", async (req, res) => {
 });
 
 router.get("/logout", async (req, res) => {
-    try {
+  try {
-      res.clearCookie("token");
+    res.clearCookie("token");
-      return res.status(200).json({
+    return res.status(200).json({
-        ok: true,
+      ok: true,
-        message: "Logged out successfully",
+      message: "Logged out successfully",
-        code: "success"
+      code: "success"
-      });
+    });
-    } catch (error) {
+  } catch (error) {
-      console.error('Logout error:', error);
+    console.error('Logout error:', error);
-      return res.status(500).json({
+    return res.status(500).json({
-        ok: false,
+      ok: false,
-        message: "Error during logout",
+      message: "Error during logout",
-        code: "server",
+      code: "server",
-        error: process.env.NODE_ENV === 'development' ? error : undefined
+      error: process.env.NODE_ENV === 'development' ? error : undefined
-      });
+    });
-    }
   }
+}
 );
 
 router.get(
@@ -811,7 +819,7 @@ router.get("/airtable/bases", requireSignIn, async (req: Request, res) => {
 // Update robot with selected base
 router.post("/airtable/update", requireSignIn, async (req: Request, res) => {
   const authenticatedReq = req as AuthenticatedRequest;
-  const { baseId, robotId , baseName, tableName, tableId} = req.body;
+  const { baseId, robotId, baseName, tableName, tableId } = req.body;
 
   if (!baseId || !robotId) {
     return res.status(400).json({ message: "Base ID and Robot ID are required" });

src/pages/Login.tsx

@@ -42,6 +42,12 @@ const Login = () => {
 
   const submitForm = async (e: any) => {
     e.preventDefault();
+
+    if (!email.includes("@")) {
+      notify("error", "Please enter a valid email.");
+      return;
+    }
+
     setLoading(true);
     try {
       const { data } = await axios.post(
@@ -57,8 +63,8 @@ const Login = () => {
       const errorResponse = err.response?.data;
 
       const errorMessage = errorResponse?.code
-      ? t(errorResponse.code)
+        ? t(errorResponse.code)
-      : t('login.error.generic');
+        : t('login.error.generic');
 
       notify("error", errorMessage);
       setLoading(false);

src/pages/Register.tsx

@@ -9,9 +9,8 @@ import { useThemeMode } from "../context/theme-provider";
 import { useTranslation } from 'react-i18next';
 import i18n from '../i18n';
 
-
 const Register = () => {
-  const {t} = useTranslation();
+  const { t } = useTranslation();
   const [form, setForm] = useState({
     email: "",
     password: "",
@@ -39,6 +38,13 @@ const Register = () => {
 
   const submitForm = async (e: any) => {
     e.preventDefault();
+
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(email)) {
+      notify("error", "Invalid email format");
+      return;
+    }
+
     setLoading(true);
     try {
       const { data } = await axios.post(`${apiUrl}/auth/register`, { email, password });
@@ -46,12 +52,12 @@ const Register = () => {
       notify("success", t('register.welcome_notification'));
       window.localStorage.setItem("user", JSON.stringify(data));
       navigate("/");
-    } catch (error:any) {
+    } catch (error: any) {
       const errorResponse = error.response?.data;
 
       const errorMessage = errorResponse?.code
-      ? t(errorResponse.code)
+        ? t(errorResponse.code)
-      : t('register.error.generic');
+        : t('register.error.generic');
 
       notify("error", errorMessage);
       setLoading(false);
@@ -68,7 +74,6 @@ const Register = () => {
         mt: 6,
         padding: 4,
         backgroundColor: darkMode ? "#121212" : "#ffffff",
-       
       }}
     >
       <Box
@@ -80,7 +85,8 @@ const Register = () => {
           color: darkMode ? "#ffffff" : "#333333",
           padding: 6,
           borderRadius: 5,
-          boxShadow: "0px 20px 40px rgba(0, 0, 0, 0.2), 0px -5px 10px rgba(0, 0, 0, 0.15)",
+          boxShadow:
+            "0px 20px 40px rgba(0, 0, 0, 0.2), 0px -5px 10px rgba(0, 0, 0, 0.15)",
           display: "flex",
           flexDirection: "column",
           alignItems: "center",
@@ -143,7 +149,11 @@ const Register = () => {
             t('register.button')
           )}
         </Button>
-        <Typography variant="body2" align="center" sx={{ color: darkMode ? "#ffffff" : "#333333" }}>
+        <Typography
+          variant="body2"
+          align="center"
+          sx={{ color: darkMode ? "#ffffff" : "#333333" }}
+        >
           {t('register.register_prompt')}{" "}
           <Link to="/login" style={{ textDecoration: "none", color: "#ff33cc" }}>
             {t('register.login_link')}