Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions src/validateRegisterForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,47 @@ function validateRegisterForm(email, password) {
const validPassword = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,16}$/;

// eslint-disable-next-line max-len
const validEmailMask = new RegExp(/^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\./i);
const validEmail = new RegExp(/^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\./i);

if (!email.match(validEmailMask) && password.match(validPassword)) {
let isValidEmail = email
? email.match(validEmail)
: false;
const isValidPassword = password
? password.match(validPassword)
: false;

const emailTopDomain = function() {
const doHaveDomain = isValidEmail[2];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue: You are accessing isValidEmail[2] without checking if isValidEmail is a valid match array. If the email is invalid, isValidEmail will be false, leading to a runtime error. Please add a check to ensure isValidEmail is truthy and an array before accessing its elements. This is a critical fix required by the task checklist.


if (doHaveDomain) {
const index = email.lastIndexOf(isValidEmail[2]) + isValidEmail[2].length;
const isStartWithDot = email.startsWith('.', index + 1);
const isEndWithDot = email.endsWith('.');
const isCorrect = !isStartWithDot && !isEndWithDot;

if (!isCorrect) {
isValidEmail = false;
}
}
};

if (isValidEmail) {
emailTopDomain();
}

if (!isValidEmail && isValidPassword) {
return {
code: 422, message: 'Email is invalid.',
};
}

if (email.match(validEmailMask) && !password.match(validPassword)) {
if (isValidEmail && !isValidPassword) {
return {
code: 422, message: 'Password is invalid.',
};
}

if (!email.match(validEmailMask) && !password.match(validPassword)) {
if (!isValidEmail && !isValidPassword) {
return {
code: 500, message: 'Password and email are invalid.',
};
Expand Down
Loading