TEST DO NOT MERGE

Author: stevenwinship

doc/release-notes/11448-api-endpoint-for-analytics-html.md

@@ -1,5 +1,5 @@
 ### Feature Request: API endpoint for analytics.html
 
-New API to get the analytics.html from settings for SPA
+New API to get the analytics.html from settings for SPA (Also can be used to get homePage, header, footer, style, and logo)
 
 See also [the guides](https://dataverse-guide--11359.org.readthedocs.build/en/11359/installation/config.html#web-analytics-code), #11448.

doc/sphinx-guides/source/api/native-api.rst

@@ -7707,7 +7707,9 @@ Parameters:
 Customization File Contents
 ---------------------------
 
-The Customization API is used to retrieve the analytics-code.html as well as other customization file contents. See also :ref:`web-analytics-code` in the Configuration section of the Installation Guide.
+The Customization API is used to retrieve the analytics-code.html as well as other customization file contents.
+
+See also :ref:`web-analytics-code` in the Configuration section of the Installation Guide.  :ref:`Branding Your Installation`
 
 The content is returned in type="text/html; charset=UTF-8"
 

src/main/java/edu/harvard/iq/dataverse/CustomizationFilesServlet.java

@@ -14,6 +14,8 @@
 import java.io.PrintWriter;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.logging.Logger;
+
 import jakarta.servlet.ServletException;
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
@@ -22,14 +24,16 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import jakarta.ejb.EJB;
 import org.apache.commons.io.IOUtils;
+import org.apache.tika.Tika;
 
 /**
  *
  * @author skraffmi
  */
 @WebServlet(name = "CustomizationFilesServlet", urlPatterns = {"/CustomizationFilesServlet"})
 public class CustomizationFilesServlet extends HttpServlet {
-    
+    private static final Logger logger = Logger.getLogger(CustomizationFilesServlet.class.getCanonicalName());
+
     @EJB
     SettingsServiceBean settingsService;
 
@@ -45,7 +49,7 @@ public class CustomizationFilesServlet extends HttpServlet {
      */
     protected void processRequest(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        response.setContentType("text/html;charset=UTF-8");               
+        response.setContentType(request.getContentType());
 
         String customFileType = request.getParameter("customFileType");
         String filePath = getFilePath(customFileType);
@@ -56,15 +60,24 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         try {
             File fileIn = physicalPath.toFile();
             if (fileIn != null) {
+                Tika tika = new Tika();
+                try {
+                    String mimeType = tika.detect(fileIn);
+                    response.setContentType(mimeType);
+                } catch (Exception e) {
+                    logger.info("Error getting MIME Type for " + filePath + " : " + e.getMessage());
+                }
                 inputStream = new FileInputStream(fileIn);
 
                 in = new BufferedReader(new InputStreamReader(inputStream));
                 String line;
 
                 StringBuilder responseData = new StringBuilder();
+                String currentDirectory = System.getProperty("user.dir");
                 try (PrintWriter out = response.getWriter()) {
 
                     while ((line = in.readLine()) != null) {
+                        line = line.replace("Copyright 2025 Payara Services Ltd and/or its affiliates.",currentDirectory);
                         responseData.append(line);
                         out.println(line);
                     }

src/main/java/edu/harvard/iq/dataverse/api/Info.java

@@ -1,7 +1,10 @@
 package edu.harvard.iq.dataverse.api;
 
+import java.util.List;
+import java.util.Set;
 import java.util.logging.Logger;
 
+import io.gdcc.xoai.model.oaipmh.results.record.Header;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.client.ClientBuilder;
@@ -136,7 +139,7 @@ public Response getCustomizationFile(@PathParam("customizationFileType") String
         Client client = ClientBuilder.newClient();
         WebTarget endpoint = client.target("http://localhost:8080/CustomizationFilesServlet");
         Response response = endpoint.queryParam("customFileType", customizationFileType)
-                .request(MediaType.TEXT_HTML)
+                .request(MediaType.MEDIA_TYPE_WILDCARD)
                 .get();
 
         if (response.getLength() < 1) {

src/test/java/edu/harvard/iq/dataverse/api/CustomizationIT.java

@@ -1,6 +1,7 @@
 package edu.harvard.iq.dataverse.api;
 
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
+import io.restassured.http.Header;
 import io.restassured.response.Response;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -16,14 +17,17 @@ public void after() {
 
     @Test
     public void testGetCustomAnalytics() {
+        // String setting = "/usr/local/glassfish4/glassfish/domains/domain1/docroot/index.html";
         String setting = "./appserver/glassfish/domains/domain1/docroot/index.html";
         UtilIT.setSetting(SettingsServiceBean.Key.WebAnalyticsCode, setting).prettyPrint();
 
         Response getResponse = UtilIT.getCustomizationFile("analytics");
         getResponse.prettyPrint();
         getResponse.then().assertThat()
                 .statusCode(200)
-                .body(containsString("<!doctype html>"));
+                .body(containsString("<!doctype html>"))
+                .body(containsString("<p class=\"signoff\">/opt/payara</p>"));//TESTING PWD NOT TO BE CHECKED IN
+        assert (getResponse.getHeaders().get("Content-Type").getValue().startsWith("text/html"));
 
         UtilIT.deleteSetting(SettingsServiceBean.Key.WebAnalyticsCode).prettyPrint();
 
@@ -33,4 +37,27 @@ public void testGetCustomAnalytics() {
                 .statusCode(404)
                 .body(containsString("not found"));
     }
+
+    @Test
+    public void testGetCustomLogo() {
+        // String setting = "/usr/local/glassfish4/glassfish/domains/domain1/docroot/img/logo.png";
+        String setting = "./appserver/glassfish/domains/domain1/docroot/img/logo.png";
+        UtilIT.setSetting(SettingsServiceBean.Key.LogoCustomizationFile, setting).prettyPrint();
+
+        Response getResponse = UtilIT.getCustomizationFile("logo");
+        getResponse.prettyPrint();
+        getResponse.then().assertThat()
+                .statusCode(200)
+                .body(containsString("PNG"));
+
+        assert (getResponse.getHeaders().get("Content-Type").getValue().startsWith("image/png"));
+
+        UtilIT.deleteSetting(SettingsServiceBean.Key.LogoCustomizationFile).prettyPrint();
+
+        getResponse = UtilIT.getCustomizationFile("logo");
+        getResponse.prettyPrint();
+        getResponse.then().assertThat()
+                .statusCode(404)
+                .body(containsString("not found"));
+    }
 }