Skip to content
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.

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

OZ-348: Align eip-demo service with the upgraded eip-client. #73

Merged
merged 3 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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: 2 additions & 0 deletions demo/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ services:
env_file: ../eip.env
environment:
- NUMBER_OF_DEMO_PATIENTS=${NUMBER_OF_DEMO_PATIENTS}
- EIP_PROFILE=prod
- OPENMRS_URL=http://openmrs:8080/openmrs
volumes:
- "./eip/config:/eip-client/config"
- "./eip/routes:/eip-client/routes"
Expand Down
19 changes: 1 addition & 18 deletions demo/eip/config/application.properties
Original file line number Diff line number Diff line change
@@ -1,28 +1,11 @@
# *********************** OAuth2 Configuration ****************************************************************
#
#Enabled Oauth when set to true
oauth.enabled=${OAUTH_ENABLED}

#The client Id of the account
oauth.access.token.uri=${OAUTH_ACCESS_TOKEN_URI}

#The client Id of the account to use to authenticate
oauth.client.id=${OAUTH_CLIENT_ID}

#The client secret of the account to use to authenticate
oauth.client.secret=${OAUTH_CLIENT_SECRET}
#Authentication scope, can be multiple values separated by commas
oauth.client.scope=email
# ----------------------------------------------------------------------------------------------------------------------

# *********************** Configuration of the OpenMRS Web App *********************************************************
#
# OpenMRS user credentials
openmrs.username=${OPENMRS_USER}
openmrs.password=${OPENMRS_PASSWORD}

# OpenMRS base url
openmrs.baseUrl=${OPENMRS_URL}/openmrs
openmrs.baseUrl=${OPENMRS_URL}

# Number of demo patients used to generate demo data, defaults to 0
number.of.demo.patients=${NUMBER_OF_DEMO_PATIENTS}
Expand Down
17 changes: 0 additions & 17 deletions demo/eip/routes/authenticate-to-openmrs-route.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,5 @@
<simple>${exchangeProperty.basic-openmrs-authentication}</simple>
</setHeader>

<!-- If SSO is enabled then override basic authentication in favor of Oauth -->
<setBody>
<simple></simple>
</setBody>
<process ref="oauthProcessor" />
<choice>
<when>
<simple>${body} != null &amp;&amp; ${body} != ""</simple>
<setHeader name="Authorization">
<simple>${body}</simple>
</setHeader>
</when>
</choice>

<setBody>
<simple>${exchangeProperty.body}</simple>
</setBody>
Ruhanga marked this conversation as resolved.
Show resolved Hide resolved
</route>
</routes>