Adding user form

- add UserForm and UserFormValidator - switch to spring boot 1.2.4 - some name fixes

Adding user form
- add UserForm and UserFormValidator - switch to spring boot 1.2.4 - some name fixes
Julien Iguchi-Cartigny
1 parent 64343f46
Showing 8 changed files with 75 additions and 30 deletions Show diff stats
pom.xml
src/main/java/fr/plil/sio/web/mvc/ApplicationMvcConfiguration.java
src/main/java/fr/plil/sio/web/mvc/LoginController.java
src/main/java/fr/plil/sio/web/mvc/NewUserController.java
src/main/java/fr/plil/sio/web/mvc/UserForm.java
src/main/java/fr/plil/sio/web/mvc/UserValidator.java -> src/main/java/fr/plil/sio/web/mvc/UserFormValidator.java
src/test/java/fr/plil/sio/web/mvc/NewUserControllerTest.java
src/test/java/fr/plil/sio/web/mvc/UserValidatorTest.java -> src/test/java/fr/plil/sio/web/mvc/UserFormValidatorTest.java
@@ -9,12 +9,11 @@
 	<packaging>war</packaging>
 	<name>spring-mvc-sample</name>
-	<description></description>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.2.3.RELEASE</version>
+		<version>1.2.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
@@ -12,7 +12,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 @Configuration
-public class ApplicationMvcConfiguration extends WebMvcConfigurerAdapter{
+public class ApplicationMvcConfiguration extends WebMvcConfigurerAdapter {
     private static final Logger logger = LoggerFactory.getLogger(ApplicationMvcConfiguration.class);
@@ -26,19 +26,19 @@ public class LoginController {
     @RequestMapping(method = RequestMethod.POST)
     public String postLoginCheck(User user, BindingResult result) {
-        User userFromDao = userRepository.findByUsername(user.getUsername());
+        User userFromRepository = userRepository.findByUsername(user.getUsername());
-        if (userFromDao == null) {
+        if (userFromRepository == null) {
             result.rejectValue("username","login.form.invalid");
             return "login";
         }
-        if(!userFromDao.getPassword().equals(user.getPassword())) {
+        if (!userFromRepository.getPassword().equals(user.getPassword())) {
             result.rejectValue("username","login.form.invalid");
             return "login";            
         }
-        
-        userSession.setUsername(userFromDao.getUsername());
+
+        userSession.setUsername(userFromRepository.getUsername());
         return "redirect:/";
     }
@@ -18,7 +18,7 @@ public class NewUserController {
     private UserSession userSession;
     @Resource
-    private UserValidator userValidator;
+    private UserFormValidator userFormValidator;
     @RequestMapping(value = {"/newUser"}, method = RequestMethod.GET)
     public ModelAndView getNewUserForm() {
@@ -32,7 +32,7 @@ public class NewUserController {
             result.rejectValue("username", "new.user.only.admin");
         }
-        userValidator.validate(user, result);
+        userFormValidator.validate(user, result);
         boolean present = (userRepository.findByUsername(user.getUsername()) != null);
@@ -57,7 +57,7 @@ public class NewUserController {
         this.userSession = userSession;
     }
-    public void setUserValidator(UserValidator userValidator) {
-        this.userValidator = userValidator;
+    public void setUserFormValidator(UserFormValidator userFormValidator) {
+        this.userFormValidator = userFormValidator;
     }
 }
@@ -0,0 +1,31 @@
+package fr.plil.sio.web.mvc;
+
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+public class UserForm {
+
+    @Min(3)
+    @Max(16)
+    private String username;
+
+    @NotNull
+    private String password;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+}
@@ -5,24 +5,37 @@ import org.springframework.validation.Errors;
 import org.springframework.validation.Validator;
 @Component
-public class UserValidator implements Validator {
+public class UserFormValidator implements Validator {
     @Override
     public boolean supports(Class<?> clazz) {
-        return User.class.equals(clazz);
+        return UserForm.class.equals(clazz);
     }
-    @Override
-    public void validate(Object target, Errors errors) {
-        User user = (User)target;
+    private void checkUsername(String username, Errors errors) {
-        if (user.getUsername().length() < 3) {
-            errors.rejectValue("username", "validator.user.username.minimal.size");
-        }
+    }
+
+    private void checkPassword(String password, Errors errors) {
+        boolean hasUppercase = !password.equals(password.toLowerCase());
+        boolean hasLowercase = !password.equals(password.toUpperCase());
+        boolean hasSpecial = !password.matches("[A-Za-z0-9 ]*");
-        if (user.getPassword().length() < 3) {
-            errors.rejectValue("password", "validator.user.password.minimal.size");
+        if (!hasUppercase) {
+            errors.rejectValue("password", "validator.user.form.must.contains.uppercase");
+        }
+        if (!hasLowercase) {
+            errors.rejectValue("password", "validator.user.form.must.contains.lowercase");
+        }
+        if (!hasSpecial) {
+            errors.rejectValue("password", "validator.user.form.must.contains.special.char");
         }
     }
-}
+    @Override
+    public void validate(Object target, Errors errors) {
+        UserForm user = (UserForm) target;
+        checkUsername(user.getUsername(), errors);
+        checkPassword(user.getPassword(), errors);
+    }
+}
 \ No newline at end of file
@@ -17,7 +17,7 @@ public class NewUserControllerTest {
     private User user;
     private UserRepository userRepository;
     private UserSession userSession;
-    private UserValidator userValidator;
+    private UserFormValidator userFormValidator;
     @Before
     public void createInstances() {
@@ -33,8 +33,8 @@ public class NewUserControllerTest {
         userSession = new UserSession();
         userSession.setUsername("admin");
         newUserController.setUserSession(userSession);
-        userValidator = new UserValidator();
-        newUserController.setUserValidator(userValidator);
+        userFormValidator = new UserFormValidator();
+        newUserController.setUserFormValidator(userFormValidator);
     }
     @Test
 package fr.plil.sio.web.mvc;
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.Errors;
-public class UserValidatorTest {
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class UserFormValidatorTest {
     private User user;
-    private UserValidator validator;
+    private UserFormValidator validator;
     private Errors results;
     @Before
     public void createInstances() {
-        validator = new UserValidator();
+        validator = new UserFormValidator();
         user = new User();
         user.setUsername("abc");
         user.setPassword("abc");