Merge pull request #713 from bluewave-labs/fix/email-case

Fix/email case, resolves #566

Client/src/Components/Inputs/Field/index.jsx

@@ -48,6 +48,7 @@ const Field = forwardRef(
       placeholder,
       value,
       onChange,
+      onInput,
       error,
       disabled,
     },
@@ -87,6 +88,7 @@ const Field = forwardRef(
           multiline={type === "description"}
           rows={type === "description" ? 4 : 1}
           value={value}
+          onInput={onInput}
           onChange={onChange}
           disabled={disabled}
           inputRef={ref}
@@ -176,6 +178,8 @@ const Field = forwardRef(
   }
 );
 
+Field.displayName = "Field";
+
 Field.propTypes = {
   type: PropTypes.oneOf(["text", "password", "url", "email", "description"]),
   id: PropTypes.string.isRequired,
@@ -189,6 +193,7 @@ Field.propTypes = {
   placeholder: PropTypes.string,
   value: PropTypes.string.isRequired,
   onChange: PropTypes.func,
+  onInput: PropTypes.func,
   error: PropTypes.string,
   disabled: PropTypes.bool,
 };

Client/src/Pages/Auth/Login.jsx

@@ -129,6 +129,7 @@ const StepOne = ({ form, errors, onSubmit, onChange, onBack }) => {
               placeholder="jordan.ellis@domain.com"
               autoComplete="email"
               value={form.email}
+              onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
               onChange={onChange}
               error={errors.email}
               ref={inputRef}

Client/src/Pages/Auth/Register/Register.jsx

@@ -226,6 +226,7 @@ const StepTwo = ({ form, errors, onSubmit, onChange, onBack }) => {
               placeholder="jordan.ellis@domain.com"
               autoComplete="email"
               value={form.email}
+              onInput={(e) => (e.target.value = e.target.value.toLowerCase())}
               onChange={onChange}
               error={errors.email}
               ref={inputRef}

Client/src/Validation/validation.js

@@ -49,6 +49,13 @@ const credentials = joi.object({
     .string()
     .trim()
     .email({ tlds: { allow: false } })
+    .custom((value, helpers) => {
+      const lowercasedValue = value.toLowerCase();
+      if (value !== lowercasedValue) {
+        return helpers.message("Email must be in lowercase");
+      }
+      return lowercasedValue;
+    })
     .messages({
       "string.empty": "Email is required",
       "string.email": "Must be a valid email address",
@@ -72,14 +79,10 @@ const credentials = joi.object({
 });
 
 const monitorValidation = joi.object({
-  url: joi
-    .string()
-    .uri({ allowRelative: true })
-    .trim()
-    .messages({
-      "string.empty": "This field is required.",
-      "string.uri": "The URL you provided is not valid.",
-    }),
+  url: joi.string().uri({ allowRelative: true }).trim().messages({
+    "string.empty": "This field is required.",
+    "string.uri": "The URL you provided is not valid.",
+  }),
   name: joi.string().trim().max(50).allow("").messages({
     "string.max": "This field should not exceed the 50 characters limit.",
   }),

Docker/.gitignore

@@ -2,6 +2,5 @@
 !build_images.sh
 mongo/data/*
 redis/data/*
-nginx/*
-certbot/*
-*.env
+*.env
+certbot/*

Server/validation/joi.js

@@ -16,7 +16,17 @@ const roleValidatior = (role) => (value, helpers) => {
 //****************************************
 
 const loginValidation = joi.object({
-  email: joi.string().email().required(),
+  email: joi
+    .string()
+    .email()
+    .required()
+    .custom((value, helpers) => {
+      const lowercasedValue = value.toLowerCase();
+      if (value !== lowercasedValue) {
+        return helpers.message("Email must be in lowercase");
+      }
+      return lowercasedValue;
+    }),
   password: joi
     .string()
     .min(8)
@@ -35,7 +45,17 @@ const registerValidation = joi.object({
     .string()
     .required()
     .pattern(/^[A-Za-z]+$/),
-  email: joi.string().email().required(),
+  email: joi
+    .string()
+    .email()
+    .required()
+    .custom((value, helpers) => {
+      const lowercasedValue = value.toLowerCase();
+      if (value !== lowercasedValue) {
+        return helpers.message("Email must be in lowercase");
+      }
+      return lowercasedValue;
+    }),
   password: joi
     .string()
     .min(8)