Revize d411f143

re #8014 Login into app + session for user.

src/main/java/vldc/aswi/configuration/AppConfig.java

@@ -6 +6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 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.DelegatingPasswordEncoder;
+import org.springframework.security.crypto.password.NoOpPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.web.util.matcher.RegexRequestMatcher;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -69 +73 @@
         return viewResolver;
     }
 
+
     @Bean
     public PasswordEncoder passwordEncoder() {
     	return new BCryptPasswordEncoder();
@@ -76 +81 @@
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
-		/*
 		http
 		.authorizeRequests()
 			.mvcMatchers("/login").permitAll()
@@ -86 +90 @@
 		.formLogin()
 			.loginPage("/login")
 			.permitAll()
-			.defaultSuccessUrl("/")
+			.defaultSuccessUrl("/", true)
 			.and()
 		.logout()
 			.logoutRequestMatcher(new RegexRequestMatcher("/logout", "GET"))
 			.invalidateHttpSession(true)
 			.deleteCookies("JSESSIONID")
 			.permitAll();
-		 */
 	}
 
 	@Override
@@ -108 +111 @@
 		registry
 		.addResourceHandler("/css/**")
 		.addResourceLocations("/css/");
-
         registry
-                .addResourceHandler("/js/**")
-                .addResourceLocations("/js/");
+		.addResourceHandler("/js/**")
+		.addResourceLocations("/js/");
 		registry
 		.addResourceHandler("/webfonts/**")
 		.addResourceLocations("/webfonts/");

src/main/java/vldc/aswi/dao/UserRepository.java

@@ -16 +16 @@
      * @return User if ID is present in database.
      */
     User getById(Long Id);
+
+    /**
+     * Find User by his username.
+     * @param username user's username.
+     * @return User if username is presented in database.
+     */
+    User findByUsername(String username);
 }

src/main/java/vldc/aswi/domain/User.java

@@ -27 +27 @@
     private String password;
 
     /** Role of user. */
-    @ManyToOne(fetch=FetchType.LAZY)
+    @ManyToOne(fetch=FetchType.EAGER)
     @JoinColumn(name = "role_id")
     private Role role;
 

src/main/java/vldc/aswi/model/login/WebCredentials.java

@@ +1 @@
+package vldc.aswi.model.login;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.stream.Collectors;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+
+/**
+ * Model used in spring security representing user credentials saved in session.
+ */
+public class WebCredentials implements UserDetails {
+
+	private static final long serialVersionUID = 26298569253774237L;
+
+	private final String username;
+	private final String password;
+	private Collection<String> roles;
+
+	/**
+	 * Constructor.
+	 * @param username Username of user.
+	 * @param password Password of user.
+	 */
+	public WebCredentials(String username, String password) {
+		this.username = username;
+		this.password = password;
+		this.roles = new LinkedList<>();
+	}
+
+	/**
+	 * Get authorities for logged User.
+	 * @return List of roles.
+	 */
+	@Override
+	public Collection<? extends GrantedAuthority> getAuthorities() {
+		return this.roles
+		.stream()
+		.map(SimpleGrantedAuthority::new)
+		.collect(Collectors.toList());
+	}
+
+	/**
+	 * Get logged user password.
+	 * @return User password.
+	 */
+	@Override
+	public String getPassword() {
+		return this.password;
+	}
+
+	/**
+	 * Get logged user username.
+	 * @return User username.
+	 */
+	@Override
+	public String getUsername() {
+		return this.username;
+	}
+
+	/**
+	 * Check if account is non expired.
+	 * @return True.
+	 */
+	@Override
+	public boolean isAccountNonExpired() {
+		return true;
+	}
+
+	/**
+	 * Check if account is non locked.
+	 * @return True.
+	 */
+	@Override
+	public boolean isAccountNonLocked() {
+		return true;
+	}
+
+	/**
+	 * Check if Credentials non expired.
+	 * @return True.
+	 */
+	@Override
+	public boolean isCredentialsNonExpired() {
+		return true;
+	}
+
+	/**
+	 * Check if user is enabled.
+	 * @return True.
+	 */
+	@Override
+	public boolean isEnabled() {
+		return true;
+	}
+
+	/**
+	 * Add role for user in webcredentials object.
+	 * @param role new role for user.
+	 */
+	public void addRole(String role) {
+		this.roles.add(role);
+	}
+
+}

