add changes for #155

db/mysql/config/oauth2-service/oauth_service.yml

@@ -2,3 +2,4 @@
 ---
 enableAudit: false
 
+consoleURL: http://localhost:3000

oauth2-console/.env

@@ -1,5 +1,8 @@
 #custom environment variables must begin with REACT_APP_
-REACT_APP_API_URL=http://localhost:8080
+REACT_APP_SERVICES_URL=https://localhost:6883/oauth2/service?page=1
+#REACT_APP_CLIENTS_URL=https://localhost:6884/oauth2/client?page=1
+#REACT_APP_USERS_URL=https://localhost:6885/oauth2/user?page=1
+
 
 #built-in React.js env variables
 #PORT=8080

oauth2-console/src/js/main/views.js

@@ -1,8 +1,28 @@
 import React from 'react';
 
-export const Service = () => (
-    <div> Hello, services. </div>
-);
+export class Service extends React.Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            services: []
+        }
+    }
+
+    componentDidMount(){
+       fetch(process.env.REACT_APP_SERVICES_URL)
+        .then(results => results.json())
+        .then(data => {
+            let services = data.map(service => <div key="{service.serviceId}"> {service.serviceName} </div>);
+            this.setState({services: services});
+        });
+    }
+
+    render(){
+        return (
+            <div> {this.state.services} </div>
+        );
+    }
+};
 
 export const Client = () => (
     <div> Hello, clients. </div>

service/src/main/java/com/networknt/oauth/service/handler/Oauth2ServiceGetHandler.java

@@ -1,5 +1,12 @@
 package com.networknt.oauth.service.handler;
 
+import java.util.Collection;
+import java.util.Deque;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.hazelcast.core.IMap;
 import com.hazelcast.query.PagingPredicate;
 import com.hazelcast.query.impl.predicates.LikePredicate;
@@ -8,18 +15,14 @@
 import com.networknt.oauth.cache.CacheStartupHookProvider;
 import com.networknt.oauth.cache.model.Service;
 import com.networknt.oauth.cache.model.ServiceComparator;
-import io.undertow.server.HttpHandler;
+
 import io.undertow.server.HttpServerExchange;
 import io.undertow.util.Headers;
 import io.undertow.util.HttpString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Collection;
-import java.util.Deque;
 
 public class Oauth2ServiceGetHandler extends ServiceAuditHandler implements LightHttpHandler {
     static final Logger logger = LoggerFactory.getLogger(Oauth2ServiceGetHandler.class);
+
     @Override
     public void handleRequest(HttpServerExchange exchange) throws Exception {
         IMap<String, Service> services = CacheStartupHookProvider.hz.getMap("services");
@@ -37,6 +40,14 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
         Collection<Service> values = services.values(pagingPredicate);
 
         exchange.getResponseHeaders().add(Headers.CONTENT_TYPE, "application/json");
+
+        String consoleURL = oauth_config.getConsoleURL();
+
+        if (StringUtils.isNotBlank(consoleURL)) {
+            exchange.getResponseHeaders().add(new HttpString("Access-Control-Allow-Origin"), consoleURL);
+            exchange.getResponseHeaders().add(Headers.VARY, Headers.ORIGIN_STRING);        	
+        }
+
         exchange.getResponseSender().send(Config.getInstance().getMapper().writeValueAsString(values));
         processAudit(exchange);
     }

service/src/main/java/com/networknt/oauth/service/handler/OauthServiceConfig.java

@@ -2,6 +2,7 @@
 
 public class OauthServiceConfig {
     boolean enableAudit;
+    String consoleURL;
 
     public boolean isEnableAudit() {
         return enableAudit;
@@ -10,4 +11,12 @@ public boolean isEnableAudit() {
     public void setEnableAudit(boolean enableAudit) {
         this.enableAudit = enableAudit;
     }
+
+	public String getConsoleURL() {
+		return consoleURL;
+	}
+
+	public void setConsoleURL(String consoleURL) {
+		this.consoleURL = consoleURL;
+	}
 }

service/src/main/java/com/networknt/oauth/service/handler/ServiceAuditHandler.java

@@ -12,8 +12,8 @@
 
 public class ServiceAuditHandler extends AuditInfoHandler {
     static final Logger logger = LoggerFactory.getLogger(ServiceAuditHandler.class);
-    private final static String CONFIG = "oauth_service";
-    private final static OauthServiceConfig oauth_config = (OauthServiceConfig) Config.getInstance().getJsonObjectConfig(CONFIG, OauthServiceConfig.class);
+    static final String CONFIG = "oauth_service";
+    static final OauthServiceConfig oauth_config = (OauthServiceConfig) Config.getInstance().getJsonObjectConfig(CONFIG, OauthServiceConfig.class);
 
 
     protected void processAudit(HttpServerExchange exchange) throws Exception{

service/src/main/resources/config/oauth_service.yml

@@ -2,3 +2,4 @@
 ---
 enableAudit: false
 
+consoleURL: http://localhost:3000