From 1a56a6a0ac281b71d4a17d36acee76d6e145d728 Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Fri, 17 Oct 2025 16:46:06 -0400 Subject: [PATCH 1/4] Fixed 404 image on print card page by setting default image to openosp logo --- .../ca/openosp/openo/ui/servlet/ImageRenderingServlet.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java index cb3a6242c14..d62f12a4fa5 100644 --- a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java +++ b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java @@ -64,6 +64,8 @@ public static enum Source { local_client, hnr_client, integrator_client, signature_preview, signature_stored, clinic_logo } + private static String DEFAULT_CLINIC_LOGO_FILE = "src/main/resources/loginResource/openosp_logo.png"; + @Override public final void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { try { @@ -325,7 +327,7 @@ private static void renderClinicLogoStored(HttpServletRequest request, HttpServl } try { - String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE"); + String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE", DEFAULT_CLINIC_LOGO_FILE); if (filename != null) { File f = new File(filename); if (f != null && f.exists()) { From c1f6e2f5db942a1817ed2c3ccc195e8910daf454 Mon Sep 17 00:00:00 2001 From: Liam Stanziani <102267755+LiamStanziani@users.noreply.github.com> Date: Sat, 18 Oct 2025 11:01:18 -0400 Subject: [PATCH 2/4] Update src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com> --- .../java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java index d62f12a4fa5..bafdf87dc36 100644 --- a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java +++ b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java @@ -64,7 +64,7 @@ public static enum Source { local_client, hnr_client, integrator_client, signature_preview, signature_stored, clinic_logo } - private static String DEFAULT_CLINIC_LOGO_FILE = "src/main/resources/loginResource/openosp_logo.png"; + private static final String DEFAULT_CLINIC_LOGO_FILE = "src/main/resources/loginResource/openosp_logo.png"; @Override public final void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { From 0686f9b27a2c68aa2a3ddd79698dc0e0342ebb59 Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Mon, 20 Oct 2025 10:07:34 -0400 Subject: [PATCH 3/4] Updated default clinic logo solution to use a more portable solution with .getResource().getPath() through WEB-INF --- .../openo/ui/servlet/ImageRenderingServlet.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java index bafdf87dc36..50f3b67fc6c 100644 --- a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java +++ b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java @@ -44,6 +44,7 @@ import javax.servlet.http.HttpSession; import java.io.*; import java.net.SocketException; +import java.net.URL; /** * This servlet requires a parameter called "source" which should signify where to get the image from. Examples include source=local_client, or source=hnr_client. Depending on the source, you may optionally need more parameters, as examples a local_client @@ -64,8 +65,6 @@ public static enum Source { local_client, hnr_client, integrator_client, signature_preview, signature_stored, clinic_logo } - private static final String DEFAULT_CLINIC_LOGO_FILE = "src/main/resources/loginResource/openosp_logo.png"; - @Override public final void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { try { @@ -317,7 +316,6 @@ private static void renderSignatureStored(HttpServletRequest request, HttpServle } private static void renderClinicLogoStored(HttpServletRequest request, HttpServletResponse response) throws IOException { - // sec check HttpSession session = request.getSession(); Provider provider = (Provider) session.getAttribute(SessionConstants.LOGGED_IN_PROVIDER); @@ -326,8 +324,18 @@ private static void renderClinicLogoStored(HttpServletRequest request, HttpServl return; } + // Get the default logo from the web resources + URL defaultResourceUrl = session.getServletContext() + .getResource("/WEB-INF/classes/loginResource/openosp_logo.png"); + String defaultClinicLogo = (defaultResourceUrl != null) ? defaultResourceUrl.getPath() : null; + try { - String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE", DEFAULT_CLINIC_LOGO_FILE); + // Set the filename from properties or use default logo + String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE", defaultClinicLogo); + if (filename == null || filename.isEmpty()) { + filename = defaultClinicLogo; + } + if (filename != null) { File f = new File(filename); if (f != null && f.exists()) { From 417b6f4bd82925b27d1461024ab7b4f38a26b2e4 Mon Sep 17 00:00:00 2001 From: LiamStanziani Date: Mon, 20 Oct 2025 10:08:45 -0400 Subject: [PATCH 4/4] Quick comment update to improve readability --- .../java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java index 50f3b67fc6c..982c0a2bf54 100644 --- a/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java +++ b/src/main/java/ca/openosp/openo/ui/servlet/ImageRenderingServlet.java @@ -330,7 +330,7 @@ private static void renderClinicLogoStored(HttpServletRequest request, HttpServl String defaultClinicLogo = (defaultResourceUrl != null) ? defaultResourceUrl.getPath() : null; try { - // Set the filename from properties or use default logo + // Set the filename from properties or use the default logo String filename = OscarProperties.getInstance().getProperty("CLINIC_LOGO_FILE", defaultClinicLogo); if (filename == null || filename.isEmpty()) { filename = defaultClinicLogo;