Merge pull request #1275 from CalebSLane/develop

Ozone Features (initializer + SAML SSO role's)
I-TECH-UW · Oct 11, 2024 · 4f13546 · 4f13546
2 parents 2cf3d05 + 90569b2
commit 4f13546
Show file tree

Hide file tree

Showing 147 changed files with 2,616 additions and 2,603 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,4 +39,3 @@ jobs:
 
       - name: Build OpenELIS-Global2
         run: mvn clean install -Dspotless.check.skip=true
-
diff --git a/.github/workflows/frontend-qa.yml b/.github/workflows/frontend-qa.yml
@@ -8,9 +8,8 @@ on:
 
 env:
   DOCKER_NAME: ${{ vars.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}-frontend
-
-jobs:
 
+jobs:
   build-prod-frontend-image:
     runs-on: ubuntu-latest
     permissions:
@@ -38,8 +37,7 @@ jobs:
         with:
           context: ./frontend
           file: ./frontend/Dockerfile.prod
-          push: false    
-
+          push: false
 
   build-and-run-qa-tests:
     runs-on: ubuntu-latest
@@ -50,12 +48,8 @@ jobs:
           repository: ${{github.repository}}
           submodules: recursive
 
-      - name: Run OpenELS image
-        run: docker compose -f build.docker-compose.yml up -d
-
-      - name: Sleep for 2 minutes
-        run: sleep 2m
-        shell: bash
+      - name: Run OpenELIS image
+        run: docker compose -f build.docker-compose.yml up -d  --build --wait --wait-timeout 600
 
       - name: Set up Node.js
         uses: actions/setup-node@v3
@@ -73,3 +67,10 @@ jobs:
       - name: Run Frontend Qa Workflow
         run: npx cypress run –headless
         working-directory: frontend
+
+      - name: Dump docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2
+        with:
+          # Only show last 100 lines of each
+          tail: "100"
diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml
@@ -138,13 +138,12 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache-test
-          # cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache-test,mode=max
+          # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache,mode=max
           build-args: SKIP_SPOTLESS=true
 
   build-and-push-test-image-frontend:
@@ -186,25 +185,21 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache-test
-          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache-test,mode=max
+          # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max
 
   run-e2e-qa:
     needs:
       [build-and-push-test-image-backend, build-and-push-test-image-frontend]
     runs-on: ubuntu-latest
     steps:
-      - name: Sleep for 2 minutes
-        run: sleep 2m
-        shell: bash
-
       - name: Checkout OpenELIS-Global2
         uses: actions/checkout@v4
         with:
           repository: ${{github.repository}}
 
-      - name: Run OpenELS image
-        run: docker compose -f test.docker-compose.yml up -d
+      - name: Run OpenELIS image
+        run: docker compose -f test.docker-compose.yml up -d --build --wait --wait-timeout 300
 
       - name: Cypress run
         uses: cypress-io/github-action@v6
@@ -214,6 +209,13 @@ jobs:
           CYPRESS_STARTUP_WAIT_MILLISECONDS: 300000
           CYPRESS_VIDEO: false
 
+      - name: Dump docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v2
+        with:
+          # Only show last 100 lines of each
+          tail: "100"
+
   build-and-push-image-backend:
     needs: [run-e2e-qa]
     runs-on: ubuntu-latest
@@ -251,13 +253,12 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
-          platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          # cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache-prod
-          # cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache-prod,mode=max
+          cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}:buildcache,mode=max
           build-args: SKIP_SPOTLESS=true
 
   build-and-push-image-frontend:
@@ -300,5 +301,5 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache-prod
-          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache-prod,mode=max
+          cache-from: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache
+          cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max
diff --git a/Dockerfile b/Dockerfile
@@ -91,7 +91,12 @@ RUN groupadd tomcat; \
     chmod g-w,o-rwx $CATALINA_HOME/conf/logging.properties; \
     chmod g-w,o-rwx $CATALINA_HOME/conf/server.xml; \
     chmod g-w,o-rwx $CATALINA_HOME/conf/tomcat-users.xml; \
-    chmod g-w,o-rwx $CATALINA_HOME/conf/web.xml
+    chmod g-w,o-rwx $CATALINA_HOME/conf/web.xml; \
+    mkdir -p /var/lib/openelis-global/logs/; \
+    chown -R tomcat_admin:tomcat /var/lib/openelis-global/logs/;\
+    mkdir -p /var/lib/openelis-global/properties/; \
+    chown -R tomcat_admin:tomcat /var/lib/openelis-global/properties/;
+
 
 COPY install/openelis_healthcheck.sh /healthcheck.sh
 RUN chown tomcat_admin:tomcat /healthcheck.sh; \

diff --git a/build.docker-compose.yml b/build.docker-compose.yml
@@ -50,7 +50,6 @@ services:
     networks:
       default:
         ipv4_address: 172.20.1.121
-
     environment:
       - DEFAULT_PW=adminADMIN!
       - TZ=Africa/Nairobi
@@ -64,10 +63,18 @@ services:
     secrets:
       - source: datasource.password
       - source: common.properties
+    healthcheck:
+      test: ["CMD", "/healthcheck.sh"]
+      timeout: 10s
+      interval: 30s
+      retries: 3
+      start_period: 2m
 
   fhir.openelis.org:
     container_name: external-fhir-api
-    image: hapiproject/hapi:v6.6.0-tomcat
+    build:
+      context: ./fhir
+      dockerfile: ./Dockerfile
     depends_on:
       - database
       - certs
@@ -110,8 +117,11 @@ services:
       - CHOKIDAR_USEPOLLING=true
     tty: true
 
+
   proxy:
-    image: nginx:1.15-alpine
+    build:
+      context: ./nginx-proxy
+      dockerfile: ./Dockerfile
     container_name: openelisglobal-proxy
     ports:
       - 80:80

diff --git a/frontend/src/components/Login.js b/frontend/src/components/Login.js
@@ -3,6 +3,7 @@ import config from "../config.json";
 import "./Style.css";
 import qs from "qs";
 import { FormattedMessage, injectIntl } from "react-intl";
+import { HardwareSecurityModule } from "@carbon/icons-react";
 import {
   Form,
   Section,
@@ -30,7 +31,7 @@ function Login(props) {
   const firstInput = createRef();
 
   useEffect(() => {
-    firstInput.current.focus();
+    firstInput?.current?.focus();
 
     const interval = setInterval(() => {
       checkLogin();
@@ -129,6 +130,26 @@ function Login(props) {
       });
   };
 
+  const renderOauthButtons = () => {
+    return (
+      <span id="oauth-buttons">
+        {configurationProperties?.oauthUrls?.map((url) => (
+          <Button
+            key={url.key}
+            type="button"
+            renderIcon={HardwareSecurityModule}
+            onClick={() => {
+              console.log(url);
+              window.location.href = config.serverBaseUrl + "/" + url.value;
+            }}
+          >
+            <FormattedMessage id="label.button.login.sso" />
+          </Button>
+        ))}
+      </span>
+    );
+  };
+
   return (
     <>
       <div className="loginPageContent">
@@ -167,45 +188,50 @@ function Login(props) {
                           <FormattedMessage id="login.title" />
                         </Heading>
                       </FormLabel>
-                      <TextInput
-                        id="loginName"
-                        invalidText={props.intl.formatMessage({
-                          id: "login.msg.username.missing",
-                        })}
-                        labelText={props.intl.formatMessage({
-                          id: "login.msg.username",
-                        })}
-                        hideLabel={true}
-                        placeholder={props.intl.formatMessage({
-                          id: "login.msg.username",
-                        })}
-                        autoComplete="off"
-                        ref={firstInput}
-                      />
-                      <TextInput.PasswordInput
-                        id="password"
-                        invalidText={props.intl.formatMessage({
-                          id: "login.msg.password.missing",
-                        })}
-                        labelText={props.intl.formatMessage({
-                          id: "login.msg.password",
-                        })}
-                        hideLabel={true}
-                        placeholder={props.intl.formatMessage({
-                          id: "login.msg.password",
-                        })}
-                      />
-                      <Button type="submit" disabled={!isValid}>
-                        <FormattedMessage id="label.button.submit" />
-                        <Loading
-                          small={true}
-                          withOverlay={false}
-                          className={submitting ? "show" : "hidden"}
-                        />
-                      </Button>
+                      {configurationProperties?.useFormLogin == "true" && (
+                        <>
+                          <TextInput
+                            id="loginName"
+                            invalidText={props.intl.formatMessage({
+                              id: "login.msg.username.missing",
+                            })}
+                            labelText={props.intl.formatMessage({
+                              id: "login.msg.username",
+                            })}
+                            hideLabel={true}
+                            placeholder={props.intl.formatMessage({
+                              id: "login.msg.username",
+                            })}
+                            autoComplete="off"
+                            ref={firstInput}
+                          />
+                          <TextInput.PasswordInput
+                            id="password"
+                            invalidText={props.intl.formatMessage({
+                              id: "login.msg.password.missing",
+                            })}
+                            labelText={props.intl.formatMessage({
+                              id: "login.msg.password",
+                            })}
+                            hideLabel={true}
+                            placeholder={props.intl.formatMessage({
+                              id: "login.msg.password",
+                            })}
+                          />
+                          <Button type="submit" disabled={!isValid}>
+                            <FormattedMessage id="label.button.login" />
+                            <Loading
+                              small={true}
+                              withOverlay={false}
+                              className={submitting ? "show" : "hidden"}
+                            />
+                          </Button>
+                        </>
+                      )}
                       {configurationProperties?.useSaml == "true" && (
                         <Button
                           type="button"
+                          renderIcon={HardwareSecurityModule}
                           onClick={() => {
                             const POPUP_HEIGHT = 700;
                             const POPUP_WIDTH = 600;
@@ -227,6 +253,8 @@ function Login(props) {
                           <FormattedMessage id="label.button.login.sso" />
                         </Button>
                       )}
+                      {configurationProperties?.useOauth == "true" &&
+                        renderOauthButtons()}
                     </Stack>
                   </Form>
                 )}

diff --git a/frontend/src/languages/en.json b/frontend/src/languages/en.json
@@ -585,7 +585,8 @@
   "notification.login.generic.error": "Error while attempting login",
   "notification.login.syntax.error": "Error while attempting login - Could not parse response to JSON",
   "notification.response.syntax.error": "Error - Could not parse response to JSON",
-  "label.button.login.sso": "SSO Login",
+  "label.button.login.sso": "Single Sign On",
+  "label.button.login": "Login",
   "menu.billing.title": "Billing Menu Management",
   "menu.billing.address": "Billing URL",
   "menu.billing.active": "Billing Menu Active",

diff --git a/frontend/src/languages/fr.json b/frontend/src/languages/fr.json
@@ -567,6 +567,8 @@
   "labNumber.format.new": "Nouveau format",
   "labNumber.format.current": "Format actuel",
   "validation.label.nonconform": "= L'échantillon ou la commande est non conforme ou le test a été rejeté",
+  "label.button.login.sso": "L'authentification unique",
+  "label.button.login": "Se Connector",
   "menu.billing.title": "Gestion du menu de facturation",
   "menu.billing.address": "Adresse de facturation",
   "menu.billing.active": "Menu de facturation Actif",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,4 +39,3 @@ jobs:

		- name: Build OpenELIS-Global2
		run: mvn clean install -Dspotless.check.skip=true