diff --git a/core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java b/core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java index 23e7710ffdc21c0339d12d6ed9820907762b0df9..61726ae8145341ef777b3f384714cc32490f5959 100644 --- a/core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java +++ b/core/src/main/java/com/usthe/sureness/util/JsonWebTokenUtil.java @@ -6,7 +6,10 @@ import io.jsonwebtoken.security.SignatureException; import javax.xml.bind.DatatypeConverter; import java.security.Key; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.regex.Pattern; /** @@ -48,13 +51,12 @@ public class JsonWebTokenUtil { * @param id token ID * @param subject user ID * @param issuer issuer - * @param period period time(ms) + * @param period period time(s) * @param roles Access claim-roles * @param permissions Access claim-permissions * @param isRefresh is a refresh token * @return java.lang.String jwt */ - @Deprecated public static String issueJwt(String id, String subject, String issuer, Long period, List roles, List permissions, Boolean isRefresh) { @@ -62,69 +64,7 @@ public class JsonWebTokenUtil { customClaimMap.put("roles", roles); customClaimMap.put("perms", permissions); customClaimMap.put("isRefresh", isRefresh); - return issueJwtAll(id, subject, issuer, period, null, null, - null, null, customClaimMap); - } - - /** - * issue json web token - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(ms) - * @param roles Access claim-roles - * @return java.lang.String jwt - */ - public static String issueJwt(String id, String subject, String issuer, Long period, List roles) { - Map customClaimMap = Collections.singletonMap("roles", roles); - return issueJwtAll(id, subject, issuer, period, null, null, - null, null, customClaimMap); - } - - /** - * issue all jwt params - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(ms) - * @param audience this ID Token is intended for, client id info - * @param payload payload - * @param notBefore Not Before(ms) - * @param roles roles the user has - * @param headerMap header - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwt(String id, String subject, String issuer, Long period, - String audience, String payload, Long notBefore, List roles, - Map headerMap, Map customClaimMap){ - if (customClaimMap == null) { - customClaimMap = Collections.singletonMap("roles", roles); - } else { - customClaimMap.put("roles", roles); - } - return issueJwtAll(id, subject, issuer, period, audience, payload, notBefore, headerMap, customClaimMap); - } - - /** - * issue all jwt params - * @param id token ID - * @param subject user ID - * @param issuer issuer - * @param period period time(ms) - * @param roles roles the user has - * @param customClaimMap custom claim param - * @return json web token - */ - public static String issueJwt(String id, String subject, String issuer, Long period, - List roles, Map customClaimMap){ - if (customClaimMap == null) { - customClaimMap = Collections.singletonMap("roles", roles); - } else { - customClaimMap.put("roles", roles); - } - return issueJwtAll(id, subject, issuer, period, null, null, - null, null, customClaimMap); + return issueJwtAll(id, subject, issuer, period, null, null, null, null, customClaimMap); } /** @@ -132,10 +72,10 @@ public class JsonWebTokenUtil { * @param id token ID * @param subject user ID * @param issuer issuer - * @param period period time(ms) - * @param audience this ID Token is intended for, client id info + * @param period period time(s) + * @param audience audience * @param payload payload - * @param notBefore Not Before(ms) + * @param notBefore Not Before(s) * @param headerMap header * @param customClaimMap custom claim param * @return json web token