Merge pull request #1488 from CalebSLane/componentUpgrade

Upgrade tomcat, Java, and other components to supported versions

Dockerfile

@@ -1,7 +1,7 @@
 ##
 # Build Stage
 #
-FROM maven:3-jdk-11 AS build
+FROM maven:3-eclipse-temurin-21 AS build
 
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
@@ -49,7 +49,7 @@ RUN --mount=type=cache,target=/root/.m2,sharing=locked \
 ##
 # Run Stage
 #
-FROM tomcat:8.5-jdk11
+FROM tomcat:10-jre21
 
 COPY install/createDefaultPassword.sh ./
 

Dockerfile.dev

@@ -1,7 +1,23 @@
 ##
 # Build Stage
 #
-FROM maven:3-jdk-11 as build
+FROM maven:3-eclipse-temurin-21 AS build
+ADD ./dataexport /build/dataexport
+##
+# Build DataExport
+
+WORKDIR /build/dataexport/dataexport-core
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
+WORKDIR /build/dataexport/
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn dependency:go-offline 
+RUN --mount=type=cache,target=/root/.m2,sharing=locked \
+    mvn clean install -DskipTests
+
+
 
 RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     --mount=target=/var/cache/apt,type=cache,sharing=locked \
@@ -10,6 +26,7 @@ RUN --mount=target=/var/lib/apt/lists,type=cache,sharing=locked \
     && apt-get -y --no-install-recommends install \
     git apache2-utils 
 
+
 ##
 # Copy Source Code
 #
@@ -25,21 +42,7 @@ ARG DEFAULT_PW="adminADMIN!"
 ADD ./install/createDefaultPassword.sh /build/install/createDefaultPassword.sh
 RUN ./install/createDefaultPassword.sh -c -p ${DEFAULT_PW}
 
-##
-# Build DataExport
-#
-WORKDIR /build/dataexport/dataexport-core
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
-WORKDIR /build/dataexport/
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn dependency:go-offline 
-RUN --mount=type=cache,target=/root/.m2,sharing=locked \
-    mvn clean install -DskipTests
-
-##
+##a53414f9f76aaeba34b61c9b551f9aa13ee18
 # Build the Project
 #    
 WORKDIR /build
@@ -53,7 +56,7 @@ RUN --mount=type=cache,target=/root/.m2,sharing=locked \
 ##
 # Run Stage
 #
-FROM tomcat:8.5-jdk11
+FROM tomcat:10-jre21
 
 ADD install/createDefaultPassword.sh ./
 

dev.docker-compose.yml

@@ -38,6 +38,9 @@ services:
 
     oe.openelis.org:
         container_name: openelisglobal-webapp 
+        build:
+            context: .
+            dockerfile: Dockerfile.dev
         image: itechuw/openelis-global-2-dev:develop 
         # platform: linux/amd64
         depends_on:
@@ -50,7 +53,6 @@ services:
         networks:
           default:
               ipv4_address: 172.20.1.121
-
         environment:
             - DEFAULT_PW=adminADMIN! 
             - TZ=Africa/Nairobi
@@ -60,7 +62,7 @@ services:
             -  key_trust-store-volume:/etc/openelis-global
             - ./volume/plugins/:/var/lib/openelis-global/plugins
             - ./volume/tomcat/oe_server.xml:/usr/local/tomcat/conf/server.xml
-            - ./target/OpenELIS-Global.war:/usr/local/tomcat/webapps/OpenELIS-Global.war
+            # - ./target/OpenELIS-Global.war:/usr/local/tomcat/webapps/OpenELIS-Global.war
             - ./volume/properties/SystemConfiguration.properties:/var/lib/openelis-global/properties/SystemConfiguration.properties
             -  lucene_index-vol:/var/lib/lucene_index
         secrets:

frontend/src/App.js

