Revize d411f143

re #8014 Login into app + session for user.

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();
     }