xwip

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

 package com.jh.boot.security;
 
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 
-import com.jh.boot.security.model.AppRole;
 import com.jh.boot.security.model.AppUser;
 
 public class SecurityHelper {
 	
-	public static final String ADMIN_ROLE = "ROLE_ADMIM";
-	
 	private SecurityHelper() {
 	}
 
-	public boolean hasAnyRole(Authentication auth, String...roles) {
+	
+	public static AppUser getUser() {
+		return (AppUser) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+	}
+	
+	
+	public static AppUser getUser(Authentication auth) {
+		if (auth == null) {
+			return null;
+		}
+		
+		return (AppUser) auth.getPrincipal();
+	}
+	
+	
+	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 false;
 		}
 
-		Set<String> set = user.getRoles().stream().map(AppRole::getName).collect(Collectors.toSet());
-		if (set.contains(ADMIN_ROLE)) {
-			return true;
-		}
 		
 		for (String role : roles) { 
-			if (set.contains(role)) {
+			if (user.getRolesMap().containsKey(role)) {
 				return true;
 			}
 		}