xiongzhu пре 4 година
родитељ
комит
dbbb529dc0
1 измењених фајлова са 3 додато и 4 уклоњено
  1. 3 4
      src/main/java/com/izouma/nineth/utils/SecurityUtils.java

+ 3 - 4
src/main/java/com/izouma/nineth/utils/SecurityUtils.java

@@ -2,7 +2,6 @@ package com.izouma.nineth.utils;
 
 
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.domain.User;
 import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.enums.AuthorityName;
-import com.izouma.nineth.security.Authority;
 import com.izouma.nineth.security.JwtUser;
 import com.izouma.nineth.security.JwtUser;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -17,9 +16,9 @@ public class SecurityUtils {
         return user;
         return user;
     }
     }
 
 
-    public static boolean hasRole(AuthorityName name){
+    public static boolean hasRole(AuthorityName name) {
         User user = getAuthenticatedUser();
         User user = getAuthenticatedUser();
-        if (null==user) return false;
-        return user.getAuthorities().contains(Authority.get(name));
+        if (null == user) return false;
+        return user.getAuthorities().stream().anyMatch(a -> a.getName().equals(name.name()));
     }
     }
 }
 }