@@ -129,22 +129,53 @@ export default function App() {
   }
 
   const logout = () => {
-    fetch(config.serverBaseUrl + "/Logout", {
-      //includes the browser sessionId in the Header for Authentication on the backend server
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "X-CSRF-Token": localStorage.getItem("CSRF"),
-      },
-    })
-      .then((response) => response.status)
-      .then(() => {
-        getUserSessionDetails();
-        window.location.href = config.loginRedirect;
+    if (userSessionDetails.loginMethod === "SAML") {
+      fetch(config.serverBaseUrl + "/Logout?useSAML=true", {
+        //includes the browser sessionId in the Header for Authentication on the backend server
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-CSRF-Token": localStorage.getItem("CSRF"),
+        },
       })
-      .catch((error) => {
-        console.error(error);
-      });
+        .then((response) => response.text())
+        .then((html) => {
+          const POPUP_HEIGHT = 700;
+          const POPUP_WIDTH = 600;
+          const top =
+            window.outerHeight / 2 + window.screenY - POPUP_HEIGHT / 2;
+          const left = window.outerWidth / 2 + window.screenX - POPUP_WIDTH / 2;
+          const newWindow = window.open(
+            "",
+            "SAML Popup",
+            `height=${POPUP_HEIGHT},width=${POPUP_WIDTH},top=${top},left=${left}`,
+          );
+          newWindow.document.write(html);
+          newWindow.document.close();
+          getUserSessionDetails();
+          window.location.href = config.loginRedirect;
+        })
+        .catch((error) => {
+          console.error(error);
+        });
+    } else {
+      fetch(config.serverBaseUrl + "/Logout", {
+        //includes the browser sessionId in the Header for Authentication on the backend server
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          "X-CSRF-Token": localStorage.getItem("CSRF"),
+        },
+      })
+        .then((response) => response.status)
+        .then(() => {
+          getUserSessionDetails();
+          window.location.href = config.loginRedirect;
+        })
+        .catch((error) => {
+          console.error(error);
+        });
+    }
   };
 
   const changeLanguageReact = (lang) => {

frontend/src/components/Login.js

@@ -166,18 +166,19 @@ function Login(props) {
                   password: "",
                 }}
                 onSubmit={(values) => {
-                  fetch(config.serverBaseUrl + "/LoginPage", {
-                    //includes the browser sessionId in the Header for Authentication on the backend server
-                    credentials: "include",
-                    method: "GET",
-                  })
-                    .then((response) => response.status)
-                    .then(() => {
-                      doLogin(values);
-                    })
-                    .catch((error) => {
-                      console.error(error);
-                    });
+                  doLogin(values);
+                  // fetch(config.serverBaseUrl + "/LoginPage", {
+                  //   //includes the browser sessionId in the Header for Authentication on the backend server
+                  //   credentials: "include",
+                  //   method: "GET",
+                  // })
+                  //   .then((response) => response.status)
+                  //   .then(() => {
+                  //     doLogin(values);
+                  //   })
+                  //   .catch((error) => {
+                  //     console.error(error);
+                  //   });
                 }}
               >
                 {({ isValid, handleChange, handleSubmit }) => (

frontend/src/components/common/PatientHeader.js

@@ -2,7 +2,6 @@ import React from "react";
 import { Grid, Column, Section, Tag } from "@carbon/react";
 import { FormattedMessage } from "react-intl";
 import Avatar from "react-avatar";
-import GeoPattern from "geopattern";
 
 const PatientHeader = (props) => {
   const {
@@ -23,7 +22,6 @@ const PatientHeader = (props) => {
     isOrderPage = false,
     className = "patient-header",
   } = props;
-  const patternUrl = GeoPattern.generate(id).toDataUri();
   return (
     <Grid fullWidth={true}>
       <Column lg={16} md={8} sm={4}>
@@ -49,7 +47,7 @@ const PatientHeader = (props) => {
                         size={referringFacility ? "150" : "120"}
                         textSizeRatio={2}
                         style={{
-                          backgroundImage: `url(${patternUrl})`,
+                          backgroundImage: `url('/images/patient-background.svg')`,
                           backgroundRepeat: "round",
                         }}
                       />
@@ -146,7 +144,7 @@ const PatientHeader = (props) => {
                       size={referringFacility ? "150" : "120"}
                       textSizeRatio={2}
                       style={{
-                        backgroundImage: `url(${patternUrl})`,
+                        backgroundImage: `url('/images/patient-background.svg')`,
                         backgroundRepeat: "round",
                       }}
                     />