FF-193 Refactoring.

Author: open-schnick

src/main/java/de/filefighter/rest/domain/user/business/UserBusinessService.java

@@ -104,11 +104,14 @@ public void registerNewUser(UserRegisterForm newUser) {
 
         // check pws.
         String password = newUser.getPassword();
+        String confirmationPassword = newUser.getConfirmationPassword();
+
+        if (!stringIsValid(password) || !stringIsValid(confirmationPassword))
+            throw new UserNotRegisteredException("Wanted to change password, but password was not valid.");
+
         if (!passwordIsValid(password))
             throw new UserNotRegisteredException("Password needs to be at least 8 characters long and, contains at least one uppercase and lowercase letter and a number.");
 
-        String confirmationPassword = newUser.getConfirmationPassword();
-
         if (!password.contentEquals(confirmationPassword))
             throw new UserNotRegisteredException("Passwords do not match.");
 
@@ -139,10 +142,8 @@ public void registerNewUser(UserRegisterForm newUser) {
     }
 
     public boolean passwordIsValid(String password) {
-        if (!stringIsValid(password))
-            return false;
-
-        if (this.passwordCheckDisabled) return true;
+        if (this.passwordCheckDisabled)
+            return true;
 
         Pattern pattern = Pattern.compile("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=\\S+).{8,20}$");
         return pattern.matcher(password).matches();

src/test/java/de/filefighter/rest/domain/user/business/UserBusinessServiceUnitTest.java

@@ -159,6 +159,10 @@ void passwordIsValidReturnsFalse() {
     void passwordIsValidWorks() {
         String works = "Password1234?!";
         assertDoesNotThrow(() -> userBusinessService.passwordIsValid(works));
+
+        userBusinessService.passwordCheckDisabled = true;  //remember to reset it if beforeEach is removed.
+        String doesWork = "pw";
+        assertDoesNotThrow(() -> userBusinessService.passwordIsValid(doesWork));
     }
 
     @Test
@@ -184,11 +188,23 @@ void registerNewUserThrows() {
                 userBusinessService.registerNewUser(userRegisterForm));
         assertEquals("User could not be registered. Username already taken.", ex.getMessage());
 
-        //Passwords not valid
+        //passwords empty
         when(userRepositoryMock.findByLowercaseUsername(username.toLowerCase())).thenReturn(null);
         when(userDtoServiceMock.createDto(any())).thenReturn(null);
-        userRegisterForm.setPassword(notValidPassword);
+        userRegisterForm.setPassword("");
+        ex = assertThrows(UserNotRegisteredException.class, () ->
+                userBusinessService.registerNewUser(userRegisterForm));
+        assertEquals("User could not be registered. Wanted to change password, but password was not valid.", ex.getMessage());
+
+        userRegisterForm.setPassword("somepassword");
+        userRegisterForm.setConfirmationPassword("");
+        ex = assertThrows(UserNotRegisteredException.class, () ->
+                userBusinessService.registerNewUser(userRegisterForm));
+        assertEquals("User could not be registered. Wanted to change password, but password was not valid.", ex.getMessage());
 
+        //Passwords not valid
+        userRegisterForm.setConfirmationPassword(notValidPassword);
+        userRegisterForm.setPassword(notValidPassword);
         ex = assertThrows(UserNotRegisteredException.class, () ->
                 userBusinessService.registerNewUser(userRegisterForm));
         assertEquals("User could not be registered. Password needs to be at least 8 characters long and, contains at least one uppercase and lowercase letter and a number.", ex.getMessage());
@@ -233,6 +249,9 @@ void registerNewUserWorks() {
                 .build();
 
         assertDoesNotThrow(() -> userBusinessService.registerNewUser(userRegisterForm));
+
+        userRegisterForm.setGroupIds(null);
+        assertDoesNotThrow(() -> userBusinessService.registerNewUser(userRegisterForm));
     }
 
     @Test
@@ -303,6 +322,10 @@ void updatePasswordThrows() {
                 userBusinessService.updateUser(userId, userRegisterForm, authenticatedUser));
         assertEquals("User could not get updated. Wanted to change password, but password was not valid.", ex.getMessage());
 
+        userRegisterForm.setConfirmationPassword("");
+        ex = assertThrows(UserNotUpdatedException.class, () ->
+                userBusinessService.updateUser(userId, userRegisterForm, authenticatedUser));
+        assertEquals("User could not get updated. Wanted to change password, but password was not valid.", ex.getMessage());
 
         userRegisterForm.setPassword("somepw");
         userRegisterForm.setConfirmationPassword("somepw");