Skip to content

Test ehr docker fix #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smalho01 merged 5 commits into from
May 15, 2023
Merged

Test ehr docker fix #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7edba32
Merge pull request #43 from mcode/dev
smalho01 May 9, 2023
d3a0e94
initial commit
smalho01 May 11, 2023
67d1e51
updated local properties
smalho01 May 11, 2023
aec8053
remove auth proxy from base prop file
smalho01 May 11, 2023
071409c
remove env from runner, does not all override
smalho01 May 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions dockerRunnerDev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions dockerRunnerProd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hl7/davinci/ehrserver/authproxy/AuthProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fhirServer.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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