Final Project Base version 1

Author: mupezzuol

src/main/java/com/oauth2/config/auth/custom/CustomPermissionEvaluator.java

@@ -15,15 +15,15 @@
 import com.oauth2.entities.Permission;
 import com.oauth2.entities.Role;
 import com.oauth2.entities.User;
-import com.oauth2.services.impl.UserService;
+import com.oauth2.services.IUserService;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class CustomPermissionEvaluator implements PermissionEvaluator {
 
 	@Autowired
-	private UserService userService;
+	private IUserService userService;
 
 
 	//OR -> @PreAuthorize("hasPermission(returnObject, {'user_create', 'user_update', 'abcd_create', 'abcd_read', 'user_read'})")
@@ -40,10 +40,10 @@ public boolean hasPermission(Authentication auth, Object targetDomainObject, Obj
 
 			//Valid
 			if(!permissionsValid.isEmpty()) {
-				log.info("End - Permission Valid for this method");
+				log.info("Permission Valid for this method");
 				return true;
 			}else {
-				log.info("End - Permission Invalid for this method");
+				log.info("Permission Invalid for this method");
 				return false;
 			}
 
@@ -62,7 +62,7 @@ public boolean hasPermission(Authentication auth, Serializable targetId, String
 
 
 	private List<String> validPermissions(Authentication auth, Object permission) {
-		log.info("Begin - validating user permission to access method");
+		log.info("Begin - validating user permission in method validPermissions in class CustomPermissionEvaluator");
 
 		UUID uuid_user = UUID.fromString(auth.getPrincipal().toString());
 
@@ -86,7 +86,7 @@ private List<String> validPermissions(Authentication auth, Object permission) {
 				.filter(p -> permissionsUser.contains(p))
 				.collect(Collectors.toList());
 
-		log.info("End - validating user permission to access method");
+		log.info("End - validating user permission in method validPermissions in class CustomPermissionEvaluator");
 		return permissionsValid;
 	}
 

src/main/java/com/oauth2/controllers/HomeController.java

@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import com.oauth2.entities.User;
-import com.oauth2.models.dto.UserRoleAndAuthoritiesDTO;
+import com.oauth2.models.dto.auth.AuthUserRoleAndAuthoritiesDTO;
 import com.oauth2.services.IUserService;
 
 import io.swagger.annotations.Api;
@@ -35,15 +35,15 @@ public String home() {
 	}
 
 	@GetMapping(value = "authorities/{uuid}", produces = MediaType.APPLICATION_JSON_VALUE)
-	public ResponseEntity<UserRoleAndAuthoritiesDTO> getAuthorities(@PathVariable String uuid){
+	public ResponseEntity<AuthUserRoleAndAuthoritiesDTO> getAuthorities(@PathVariable String uuid){
 
 		try {
 			UUID uuid_user = UUID.fromString(uuid.toString());
 
 			User user = userService.findByUuid(uuid_user)
 					.orElseThrow(() -> new UsernameNotFoundException("Error -> hasPermission for UUID: " + uuid_user));
 
-			UserRoleAndAuthoritiesDTO dto = new UserRoleAndAuthoritiesDTO(user);
+			AuthUserRoleAndAuthoritiesDTO dto = new AuthUserRoleAndAuthoritiesDTO(user);
 
 			return ResponseEntity.ok(dto);
 		} catch (Exception e) {

src/main/java/com/oauth2/models/dto/TestDTO.java

@@ -0,0 +1,5 @@
+package com.oauth2.models.dto;
+
+public class TestDTO {
+
+}

…om/oauth2/models/dto/PermissionsDTO.java …/models/dto/auth/AuthPermissionsDTO.javasrc/main/java/com/oauth2/models/dto/PermissionsDTO.java renamed to src/main/java/com/oauth2/models/dto/auth/AuthPermissionsDTO.java src/main/java/com/oauth2/models/dto/PermissionsDTO.java renamed to src/main/java/com/oauth2/models/dto/auth/AuthPermissionsDTO.java

@@ -1,4 +1,4 @@
-package com.oauth2.models.dto;
+package com.oauth2.models.dto.auth;
 
 import com.oauth2.entities.Permission;
 
@@ -9,11 +9,11 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class PermissionsDTO {
+public class AuthPermissionsDTO {
 
 	private String name;
 
-	public PermissionsDTO(Permission permission) {
+	public AuthPermissionsDTO(Permission permission) {
 		this.name = permission.getName();
 	}
 

…java/com/oauth2/models/dto/RolesDTO.java …oauth2/models/dto/auth/AuthRolesDTO.javasrc/main/java/com/oauth2/models/dto/RolesDTO.java renamed to src/main/java/com/oauth2/models/dto/auth/AuthRolesDTO.java src/main/java/com/oauth2/models/dto/RolesDTO.java renamed to src/main/java/com/oauth2/models/dto/auth/AuthRolesDTO.java

@@ -1,4 +1,4 @@
-package com.oauth2.models.dto;
+package com.oauth2.models.dto.auth;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,16 +13,16 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class RolesDTO {
+public class AuthRolesDTO {
 
 	private String name;
-	private List<PermissionsDTO> permissions;
+	private List<AuthPermissionsDTO> permissions;
 
-	public RolesDTO(Role role) {
+	public AuthRolesDTO(Role role) {
 		this.name = role.getName();
 		this.permissions = new ArrayList<>();
 		this.permissions.addAll(role.getPermissions().stream()
-				.map(PermissionsDTO::new)
+				.map(AuthPermissionsDTO::new)
 				.collect(Collectors.toList()));
 	}
 

…odels/dto/UserRoleAndAuthoritiesDTO.java …/auth/AuthUserRoleAndAuthoritiesDTO.javasrc/main/java/com/oauth2/models/dto/UserRoleAndAuthoritiesDTO.java renamed to src/main/java/com/oauth2/models/dto/auth/AuthUserRoleAndAuthoritiesDTO.java src/main/java/com/oauth2/models/dto/UserRoleAndAuthoritiesDTO.java renamed to src/main/java/com/oauth2/models/dto/auth/AuthUserRoleAndAuthoritiesDTO.java

@@ -1,4 +1,4 @@
-package com.oauth2.models.dto;
+package com.oauth2.models.dto.auth;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,16 +13,16 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
-public class UserRoleAndAuthoritiesDTO {
+public class AuthUserRoleAndAuthoritiesDTO {
 
 	private String uuid;
-	private List<RolesDTO> roles;
+	private List<AuthRolesDTO> roles;
 
-	public UserRoleAndAuthoritiesDTO(User user) {
+	public AuthUserRoleAndAuthoritiesDTO(User user) {
 			this.uuid = user.getUuid().toString();
 			this.roles = new ArrayList<>();
 			this.roles.addAll(user.getRoles().stream()
-					.map(RolesDTO::new)
+					.map(AuthRolesDTO::new)
 					.collect(Collectors.toList()));
 		}
 

src/main/java/com/oauth2/models/form/TestForm.java

@@ -0,0 +1,5 @@
+package com.oauth2.models.form;
+
+public class TestForm {
+
+}