From 04ab99ec15d1892ec795ee6aba6e0ff24c8bf12f Mon Sep 17 00:00:00 2001
From: corneliouzbett <kipchubett@gmail.com>
Date: Tue, 30 Jan 2024 11:26:57 +0300
Subject: [PATCH] Remove support for Oauth2 authentication

---
 demo/docker-compose.yml                       |  2 ++
 demo/eip/config/application.properties        | 19 +------------------
 .../routes/authenticate-to-openmrs-route.xml  | 17 -----------------
 3 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
index 3a63cdd..eeae8eb 100644
--- a/demo/docker-compose.yml
+++ b/demo/docker-compose.yml
@@ -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"
diff --git a/demo/eip/config/application.properties b/demo/eip/config/application.properties
index 476cd78..89ba16a 100644
--- a/demo/eip/config/application.properties
+++ b/demo/eip/config/application.properties
@@ -1,20 +1,3 @@
-# *********************** 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
@@ -22,7 +5,7 @@ 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}
diff --git a/demo/eip/routes/authenticate-to-openmrs-route.xml b/demo/eip/routes/authenticate-to-openmrs-route.xml
index 164fdcd..2130cd3 100644
--- a/demo/eip/routes/authenticate-to-openmrs-route.xml
+++ b/demo/eip/routes/authenticate-to-openmrs-route.xml
@@ -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>
     </route>
 </routes>