fixes #25 Update Jwt to use string format of scopes for jackson (#26)

Author: stevehu

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.networknt</groupId>
     <artifactId>http-client</artifactId>
-    <version>1.0.9</version>
+    <version>1.0.10</version>
     <packaging>jar</packaging>
     <description>generic http client module</description>
     <url>https://github.com/networknt/http-client</url>

src/main/java/com/networknt/client/oauth/Jwt.java

@@ -28,7 +28,7 @@
  */
 public class Jwt {
 
-    protected Set<String> scopes = new HashSet<>();
+    protected String scopes;
     protected Key key;
     /**
      * This is the client credentials token config if multiple auth servers are used.
@@ -140,19 +140,19 @@ public void setCcConfig(Map<String, Object> ccConfig) {
         this.ccConfig = ccConfig;
     }
 
-    public Set<String> getScopes() {
-        return scopes;
+    public Set<String> getScopesSet() {
+        Set<String> scopesSet = new HashSet<>();
+        if(StringUtils.isBlank(scopes)) return scopesSet;
+        scopesSet.addAll(Arrays.asList(scopes.split("(\\s)+")));
+        return scopesSet;
     }
 
-    public void setScopes(Set<String> scopes) {
-        this.scopes = scopes;
+    public String getScopes() {
+        return scopes;
     }
 
-    public void setScopes(String scopesStr) {
-        this.scopes = this.scopes == null ? new HashSet() : this.scopes;
-        if(StringUtils.isNotBlank(scopesStr)) {
-            scopes.addAll(Arrays.asList(scopesStr.split("(\\s)+")));
-        }
+    public void setScopes(String scopes) {
+        this.scopes = scopes;
     }
 
     public Key getKey() {
@@ -167,7 +167,7 @@ public static class Key {
         /**
          * scopes should be extendable by its children
          */
-        protected Set<String> scopes;
+        protected String scopes;
         /**
          * serviceId should be extendable by its children
          */
@@ -183,7 +183,8 @@ public boolean equals(Object obj) {
             return hashCode() == obj.hashCode();
         }
 
-        public Key(Set<String> scopes) {
+        public Key(String serviceId, String scopes) {
+            this.serviceId = serviceId;
             this.scopes = scopes;
         }
 
@@ -192,13 +193,28 @@ public Key(String serviceId) {
         }
 
         public Key() {
-            this.scopes = new HashSet<>();
+
         }
 
-        public Set<String> getScopes() {
+        public String getScopes() {
             return scopes;
         }
 
+        public Set<String> getScopesSet() {
+            Set<String> scopesSet = new HashSet<>();
+            if(StringUtils.isBlank(scopes)) return scopesSet;
+            scopesSet.addAll(Arrays.asList(scopes.split("(\\s)+")));
+            return scopesSet;
+        }
+
+        public void setScopes(String scopes) {
+            this.scopes = scopes;
+        }
+
+        public void setServiceId(String serviceId) {
+            this.serviceId = serviceId;
+        }
+
         public String getServiceId() {
             return serviceId;
         }

src/main/java/com/networknt/client/oauth/OauthHelper.java

@@ -723,7 +723,7 @@ private static Result<Jwt> getCCTokenRemotely(final Jwt jwt) {
      */
     private static void setScope(TokenRequest tokenRequest, Jwt jwt) {
         if(jwt.getKey() != null && jwt.getKey().getScopes() != null && !jwt.getKey().getScopes().isEmpty()) {
-            tokenRequest.setScope(new ArrayList<>() {{ addAll(jwt.getKey().getScopes()); }});
+            tokenRequest.setScope(new ArrayList<>() {{ addAll(jwt.getKey().getScopesSet()); }});
         }
     }
 

src/main/java/com/networknt/client/oauth/TokenManager.java

@@ -125,9 +125,7 @@ public Result<Jwt> getJwt(String requestPath, String scopes, String serviceId) {
         } else {
             // single auth server, keep the existing logic.
             if(scopes != null) {
-                Set<String> scopeSet = new HashSet<>();
-                scopeSet.addAll(Arrays.asList(scopes.split(" ")));
-                return getJwt(new Jwt.Key(scopeSet), null);
+                return getJwt(new Jwt.Key(scopes), null);
             }
             if(serviceId != null) {
                 return getJwt(new Jwt.Key(serviceId), null);

src/test/java/com/networknt/client/oauth/JwtTest.java

@@ -0,0 +1,43 @@
+package com.networknt.client.oauth;
+
+import com.networknt.http.client.JsonMapper;
+
+/**
+ * Test the Jwt object that can be serialized and deserialized to or from a JSON string.
+ */
+public class JwtTest {
+    public static void main(String[] args) {
+        Jwt jwt = new Jwt();
+        jwt.setJwt("jwt");
+        jwt.setExpire(1000);
+        jwt.setRenewing(true);
+        jwt.setExpiredRetryTimeout(1000);
+        jwt.setEarlyRetryTimeout(1000);
+        jwt.setTokenRenewBeforeExpired(1000);
+        jwt.setExpiredRefreshRetryDelay(1000);
+        jwt.setEarlyRefreshRetryDelay(1000);
+        jwt.setScopes("scope1 scope2");
+
+        System.out.println(jwt.getJwt());
+        System.out.println(jwt.getExpire());
+        System.out.println(jwt.isRenewing());
+        System.out.println(jwt.getExpiredRetryTimeout());
+        System.out.println(jwt.getEarlyRetryTimeout());
+        System.out.println(jwt.getTokenRenewBeforeExpired());
+        System.out.println(jwt.getExpiredRefreshRetryDelay());
+        System.out.println(jwt.getEarlyRefreshRetryDelay());
+        System.out.println(jwt.getScopes());
+        String jsonString = JsonMapper.toJson(jwt);
+        System.out.println(jsonString);
+        jwt = JsonMapper.fromJson(jsonString, Jwt.class);
+        System.out.println(jwt.getJwt());
+        System.out.println(jwt.getExpire());
+        System.out.println(jwt.isRenewing());
+        System.out.println(jwt.getExpiredRetryTimeout());
+        System.out.println(jwt.getEarlyRetryTimeout());
+        System.out.println(jwt.getTokenRenewBeforeExpired());
+        System.out.println(jwt.getExpiredRefreshRetryDelay());
+        System.out.println(jwt.getEarlyRefreshRetryDelay());
+        System.out.println(jwt.getScopes());
+    }
+}