add Token extra filed

Author: xlorne

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/filter/MyAuthenticationFilter.java

@@ -43,7 +43,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 
         Token token = jwt.parser(sign);
         if (token.canRestToken()) {
-            Token newSign = jwt.create(token.getUsername(), token.getDecodeIv(), token.getAuthorities());
+            Token newSign = jwt.create(token.getUsername(), token.decodeIv(), token.getAuthorities(),token.getExtra());
             log.info("reset token ");
             response.setHeader(TOKEN_KEY, newSign.getToken());
         }

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/jwt/Jwt.java

@@ -23,8 +23,20 @@ public Jwt(String secretKey, int jwtTime, int jwtRestTime) {
         this.jwtRestTime = jwtRestTime;
     }
 
+    public Token create(String username, List<String> authorities,String extra){
+        return create(username, null,authorities, extra);
+    }
+
+    public Token create(String username, List<String> authorities){
+        return create(username, null,authorities, null);
+    }
+
     public Token create(String username, String iv, List<String> authorities){
-        Token token = new Token(username, iv, authorities, jwtTime, jwtRestTime);
+        return create(username, iv,authorities, null);
+    }
+
+    public Token create(String username, String iv,List<String> authorities,String extra){
+        Token token = new Token(username, iv,extra, authorities, jwtTime, jwtRestTime);
         String jwt = Jwts.builder().setSubject(token.toJson()).signWith(key).compact();
         token.setToken(jwt);
         return token;

springboot-starter-security-jwt/src/main/java/com/codingapi/springboot/security/jwt/Token.java

@@ -1,9 +1,11 @@
 package com.codingapi.springboot.security.jwt;
 
+import com.alibaba.fastjson.JSONObject;
 import com.codingapi.springboot.framework.serializable.JsonSerializable;
 import com.codingapi.springboot.security.crypto.MyAES;
 import com.codingapi.springboot.security.exception.TokenExpiredException;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -15,22 +17,25 @@
 
 @Getter
 @Setter
+@NoArgsConstructor
 public class Token implements JsonSerializable {
 
     private String username;
+    private String extra;
     private String iv;
+
     private String token;
     private List<String> authorities;
     private long expireTime;
     private long remindTime;
 
 
-    public Token() {
-    }
-
-    public Token(String username, String iv, List<String> authorities, int expireValue, int remindValue){
+    public Token(String username, String iv,String extra, List<String> authorities, int expireValue, int remindValue){
         this.username = username;
-        this.iv = MyAES.getInstance().encode(iv);
+        this.extra = extra;
+        if(iv!=null) {
+            this.iv = MyAES.getInstance().encode(iv);
+        }
         this.authorities = authorities;
         this.expireTime = System.currentTimeMillis() + expireValue;
         this.remindTime = System.currentTimeMillis() + remindValue;
@@ -47,16 +52,22 @@ public boolean isExpire() {
         return expireTime <= System.currentTimeMillis();
     }
 
-
-    public String getIv() {
-        return iv;
+    public String decodeIv(){
+        if(iv==null){
+            return null;
+        }
+        return MyAES.getInstance().decode(iv);
     }
 
-    @Transient
-    public String getDecodeIv(){
-        return MyAES.getInstance().decode(iv);
+
+    public <T> T parseExtra(Class<T> clazz){
+        if(extra==null){
+            return null;
+        }
+        return JSONObject.parseObject(extra,clazz);
     }
 
+
     public boolean canRestToken() {
         return !isExpire() && remindTime <= System.currentTimeMillis();
     }

springboot-starter-security-jwt/src/test/java/com/codingapi/springboot/security/jwt/TestVO.java

@@ -0,0 +1,16 @@
+package com.codingapi.springboot.security.jwt;
+
+import com.codingapi.springboot.framework.serializable.JsonSerializable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Setter
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class TestVO implements JsonSerializable {
+
+    private String name;
+}

springboot-starter-security-jwt/src/test/java/com/codingapi/springboot/security/jwt/TokenTest.java

@@ -17,7 +17,7 @@ class TokenTest {
     private Jwt jwt;
 
     @Test
-    void verify() throws TokenExpiredException {
+    void verify1() throws TokenExpiredException {
         String username = "admin";
         String iv = "123456";
         List<String> authorities = Collections.singletonList("ADMIN");
@@ -26,6 +26,37 @@ void verify() throws TokenExpiredException {
         token.verify();
 
         Token data = jwt.parser(token.getToken());
-        assertEquals(data.getDecodeIv(),iv);
+        assertEquals(data.decodeIv(),iv);
+        assertEquals(data.getAuthorities(),authorities);
+    }
+
+    @Test
+    void verify2() throws TokenExpiredException {
+        String username = "admin";
+        List<String> authorities = Collections.singletonList("ADMIN");
+
+        Token token =jwt.create(username,authorities);
+        token.verify();
+
+        Token data = jwt.parser(token.getToken());
+        assertEquals(data.getUsername(),username);
+        assertEquals(data.getAuthorities(),authorities);
+    }
+
+
+
+    @Test
+    void verify3() throws TokenExpiredException {
+        String username = "admin";
+        TestVO testVO = new TestVO("123");
+        String extra = testVO.toJson();
+        List<String> authorities = Collections.singletonList("ADMIN");
+
+        Token token =jwt.create(username,authorities,extra);
+        token.verify();
+
+        Token data = jwt.parser(token.getToken());
+        assertEquals(data.parseExtra(TestVO.class).getName(), testVO.getName());
+        assertEquals(data.getAuthorities(),authorities);
     }
 }