Revize fab2885e

re #7978 added functionality of only showing assemblies with correct role (same as user), added functionality of showing only logged in users's configurations in "Rychle k"

src/main/java/vldc/aswi/service/ConfigurationManagerImpl.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.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import vldc.aswi.dao.*;
 import vldc.aswi.dao.parameter.ParameterInConfigurationRepository;
-import vldc.aswi.dao.parameter.ParameterTypeRepository;
-import vldc.aswi.domain.Assembly;
-import vldc.aswi.domain.Configuration;
-import vldc.aswi.domain.Function;
+import vldc.aswi.domain.*;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.service.parameter.ParameterInConfigurationManager;
 import vldc.aswi.service.parameter.ParameterTypeManager;
+import vldc.aswi.utils.AuthControl;
 
 import javax.transaction.Transactional;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 @Service
@@ -83 +83 @@
      */
     @Override
     public List<Configuration> getConfigurations() {
-        List<Configuration> retVal = new LinkedList<>();
-        this.configurationRepository.findAll().forEach(retVal::add);
-        return retVal;
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String username;
+        if (!(authentication instanceof AnonymousAuthenticationToken)) {
+            username = authentication.getName();
+        }
+        else {
+            // TODO: 04.05.2020 error message, user not authenticated
+            return null;
+        }
+        User user = userRepository.findByUsername(username);
+
+        return configurationRepository.getByUserEquals(user);
     }
 
     /**
@@ -106 +115 @@
      */
     @Override
     public Configuration saveConfiguration(Configuration newConfiguration, String id) {
-        if(id.equals("")) {
+        if (id.equals("")) {
             return addConfiguration(newConfiguration);
         }
         else {
@@ -158 +167 @@
      * @return saved configuration
      */
     private Configuration addConfiguration(Configuration newConfiguration) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        String username = AuthControl.getUserName();
+        if (username == null) {
+            // TODO: 04.05.2020 error message, user not authenticated
+        }
         Configuration configuration = new Configuration();
         Assembly assembly = assemblyRepository.getById(newConfiguration.getAssembly().getId());
         configuration.setAssembly(assembly);
         configuration.setName(newConfiguration.getName());
         configuration.setTableName(newConfiguration.getTableName());
-        configuration.setUser(userRepository.getById((long) 1));
+        configuration.setUser(userRepository.findByUsername(username));
         Configuration savedConfiguration = configurationRepository.save(configuration);
 
         savedConfiguration.setParametersInConfiguration(new ArrayList<>());