diff --git a/.classpath b/.classpath index 58268ae..334472e 100644 --- a/.classpath +++ b/.classpath @@ -1,11 +1,6 @@ - - - - - @@ -13,5 +8,6 @@ + diff --git a/build/classes/.gitignore b/build/classes/.gitignore index 16d999e..364a1dc 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,4 @@ /businesslogic/ -/controller/ +/testing/ /model/ +/controller/ diff --git a/build/classes/controller/SignUpController.class b/build/classes/controller/SignUpController.class index 699adbf..be3bc67 100644 Binary files a/build/classes/controller/SignUpController.class and b/build/classes/controller/SignUpController.class differ diff --git a/src/businesslogic/RegistrationValidation.java b/src/businesslogic/RegistrationValidation.java index f716384..f0d3592 100644 --- a/src/businesslogic/RegistrationValidation.java +++ b/src/businesslogic/RegistrationValidation.java @@ -1,2 +1,90 @@ package businesslogic; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + + +public class RegistrationValidation{ + + + String email,password,confirmpassword; + + public boolean checkUserDetails(String email, String password, String confirmpassword) { + if(validEmail(email)&&validPassword(password,confirmpassword)) { + return true; + } + else + return false; + } +//password validation + + private boolean validPassword(String password, String confirmpassword) { + //using regex + + //String pass1=password; + //String confirmpass=confirmpassword; + //String regex = "^(?=.*[0-9])" + // + "(?=.*[a-z])(?=.*[A-Z])" + // + "(?=.*[@#$%^&+=])" + // + "(?=\\S+$).{8,20}$"; + //Pattern p = Pattern.compile(regex); + // if (pass1 == null||pass1.matches(confirmpass)==false) { + // return false; + // } + + // Matcher m = p.matcher(pass1); + // return m.matches(); + //without regex + + if(password.equals(confirmpassword)==false) + return false; + boolean lowercase=false; + boolean uppercase=false; + boolean hasdigit=false; + if(password.length()>8 &&password.length()<20) { + for(int i=0;i