add test cases

Author: stevehu

CHANGELOG.md

@@ -0,0 +1,34 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [Unreleased]
+### Added
+
+### Changed
+
+
+## 0.1.2 - 2016-10-10
+### Added
+- Test cases
+
+### Changed
+- Update exception handling with ApiException
+- Upgrade to framework 0.1.7
+- Remove several config files that are not used
+- Add status.json config for additional codes for OAuth2
+
+
+## 0.1.1 - 2016-09-19
+### Added
+
+### Changed
+- Upgrade to framework 0.1.2
+
+
+## 0.1.0 - 2016-08-16
+### Added
+- Code Handler
+- Token Handler

pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.networknt</groupId>
     <artifactId>oauth2</artifactId>
     <packaging>jar</packaging>
-    <version>0.1.2-SNAPSHOT</version>
+    <version>0.1.2</version>
     <name>oauth2</name>
 
     <properties>
@@ -116,6 +116,12 @@
             <version>${version.junit}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${version.httpclient}</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/networknt/oauth/handler/CodeHandler.java

@@ -31,7 +31,7 @@ public CodeHandler(ObjectMapper objectMapper) {
         this.objectMapper = objectMapper;
     }
 
-    public void handleRequest(HttpServerExchange exchange) throws ApiException {
+    public void handleRequest(HttpServerExchange exchange) throws Exception {
         exchange.getResponseHeaders().put(
                 Headers.CONTENT_TYPE, "application/json");
 
@@ -49,15 +49,22 @@ public void handleRequest(HttpServerExchange exchange) throws ApiException {
         String responseType = params.get("response_type");
         String clientId = params.get("client_id");
         if(responseType == null || clientId == null) {
-            throw new ApiException(new Status(INVALID_CODE_REQUEST));
+            Status status = new Status(INVALID_CODE_REQUEST);
+            exchange.setStatusCode(status.getStatusCode());
+            exchange.getResponseSender().send(status.toString());
+            return;
         } else {
             if(!"code".equals(responseType)) {
-                throw new ApiException(new Status(INVALID_RESPONSE_TYPE, responseType));
+                Status status = new Status(INVALID_RESPONSE_TYPE, responseType);
+                exchange.setStatusCode(status.getStatusCode());
+                exchange.getResponseSender().send(status.toString());
             } else {
                 // check if the client_id is valid
                 Map<String, Object> cMap = (Map<String, Object>)TokenHandler.clients.get(clientId);
                 if(cMap == null) {
-                    throw new ApiException(new Status(CLIENT_ID_NOTFOUND, clientId));
+                    Status status = new Status(CLIENT_ID_NOTFOUND, clientId);
+                    exchange.setStatusCode(status.getStatusCode());
+                    exchange.getResponseSender().send(status.toString());
                 } else {
                     // generate auth code
                     String code = Util.getUUID();

src/main/java/com/networknt/oauth/handler/TokenHandler.java

@@ -62,7 +62,10 @@ public void handleRequest(HttpServerExchange exchange) throws ApiException {
                 }
             }
         } catch (Exception e) {
-            throw new ApiException(new Status(UNABLE_TO_PARSE_FORM_DATA, e.getMessage()));
+            Status status = new Status(UNABLE_TO_PARSE_FORM_DATA, e.getMessage());
+            exchange.setStatusCode(status.getStatusCode());
+            exchange.getResponseSender().send(status.toString());
+            return;
         }
         try {
             if("client_credentials".equals(formMap.get("grant_type"))) {
@@ -73,9 +76,16 @@ public void handleRequest(HttpServerExchange exchange) throws ApiException {
                 Status status = new Status(UNSUPPORTED_GRANT_TYPE, formMap.get("grant_type"));
                 exchange.setStatusCode(status.getStatusCode());
                 exchange.getResponseSender().send(status.toString());
+                return;
             }
         } catch (JsonProcessingException e) {
-            throw new ApiException(new Status(JSON_PROCESSING_EXCEPTION, e.getMessage()));
+            Status status = new Status(JSON_PROCESSING_EXCEPTION, e.getMessage());
+            exchange.setStatusCode(status.getStatusCode());
+            exchange.getResponseSender().send(status.toString());
+            return;
+        } catch (ApiException e) {
+            exchange.setStatusCode(e.getStatus().getStatusCode());
+            exchange.getResponseSender().send(e.getStatus().toString());
         }
     }