work

Author: thomaswoehlke

src/main/java/org/woehlke/simpleworklist/config/WebMvcConfig.java

@@ -35,7 +35,7 @@
 @EnableConfigurationProperties({
     SimpleworklistProperties.class
 })
-public class WebMvcConfig extends WebMvcConfigurerAdapter implements WebMvcConfigurer {
+public class WebMvcConfig implements WebMvcConfigurer {
 
     private final SimpleworklistProperties simpleworklistProperties;
 

src/main/java/org/woehlke/simpleworklist/config/WebSecurityConfig.java

@@ -10,13 +10,14 @@
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.WebSecurityConfigurer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.woehlke.simpleworklist.application.SimpleworklistProperties;
@@ -35,7 +36,7 @@
 @EnableConfigurationProperties({
     SimpleworklistProperties.class
 })
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfig extends WebSecurityConfigurerAdapter implements WebSecurityConfigurer<WebSecurity> {
 
     private final AuthenticationManagerBuilder authenticationManagerBuilder;
     //private final AuthenticationSuccessHandler loginSuccessHandler;
@@ -54,6 +55,16 @@ public WebSecurityConfig(
         this.simpleworklistProperties = simpleworklistProperties;
     }
 
+    /*
+    @Override
+    public void init(WebSecurity builder) throws Exception {
+
+    }
+    @Override
+    public void configure(WebSecurity builder) throws Exception {
+    }
+    */
+
     @Override
     protected void configure(HttpSecurity http) throws Exception {
         http
@@ -99,7 +110,7 @@ public UserDetailsService userDetailsService(){
     public PasswordEncoder encoder(){
         int strength = simpleworklistProperties.getWebSecurity().getStrengthBCryptPasswordEncoder();
         return new BCryptPasswordEncoder(strength);
-        /*Ü
+        /*
         CharSequence secret=this.simpleworklistProperties.getWebSecurity().getSecret();
         int iterations=this.simpleworklistProperties.getWebSecurity().getIterations();
         int hashWidth=this.simpleworklistProperties.getWebSecurity().getHashWidth();

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountService.java

@@ -21,7 +21,7 @@ public interface UserAccountService {
 
     void changeUsersPassword(UserAccountForm userAccount);
 
-    UserAccount findUserById(long userId);
+    UserAccount findById(long userId);
 
     Map<Long,Integer> getNewIncomingMessagesForEachOtherUser(UserAccount receiver);
 

src/main/java/org/woehlke/simpleworklist/user/services/UserAccountServiceImpl.java

@@ -47,14 +47,14 @@ public boolean isEmailAvailable(String email) {
 
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = false)
-    public void createUser(UserAccountForm userAccount) {
+    public void createUser(UserAccountForm userAccountForm) {
+        Date now = new Date();
         UserAccount u = new UserAccount();
         u.setUuid(UUID.randomUUID().toString());
-        u.setUserEmail(userAccount.getUserEmail());
-        u.setUserFullname(userAccount.getUserFullname());
-        u.setUserPassword(encoder.encode(userAccount.getUserPassword()));
+        u.setUserEmail(userAccountForm.getUserEmail());
+        u.setUserFullname(userAccountForm.getUserFullname());
+        u.setUserPassword(encoder.encode(userAccountForm.getUserPassword()));
         u.setDefaultLanguage(Language.EN);
-        Date now = new Date();
         u.setLastLoginTimestamp(now);
         u.setAccountNonExpired(true);
         u.setAccountNonLocked(true);
@@ -68,13 +68,13 @@ public void createUser(UserAccountForm userAccount) {
         privContext.setUuid(UUID.randomUUID().toString());
         workContext.setUserAccount(u);
         privContext.setUserAccount(u);
-        log.info("About to save " + workContext.toString());
         contextRepository.save(workContext);
-        log.info("About to save " + privContext.toString());
         contextRepository.save(privContext);
         u.setDefaultContext(workContext);
         u = userAccountRepository.save(u);
         log.info("Saved " + u.toString());
+        log.info("Saved " + workContext.toString());
+        log.info("Saved " + privContext.toString());
     }
 
     @Override
@@ -105,8 +105,8 @@ public void changeUsersPassword(UserAccountForm userAccount) {
     }
 
     @Override
-    public UserAccount findUserById(long userId) {
-        return userAccountRepository.getOne(userId);
+    public UserAccount findById(long userId) {
+        return userAccountRepository.getReferenceById(userId);
     }
 
     @Override