diff --git a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java index 4f13b68..7ade3a8 100644 --- a/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java +++ b/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java @@ -68,6 +68,7 @@ public class JwtTokenUtil implements Serializable { Map claims = new HashMap<>(); claims.put("userId", userDetails.getUserId()); claims.put("cstmrSno", userDetails.getCstmrSno()); + claims.put("auth", userDetails.getAuth()); claims.put("group", userDetails.getGroup()); return doGenerateToken(claims, userDetails.getUsername()); } @@ -106,34 +107,40 @@ public class JwtTokenUtil implements Serializable { } public String getUserIdByToken() { - ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest rq = sra.getRequest(); + HttpServletRequest rq = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = rq.getHeader("Authorization"); + if(token == null || "".equals(token)) return null; + token = token.substring(JWT_PREFIX.length()).trim(); String userId = getUsernameFromToken(token); + return userId; } public Integer getCstmrSnoByToken() { - ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest rq = sra.getRequest(); + HttpServletRequest rq = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = rq.getHeader("Authorization"); + if(token == null || "".equals(token)) return null; + token = token.substring(JWT_PREFIX.length()).trim(); Claims payload = getAllClaimsFromToken(token); Integer cstmrSno = payload.get("cstmrSno",Integer.class); + return cstmrSno; } public List getGroupAuthByToken() { - ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - HttpServletRequest rq = sra.getRequest(); + HttpServletRequest rq = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String token = rq.getHeader("Authorization"); + if(token == null || "".equals(token)) return null; + token = token.substring(JWT_PREFIX.length()).trim(); Claims payload = getAllClaimsFromToken(token); List groupList = payload.get("group", ArrayList.class); List r = new ArrayList<>(); + for(LinkedHashMap map : groupList){ JwtGroupModel model = new JwtGroupModel(); model.setGroupId(map.get("groupId")); @@ -142,4 +149,16 @@ public class JwtTokenUtil implements Serializable { } return r; } + + public String getUserAuthByToken() { + HttpServletRequest rq = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String token = rq.getHeader("Authorization"); + + if(token == null || "".equals(token)) return null; + + token = token.substring(JWT_PREFIX.length()).trim(); + Claims payload = getAllClaimsFromToken(token); + + return payload.get("auth", String.class); + } } \ No newline at end of file