Merge pull request #44 from mcode/test-ehr-docker-fix

Test ehr docker fix

Author: smalho01

dockerRunnerDev.sh

@@ -4,8 +4,6 @@
 trap "kill $LOAD_DATA_PID $CONTINUOUS_BUILD_PID $SERVER_PID; gradle --stop; exit" INT
 
 # Set environment variables
-export DOCKER_PROFILE="true"
-
 mkdir logs 
 # Reset log file content for new application boot
 echo "*** Logs for 'gradle installBootDist --continuous' ***" > ./logs/builder.log

dockerRunnerProd.sh

@@ -4,8 +4,6 @@
 trap "kill $LOAD_DATA_PID $SERVER_PID; gradle --stop; exit" INT
 
 # Set environment variables
-export DOCKER_PROFILE="true"
-
 mkdir logs 
 # Reset log file content for new application boot
 echo "*** Logs for 'gradle bootRun' ***" > ./logs/runner.log

src/main/java/org/hl7/davinci/ehrserver/authproxy/AuthProxy.java

@@ -143,7 +143,7 @@ public void authSync(@PathVariable String launch, @RequestParam Map<String, Stri
    */
   private String _parseRedirect(Map<String, String> reqParamValue, HttpServletRequest request) {
     String currentRedirectURI = reqParamValue.get("redirect_uri");
-    String finalRedirectURI = "http://" + ((System.getenv("DOCKER_PROFILE") != null && System.getenv("DOCKER_PROFILE").equals("true")) && Config.get("auth_redirect_host") != null ? Config.get("auth_redirect_host") : request.getLocalName()) + ":" + request.getLocalPort() + "/test-ehr/_auth/" + reqParamValue.get("launch") + "?redirect_uri=" + currentRedirectURI;
+    String finalRedirectURI = "http://" + ((System.getenv("DOCKER_PROFILE") != null && (System.getenv("DOCKER_PROFILE").equals("docker-linux") || System.getenv("DOCKER_PROFILE").equals("docker-windows"))) && Config.get("auth_redirect_host") != null ? Config.get("auth_redirect_host") : request.getLocalName()) + ":" + request.getLocalPort() + "/test-ehr/_auth/" + reqParamValue.get("launch") + "?redirect_uri=" + currentRedirectURI;
     reqParamValue.put("redirect_uri", finalRedirectURI);
     payloadDAO.updateRedirect(reqParamValue.get("launch"), finalRedirectURI);
     return paramFormatter(reqParamValue);

src/main/resources/fhirServer.properties

@@ -7,4 +7,4 @@ oauth_authorize =  http://localhost:8180/auth/realms/ClientFhirServer/protocol/o
 proxy_authorize = http://localhost:8080/test-ehr/auth
 proxy_token = http://localhost:8080/test-ehr/token
 redirect_post_launch = http://localhost:8080/test-ehr/_services/smart/Launch
-redirect_post_token = http://localhost:8080/test-ehr/token
+redirect_post_token = http://localhost:8080/test-ehr/token