From 37d85c7621ecbc6293f611b4cdb36a2e572c72ba Mon Sep 17 00:00:00 2001 From: Ravikachhadiya Date: Mon, 7 Sep 2020 18:32:22 +0530 Subject: [PATCH] FSJ0720A115 --- .classpath | 6 +-- build/classes/.gitignore | 3 +- .../classes/controller/SignUpController.class | Bin 1375 -> 2945 bytes src/businesslogic/RegistrationValidation.java | 33 +++++++++++++++++ src/businesslogic/ValidateUser.java | 2 - src/controller/SignUpController.java | 10 +++-- src/model/User.java | 35 ++++++++++++++++++ 7 files changed, 78 insertions(+), 11 deletions(-) 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..9be5c10 100644 --- a/build/classes/.gitignore +++ b/build/classes/.gitignore @@ -1,3 +1,4 @@ +/testing/ +/model/ /businesslogic/ /controller/ -/model/ diff --git a/build/classes/controller/SignUpController.class b/build/classes/controller/SignUpController.class index 699adbf7d662835764765ab74a0574e11c412999..86f702c138429f9bb4cd8c5b62a5da8671abfe91 100644 GIT binary patch literal 2945 zcma)8TUQfT6#fnbCWH|cr8X)BQRF60>s_K&1ypQA1c9op?GO$ym}KJ21hBUDZttzH zeQ@=ymxn&IT`QEjR#*F2p8I>+erGa-grJtooHOU_voGKN_CB-x&u_m2ID`ipDg<^U z?6l|D$)t3Q5oYnmSrZ#q~lt4 zdUT*qKwK2qKs~N!roAyUnUz&EseXh&^$9C&d8Y&_+dIYtLcR8+jGz*AIwGhQ*ci9c zaxj~kkj_-Q> zCgcL0Z*K2c<5sCeEQ}^XVT|{m?H(9BXUti0-ZfmNGn*OXeE+PQsl_hr*3crbvlNI@ zRXX;dRbVT<2oUMB+>GfZW~3uDXG=%8tcq(S{BU?E+1urprWi zbfQZ@o3fpG)0q@Fy*6!uw~xtIVYetrnv>70K-(G+*K&D9sX*9~c?|+<9VkB(*b=Bv z9`9OXq%1~~vU<`UvRyBXLnNq7nO3qEM{rETQGwP{h|10RG}Un&Jpww@G-NtvN_r|i zdmo#gl8l9Mf+1#1*PXYW$uL-p8(BqDmXjI^79%)~vl`9_Z1ef*St)7wW!PtW@+#kS z^n#^cnYQOi-hiM+xm--cIe|SBS(jz)x=DN5N*Kd(+HyU|RHeiIU`_h72>MZ{9s@cq z;w82gvMzCJ)Rj)3^oSDc{rEZ|`iPfASiaJ6UBe|-Y>M3`X(*Ku#Bo{moS_2Eo}weK zb)679#+0&Q9V56(WL@d?tE37vtmAE7cudE*60W82D(G=s({UX)SOQ#EP_tYE9qZby z!K-*p!%br4=P6&9cU(`Vbi59e39_^7APsrn*>;9lv>r=WnyHxbI-z3{G!rJ30Sqj|2Wbz4V9F-PONicl$b)OlvN z1h2~zvohha(T0(wc#7;Xr)3!A+qPl?HIHNy32shh{W7|v;|<(pZ4kjT9(&Y8R>9b| zPAZCMQe^Bcw$ffjyyiQ0)@k|&bL9{WMnZ7MITEOftmuLS*-E@ zQxohKp)A?Tc;c(vNCOxJ6(PIAcf*s{_* zr3Dui?hx<^j}X76cB&UK*b|P1yK}e_4M#&c zjB=>X;pLz4N;I6qL=IEI^w#P$ox|;}dar(N2@91df}^J=ls0*IIM~GA}F}gy0#);5P9DrnIGyE{Ui^I52i3d1}hd73B zdDs1b6Zi!u@dr-fFP!!9&yW#Bu7Lk?0srLy{~G*BefNm}7A#W3J!Y&CKT^j%;@*Pq z@iyKe9lG!h-o<<5+ZBxBeSAR9Jq&VJL!0?5hVdcowV>i(x)atQG#t@zU&F^Mf2TEG cUT9+GKc!>^KEvl6>&S^O`2Xb%2p3=d2bZD}y8r+H delta 152 zcmZn^zt1Ib>ff$?3=9k=43_K+OpFZD6E8|{)J|ZYEWvS{Rg8g!L1OX~jtEW}1|9}k z1`!6i$*!Cp@eKAr9n3(?xDiM&G4KOPHU>r@Y0n@4Bo!c%41x?oKps#TgARi(Se}tV gk3k=(gNeZyD9!}5))Ywd0p-kq*gTqnv6#UE0FX8kF#rGn diff --git a/src/businesslogic/RegistrationValidation.java b/src/businesslogic/RegistrationValidation.java index f716384..7391940 100644 --- a/src/businesslogic/RegistrationValidation.java +++ b/src/businesslogic/RegistrationValidation.java @@ -1,2 +1,35 @@ package businesslogic; +import java.util.regex.*; + +public class RegistrationValidation { + + public boolean checkUserDetails(String email, String password, String confirmPassword) { + + boolean pass = validPassword(password, confirmPassword); + boolean eml = validEmail(email); + + return (pass && eml); + } + + private boolean validPassword(String password, String confirmPassword) { + + if(!password.equals(confirmPassword) || password.equals("")) + return false; + else if(!(password.length() >= 8 && password.length() <= 20)) + return false; + else if(!Pattern.matches("^(?=.*\\d)(?=.*[@])(?=.*[a-z])(?=.*[A-Z]).{8,20}$", password)) + return false; + else + return true; + + } + + private boolean validEmail(String email) { + + if(Pattern.matches("^(.+)@(.+)$", email)) + return true; + else + return false; + } +} diff --git a/src/businesslogic/ValidateUser.java b/src/businesslogic/ValidateUser.java index 53e7b75..8f897c5 100644 --- a/src/businesslogic/ValidateUser.java +++ b/src/businesslogic/ValidateUser.java @@ -1,6 +1,5 @@ package businesslogic; -/* public class ValidateUser { @@ -16,4 +15,3 @@ public boolean validate(String email, String password) { } -*/ \ No newline at end of file diff --git a/src/controller/SignUpController.java b/src/controller/SignUpController.java index cbc0542..90ba48e 100644 --- a/src/controller/SignUpController.java +++ b/src/controller/SignUpController.java @@ -10,6 +10,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import businesslogic.RegistrationValidation; +import model.User; + @@ -31,12 +34,13 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - /* String email = request.getParameter("email"); + String email = request.getParameter("email"); String password = request.getParameter("password"); String confirmPassword = request.getParameter("confirmPassword"); LocalDateTime date= LocalDateTime.now(); - + RegistrationValidation checkUser = new RegistrationValidation(); + checkUser.checkUserDetails(email, password, confirmPassword); if(checkUser.checkUserDetails(email, password, confirmPassword)) { @@ -58,7 +62,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response) rd.forward(request, response); } - */ + } } diff --git a/src/model/User.java b/src/model/User.java index d823a56..bd99fcc 100644 --- a/src/model/User.java +++ b/src/model/User.java @@ -1 +1,36 @@ package model; +import java.time.LocalDateTime; + +public class User{ + + String email; + String password; + LocalDateTime date; + + public User(String email, String password, LocalDateTime date) { + this.email = email; + this.password = password; + this.date = date; + } + + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + public LocalDateTime getDate() { + return date; + } + public void setDate(LocalDateTime date) { + this.date = date; + } + + +} \ No newline at end of file