Changes in / [0c049e9:80ddcae]

Location:

sources/app/src/main/java/parkup

Files:

• ParkUpApplication.java (modified) (2 diffs)
• services/ParkingZoneService.java (modified) (3 diffs)

sources/app/src/main/java/parkup/ParkUpApplication.java

@@ -3 +3 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 
 @SpringBootApplication
@@ -15 +12 @@
         SpringApplication.run(ParkUpApplication.class, args);
     }
-
-    @Bean
-    public static Authentication getToken() {
-        Authentication token = null;
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication != null && !authentication.getAuthorities().stream().findFirst().get().getAuthority().equals("ROLE_ANONYMOUS")) {
-            token = authentication;
-        }
-        return token;
-    }
 }

sources/app/src/main/java/parkup/services/ParkingZoneService.java

@@ -2 +2 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
-import parkup.ParkUpApplication;
 import parkup.data.ParkingZoneAdminView;
 import parkup.data.ParkingZoneLocation;
@@ -15 +13 @@
 import parkup.repositories.ParkingZoneRepository;
 import parkup.repositories.WorkerRepository;
-import static parkup.ParkUpApplication.getToken;
+
 import javax.transaction.Transactional;
 import java.util.ArrayList;
@@ -39 +37 @@
 
     public List<ParkingZone> getAllParkingZones() {
-        Authentication user = getToken();
-        String role =user.getAuthorities().stream().findFirst().get().getAuthority();
-        String email = user.getName();
-        List<ParkingZone> parkingZones;
-        if(role.equals("ROLE_REG_USER"))
-            parkingZones= parkingZoneRepository.findAll();
-        else if(role.equals("ROLE_WORKER")){
-            Worker loggedInWorker = workerRepository.findWorkerByEmail(email).orElseThrow(null);
-            parkingZones= parkingZoneRepository.findAll().stream().filter(pz->loggedInWorker.getParkingZones().contains(pz)).collect(Collectors.toList());
-        }else if(role.equals("ROLE_ADMIN"))
-            parkingZones= parkingZoneRepository.findAll();
-        else
-            parkingZones=parkingZoneRepository.findAll();
+        List<ParkingZone> parkingZones= parkingZoneRepository.findAll();
         for(ParkingZone pz:parkingZones){
             setTransientVariables(pz);