src/main/java/vldc/aswi/service/UserManager.java

@@ -21 +21 @@
      * @param password - password for user.
      * @return ID of newly created user.
      */
-    Long addUser(String username, String password);
+    Long addUser(String username, String password, Long roleId);
 }

src/main/java/vldc/aswi/service/UserManagerImpl.java

@@ -5 +5 @@
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import vldc.aswi.dao.RoleRepository;
 import vldc.aswi.dao.UserRepository;
 import vldc.aswi.domain.User;
+import vldc.aswi.model.login.WebCredentials;
 
 import javax.transaction.Transactional;
 import java.util.LinkedList;
@@ -19 +24 @@
  */
 @Service
 @Slf4j
-public class UserManagerImpl implements UserManager {
+public class UserManagerImpl implements UserManager, UserDetailsService {
+
+    @Autowired
+    private PasswordEncoder encoder;
 
     /** Autowired user repository. */
     @Autowired
@@ -32 +40 @@
     /**
      * Initialization setup for user manager. Check if user repository contains records and if not, initialize default values.
      */
-    /*
     @EventListener(classes = {
             ContextRefreshedEvent.class
     })
@@ -40 +47 @@
     @Transactional
     public void setup() {
         if (this.userRepository.count() == 0) {
-            log.info("No user present, creating 'admin', 'referentka', 'prorektor'.");
-            Long idAdmin = this.addUser("admin", "admin");
-            Long idReferentka = this.addUser("referentka", "referentka");
-            Long idProrektor = this.addUser("prorektor", "prorektor");
-
-            User admin = this.userRepository.getById(idAdmin);
-            User referentka = this.userRepository.getById(idReferentka);
-            User prorektor = this.userRepository.getById(idProrektor);
-
-            //admin.setRole();
+            log.info("No user present");
+            /*
+            this.addUser("administrator", "demo", (long) 1);
+            this.addUser("fakulta", "demo", (long) 2);
+            this.addUser("referentka", "demo", (long) 3);
+            this.addUser("prorektor", "demo", (long) 4);
+             */
         }
     }
+
+    /**
+     * Load user details by his username.
+     * @param username Username of user.
+     * @return UserDetails of user.
+     * @throws UsernameNotFoundException Exception.
      */
+    @Override
+    @Transactional
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        User user = this.userRepository.findByUsername(username);
+        if (user == null) {
+            throw new UsernameNotFoundException("Invalid username!");
+        }
+
+        WebCredentials credentials = new WebCredentials(user.getUsername(), user.getPassword());
+        credentials.addRole(user.getRole().getName());
+
+        return credentials;
+    }
 
     /**
      * Get all users from database.
@@ -72 +95 @@
      * @return ID of newly created user.
      */
     @Override
