Merge pull request #80 from JEstebanCDev/version6.5

Version6.5

Author: JEstebanDev

src/main/java/JEstebanC/FastFoodApp/controller/AdditionalController.java

@@ -78,11 +78,11 @@ public ResponseEntity<Response> getadditional() {
 	@PreAuthorize("hasRole('ROLE_ADMIN') OR hasRole('ROLE_EMPLOYEE')")
 	@PutMapping(value = "/{id}")
 	public ResponseEntity<Response> updateAdditional(@PathVariable("id") Long id,
-			@RequestParam("request") @Valid String strAddiotional,
+			@RequestParam("strAdditional") @Valid String strAdditional,
 			@RequestParam("additionalImage") @Nullable MultipartFile file) {
 		try {
 			if (serviceImp.exist(id)) {
-				Additional additional= serviceImp.update(id,new ObjectMapper().readValue(strAddiotional, Additional.class), file);
+				Additional additional= serviceImp.update(id,new ObjectMapper().readValue(strAdditional, Additional.class), file);
 				if (additional!=null) {
 					return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
 							.data(Map.of("additional", additional))

src/main/java/JEstebanC/FastFoodApp/controller/RefreshTokenController.java

@@ -86,7 +86,6 @@ public ResponseEntity<Response> refreshToken(HttpServletRequest request) {
 
 						Map<String, Object> tokens = new HashMap<>();
 						tokens.put("valid", true);
-						tokens.put("userRoles", user.getUserRoles().getAuthority());
 						tokens.put("access_token", access_token);
 						return ResponseEntity.ok(Response.builder().timeStamp(Instant.now())
 								.data(Map.of("tokens", tokens)).message("tokens").status(HttpStatus.OK)

src/main/java/JEstebanC/FastFoodApp/controller/UserController.java

@@ -208,7 +208,7 @@ public ResponseEntity<Response> getUserByName(@PathVariable("name") String name)
         }
     }
 
-    @PreAuthorize("hasRole('ROLE_ADMIN')")
+    @PreAuthorize("hasRole('ROLE_ADMIN') OR hasRole('ROLE_EMPLOYEE')")
     @GetMapping(value = "/admin/{name}")
     public ResponseEntity<Response> getUserAdminByName(@PathVariable("name") String name) {
 

src/main/java/JEstebanC/FastFoodApp/repository/IUserRepository.java

@@ -17,7 +17,7 @@
  */
 @Repository
 public interface IUserRepository extends JpaRepository<User, Long> {
-	@Query(value = "select * from user_app where user_roles=2 and name=:name order by name", nativeQuery = true)
+	@Query(value = "select * from user_app where user_roles=2 and name like :name order by name", nativeQuery = true)
 	Collection<User> findByNameStartsWith(@Param("name")String name);
 
 

src/main/java/JEstebanC/FastFoodApp/security/CustomAuthenticationFilter.java

@@ -76,7 +76,6 @@ protected void successfulAuthentication(HttpServletRequest request, HttpServletR
 
 		Map<String, Object> tokens = new HashMap<>();
 		tokens.put("valid", true);
-		tokens.put("userRoles", user.getAuthorities().stream().map(GrantedAuthority::getAuthority).findAny().get());
 		tokens.put("access_token", access_token);
 		tokens.put("refresh_token", refresh_token);
 		response.setStatus(200);

src/main/java/JEstebanC/FastFoodApp/service/UserServiceImp.java

@@ -62,11 +62,16 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
             log.error("User with username: " + username + " not found");
             throw new UsernameNotFoundException("User with username: " + username + " not found");
         } else {
-            log.info("User found " + username);
-            Collection<SimpleGrantedAuthority> authorities = new ArrayList<>();
-            authorities.add(new SimpleGrantedAuthority(user.getUserRoles().getAuthority()));
-            return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(),
-                    authorities);
+            if (user.getStatus().equals(Status.ACTIVE)){
+                log.info("User found " + username);
+                Collection<SimpleGrantedAuthority> authorities = new ArrayList<>();
+                authorities.add(new SimpleGrantedAuthority(user.getUserRoles().getAuthority()));
+                return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(),
+                        authorities);
+            }else{
+                log.error("User with username: " + username + " is inactive");
+                throw new UsernameNotFoundException("User with username: " + username + " is inactive");
+            }
         }
     }
 
@@ -249,15 +254,15 @@ public Boolean exist(String username) {
     public Collection<UserDTO> findByName(String name) {
         log.info("Searching user by name: " + name);
 
-        return userRepository.findByNameStartsWith(name).stream().map(this::convertUserToDTO)
+        return userRepository.findByNameStartsWith(name+"%").stream().map(this::convertUserToDTO)
                 .collect(Collectors.toList());
 
     }
 
     public Collection<UserDTO> findByNameAdmin(String name) {
         log.info("Searching user-admin by name: " + name);
 
-        return userRepository.findByNameAdminStartsWith(name).stream().map(this::convertUserToDTO)
+        return userRepository.findByNameAdminStartsWith(name+"%").stream().map(this::convertUserToDTO)
                 .collect(Collectors.toList());
 
     }