|
|
@@ -2,7 +2,6 @@ package com.izouma.nineth.utils;
|
|
|
|
|
|
import com.izouma.nineth.domain.User;
|
|
|
import com.izouma.nineth.enums.AuthorityName;
|
|
|
-import com.izouma.nineth.security.Authority;
|
|
|
import com.izouma.nineth.security.JwtUser;
|
|
|
import org.springframework.security.core.Authentication;
|
|
|
import org.springframework.security.core.context.SecurityContextHolder;
|
|
|
@@ -17,9 +16,9 @@ public class SecurityUtils {
|
|
|
return user;
|
|
|
}
|
|
|
|
|
|
- public static boolean hasRole(AuthorityName name){
|
|
|
+ public static boolean hasRole(AuthorityName name) {
|
|
|
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()));
|
|
|
}
|
|
|
}
|