-    public Long addUser(String username, String password) {
-        User user = new User(username, password);
+    public Long addUser(String username, String password, Long roleId) {
+        String hashed = this.encoder.encode(password);
+        User user = new User(username, hashed);
+        user.setRole(this.roleRepository.getById(roleId));
         this.userRepository.save(user);
         return user.getId();
     }

src/main/java/vldc/aswi/service/parameter/ParameterManagerImpl.java

@@ -231 +231 @@
      * @param parameterValuesList - List of updated parameters.
      */
     private void updateParameters(List<Parameter> parameterValuesList) {
-        for (Parameter parameterValues : parameterValuesList) {
+        for (Parameter parameterWithValues : parameterValuesList) {
+            List<ParameterValue> values = new ArrayList<>(parameterWithValues.getParameterValues());
+
             // Get current parameter from database.
-            Parameter parameter = this.parameterRepository.getById(parameterValues.getId());
+            Parameter parameter = this.parameterRepository.getById(parameterWithValues.getId());
             // Update current parameter values.
-            parameter.setName(parameterValues.getName());
-            parameter.setParameterOrder(parameterValues.getParameterOrder());
-            parameter.setNameOfSelect(parameterValues.getNameOfSelect());
-            parameter.setAssembly(this.assemblyRepository.getById(parameterValues.getAssembly().getId()));
-            parameter.setParameterType(this.parameterTypeRepository.getById(parameterValues.getParameterType().getId()));
-            parameter.setDefaultValue(parameterValues.getDefaultValue());
+            parameter.setName(parameterWithValues.getName());
+            parameter.setParameterOrder(parameterWithValues.getParameterOrder());
+            parameter.setNameOfSelect(parameterWithValues.getNameOfSelect());
+            parameter.setAssembly(this.assemblyRepository.getById(parameterWithValues.getAssembly().getId()));
+            parameter.setParameterType(this.parameterTypeRepository.getById(parameterWithValues.getParameterType().getId()));
+            parameter.setDefaultValue(parameterWithValues.getDefaultValue());
 
             // Insert changes into database.
             this.parameterRepository.save(parameter);
 
             // Update parameter values, locations, functions and operators.
-            if (parameter.getParameterType().equals("Výčet")) {
-                updateParameterValues(parameterValues.getId(), parameterValues.getParameterValues());
+            if (parameter.getParameterType().getName().equals("Výčet")) {
+                updateParameterValues(parameterWithValues.getId(), values);
             }
 
-            updateParameterLocations(parameterValues.getId(), parameterValues.getLocations());
-            updateParameterFunctions(parameterValues.getId(), parameterValues.getFunctions());
-            updateParameterOperators(parameterValues.getId(), parameterValues.getOperators());
+            updateParameterLocations(parameterWithValues.getId(), parameterWithValues.getLocations());
+            updateParameterFunctions(parameterWithValues.getId(), parameterWithValues.getFunctions());
+            updateParameterOperators(parameterWithValues.getId(), parameterWithValues.getOperators());
         }
     }
 
@@ -377 +379 @@
         List<ParameterValue> newParameterValuesDeleted = new LinkedList<>(newParameterValues);
         currentParameterValuesDeleted.removeAll(newParameterValuesDeleted);
 
-        // Get updated parameter values.
-        List<ParameterValue> currentParameterValuesUpdated = new LinkedList<>(currentParameterValues);
-        List<ParameterValue> newParameterValuesUpdated = new LinkedList<>(newParameterValues);
-        newParameterValuesUpdated.retainAll(currentParameterValuesUpdated);
-
         // If there is no changes, do not update.
-        if (newParameterValuesNew.size() == 0 && currentParameterValuesDeleted.size() == 0 && newParameterValuesUpdated.size() == 0) return;
+        if (newParameterValuesNew.size() == 0 && currentParameterValuesDeleted.size() == 0) return;
 
         // Delete removed parameter values.
         for (ParameterValue parameterValue : currentParameterValuesDeleted) {
             this.parameterValueRepository.delete(parameterValue);
         }
 
-        // Update parameter values.
-        updateParameterValueValues(newParameterValuesUpdated);
-
         // Add new parameter values.
         addParameterValueValues(parameterId, newParameterValuesNew);
     }
 
-    /**
-     * Update all updated parameter values.
-     * @param updatedParameterValuesList - List of all updated parameter values.
-     */
-    private void updateParameterValueValues(List<ParameterValue> updatedParameterValuesList) {
-        for (ParameterValue parameterValueValues : updatedParameterValuesList) {
-            ParameterValue parameterValue = this.parameterValueRepository.getById(parameterValueValues.getId());
-            parameterValue.setValue(parameterValueValues.getValue());
-
-            // Insert changes into database.
-            this.parameterValueRepository.save(parameterValue);
-        }
-    }
-
     /**
      * Add new parameter values.
      * @param parameterId - ID of parameter.

src/main/java/vldc/aswi/web/controller/LoginController.java

@@ -2 +2 @@
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.servlet.ModelAndView;
 
 @Controller
 public class LoginController extends BasicController {
 
+	/**
+	 * Get mapping method for login page.
+	 * @return Model and view for login page.
+	 */
 	@GetMapping("/login")
-	public String login() {
-		return "login";
+	public ModelAndView login() {
+		ModelAndView modelAndView = new ModelAndView("login");
+
+		return modelAndView;
 	}
 
 }

src/main/webapp/WEB-INF/templates/login.html

@@ -19 +19 @@
 				<table>
 					<tr>
 						<td>Přihlašovací jméno:</td>
-						<td><input type="text" class="form-control"/></td>
+						<td><input type="text" name="username" id="username" class="form-control"/></td>
 					</tr>
 					<tr>
 						<td>Heslo:</td>
-						<td><input type="password" class="form-control"/></td>
+						<td><input type="password" name="password" id="password" class="form-control"/></td>
 					</tr>
 					<tr>
 						<td><button class="btn-primary btn" type="submit">Přihlásit</button></td>