fixes

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.6.RELEASE</version>
+		<version>2.2.0.RELEASE</version>
 		<relativePath />
 	</parent>
 

src/main/java/com/jh/boot/security/SecurityHelper.java

@@ -27,11 +27,14 @@ public class SecurityHelper {
 	
 	public static boolean hasAnyRole(Authentication auth, String...roles) {
 		AppUser user = auth instanceof AppUserAuthentication ? ((AppUserAuthentication) auth).getUser() : null;
-		
-		if (user == null || user.getRoles() == null || roles == null || roles.length == 0) {
+		return hasAnyRole(user, roles);
+	}
+
+
+	public static boolean hasAnyRole(AppUser user, String... roles) {
+		if (user == null || user.getRolesMap() == null || roles == null || roles.length == 0) {
 			return false;
 		}
-
 		
 		for (String role : roles) { 
 			if (user.getRolesMap().containsKey(role)) {

src/main/java/com/jh/boot/security/api/AuthApiController.java

@@ -40,7 +40,7 @@ import com.jh.boot.security.AuthService;
 import com.jh.boot.security.PasswordUtils;
 import com.jh.boot.security.model.AppUser;
 import com.jh.boot.utils.Utils;
-import com.jh.boot.web.error.BadRequestException;
+import com.jh.boot.web.error.ValidationFailedException;
 import com.jh.boot.web.error.ErrorMessage;
 import com.jh.boot.web.error.NotFoundException;
 import com.jh.boot.web.error.RestApiException;
@@ -120,7 +120,7 @@ public class AuthApiController {
     	}
     	//validate
     	if (signup == null) {
-    		throw new BadRequestException();
+    		throw new ValidationFailedException();
     	}
     	
     	List<ErrorMessage> errors = new ArrayList<>();

src/main/java/com/jh/boot/web/error/BadRequestException.java → src/main/java/com/jh/boot/web/error/ValidationFailedException.java

@@ -6,30 +6,30 @@ import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 /**
- * The Class BadRequestException.
+ * The Class ValidationFailedException.
  */
 @ResponseStatus(value = HttpStatus.BAD_REQUEST)
-public class BadRequestException extends RestApiException {
+public class ValidationFailedException extends RestApiException {
     
     /** The Constant serialVersionUID. */
     private static final long serialVersionUID = 1L;
 
     /**
-     * Instantiates a new bad request exception.
+     * Instantiates a new validation failed exception.
      *
      * @param errors the errors
      */
-    public BadRequestException(Collection<ErrorMessage> errors) {
+    public ValidationFailedException(Collection<ErrorMessage> errors) {
         super(HttpStatus.BAD_REQUEST, errors);
         
     }
 
     /**
-     * Instantiates a new bad request exception.
+     * Instantiates a new validation failed exception.
      *
      * @param errors the errors
      */
-    public BadRequestException(ErrorMessage... errors) {
+    public ValidationFailedException(ErrorMessage... errors) {
         super(HttpStatus.BAD_REQUEST, errors);
         
     }