fixes #77 switch to JwtIssuer for token generation

Author: stevehu

token/src/main/java/com/networknt/oauth/token/handler/Oauth2TokenPostHandler.java

@@ -13,7 +13,7 @@
 import com.networknt.oauth.cache.model.User;
 import com.networknt.oauth.token.helper.HttpAuth;
 import com.networknt.security.JwtConfig;
-import com.networknt.security.JwtHelper;
+import com.networknt.security.JwtIssuer;
 import com.networknt.status.Status;
 import com.networknt.utility.CodeVerifierUtil;
 import com.networknt.utility.HashUtil;
@@ -139,7 +139,7 @@ private Map<String, Object> handleClientCredentials(HttpServerExchange exchange,
                 if(customClaim != null && customClaim.length() > 0) {
                     customMap = Config.getInstance().getMapper().readValue(customClaim, new TypeReference<Map<String, Object>>(){});
                 }
-                jwt = JwtHelper.getJwt(mockCcClaims(client.getClientId(), scope, customMap));
+                jwt = JwtIssuer.getJwt(mockCcClaims(client.getClientId(), scope, customMap));
             } catch (Exception e) {
                 logger.error("Exception:", e);
                 throw new ApiException(new Status(GENERIC_EXCEPTION, e.getMessage()));
@@ -233,7 +233,7 @@ private Map<String, Object> handleAuthorizationCode(HttpServerExchange exchange,
                     if(customClaim != null && customClaim.length() > 0) {
                         customMap = Config.getInstance().getMapper().readValue(customClaim, new TypeReference<Map<String, Object>>(){});
                     }
-                    jwt = JwtHelper.getJwt(mockAcClaims(client.getClientId(), scope, userId, user.getUserType().toString(), customMap));
+                    jwt = JwtIssuer.getJwt(mockAcClaims(client.getClientId(), scope, userId, user.getUserType().toString(), customMap));
                 } catch (Exception e) {
                     throw new ApiException(new Status(GENERIC_EXCEPTION, e.getMessage()));
                 }
@@ -296,7 +296,7 @@ private Map<String, Object> handlePassword(HttpServerExchange exchange, Map<Stri
                                 if(customClaim != null && customClaim.length() > 0) {
                                     customMap = Config.getInstance().getMapper().readValue(customClaim, new TypeReference<Map<String, Object>>(){});
                                 }
-                                String jwt = JwtHelper.getJwt(mockAcClaims(client.getClientId(), scope, userId, user.getUserType().toString(), customMap));
+                                String jwt = JwtIssuer.getJwt(mockAcClaims(client.getClientId(), scope, userId, user.getUserType().toString(), customMap));
                                 // generate a refresh token and associate it with userId and clientId
                                 String refreshToken = UUID.randomUUID().toString();
                                 RefreshToken token = new RefreshToken();
@@ -366,7 +366,7 @@ private Map<String, Object> handleRefreshToken(HttpServerExchange exchange, Map<
                         if(customClaim != null && customClaim.length() > 0) {
                             customMap = Config.getInstance().getMapper().readValue(customClaim, new TypeReference<Map<String, Object>>(){});
                         }
-                        jwt = JwtHelper.getJwt(mockAcClaims(client.getClientId(), scope, userId, user.getUserType().toString(), customMap));
+                        jwt = JwtIssuer.getJwt(mockAcClaims(client.getClientId(), scope, userId, user.getUserType().toString(), customMap));
                     } catch (Exception e) {
                         throw new ApiException(new Status(GENERIC_EXCEPTION, e.getMessage()));
                     }
@@ -438,7 +438,7 @@ private Map<String, Object> handleClientAuthenticatedUser(HttpServerExchange exc
                 }
                 String jwt;
                 try {
-                    jwt = JwtHelper.getJwt(mockAcClaims(client.getClientId(), scope, userId, userType, formMap));
+                    jwt = JwtIssuer.getJwt(mockAcClaims(client.getClientId(), scope, userId, userType, formMap));
                 } catch (Exception e) {
                     throw new ApiException(new Status(GENERIC_EXCEPTION, e.getMessage()));
                 }
@@ -513,7 +513,7 @@ private Client validateClientSecret(String clientId, String clientSecret) throws
     }
 
     private JwtClaims mockCcClaims(String clientId, String scopeString, Map<String, Object> formMap) {
-        JwtClaims claims = JwtHelper.getDefaultJwtClaims();
+        JwtClaims claims = JwtIssuer.getDefaultJwtClaims();
         claims.setClaim("client_id", clientId);
         List<String> scope = Arrays.asList(scopeString.split("\\s+"));
         claims.setStringListClaim("scope", scope); // multi-valued claims work too and will end up as a JSON array
@@ -526,7 +526,7 @@ private JwtClaims mockCcClaims(String clientId, String scopeString, Map<String,
     }
 
     private JwtClaims mockAcClaims(String clientId, String scopeString, String userId, String userType, Map<String, Object> formMap) {
-        JwtClaims claims = JwtHelper.getDefaultJwtClaims();
+        JwtClaims claims = JwtIssuer.getDefaultJwtClaims();
         claims.setClaim("user_id", userId);
         claims.setClaim("user_type", userType);
         claims.setClaim("client_id", clientId);

token/src/test/java/com/networknt/oauth/token/handler/JwtGeneratorTest.java

@@ -1,6 +1,6 @@
 package com.networknt.oauth.token.handler;
 
-import com.networknt.security.JwtHelper;
+import com.networknt.security.JwtIssuer;
 import org.jose4j.jwt.JwtClaims;
 import org.junit.Assert;
 import org.junit.Test;
@@ -15,14 +15,14 @@ public class JwtGeneratorTest {
 
     @Test
     public void testJwtGen() throws Exception {
-        JwtClaims claims = JwtHelper.getDefaultJwtClaims();
+        JwtClaims claims = JwtIssuer.getDefaultJwtClaims();
         claims.setClaim("user_id", "steve");
         claims.setClaim("user_type", "EMPLOYEE");
         claims.setClaim("client_id", "ddcaf0ba-1131-2232-3313-d6f2753f25dc");
         List<String> scope = Arrays.asList("api.r", "api.w");
         claims.setStringListClaim("scope", scope); // multi-valued claims work too and will end up as a JSON array
 
-        String jwt = JwtHelper.getJwt(claims);
+        String jwt = JwtIssuer.getJwt(claims);
         Assert.assertNotNull(jwt);
         System.out.println(jwt);
     }

token/src/test/resources/config/jwt.yml

@@ -4,7 +4,7 @@
 # Signature private key that used to sign JWT tokens.
 key:
   kid: '100'                               # kid that used to sign the JWT tokens. It will be shown up in the token header.
-  filename: "/config/oauth/primary.jks"    # private key that is used to sign JWT tokens.
+  filename: "oauth/primary.jks"            # private key that is used to sign JWT tokens.
   password: password                       # password for the private key. It should be set during deployment time along with pk
   keyName: selfsigned                      # key name that is used to identify the right key in keystore.
 issuer: urn:com:networknt:oauth2:v1        # default issuer of the JWT token