Allow setting custom theme colors

Author: fproske

src/main/java/eu/openanalytics/shinyproxy/ShinyProxySpecProvider.java

@@ -45,6 +45,9 @@
 import eu.openanalytics.shinyproxy.runtimevalues.WebSocketReconnectionModeKey;
 import eu.openanalytics.shinyproxy.runtimevalues.WebsocketReconnectionMode;
 import eu.openanalytics.shinyproxy.ShinyProxySpecProvider.ShinyProxySpec;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -65,6 +68,10 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -112,6 +119,7 @@ public void setSpecs(List<KubernetesSpecExtension> specs) {
 @Primary
 public class ShinyProxySpecProvider implements IProxySpecProvider {
 
+    private final Logger log = LoggerFactory.getLogger(getClass());
     private static final String PROP_DEFAULT_MAX_INSTANCES = "proxy.default-max-instances";
     private static final String PROP_DEFAULT_ALWAYS_SWITCH_INSTANCE = "proxy.default-always-switch-instance";
     private static Environment environment;
@@ -120,6 +128,7 @@ public class ShinyProxySpecProvider implements IProxySpecProvider {
     private List<ProxySpec> specs = new ArrayList<>();
     private List<TemplateGroup> templateGroups = new ArrayList<>();
     private String defaultMaxInstances;
+    private String customThemeColors;
     private Boolean defaultAlwaysSwitchInstance;
 
     private long specsFileTs = 0;
@@ -216,6 +225,17 @@ public void setEnvironment(Environment env) {
 
     @PostConstruct
     public void afterPropertiesSet() {
+        if (miroTheme.equals("custom")) {
+            try {
+                customThemeColors = Files
+                        .readString(Path.of("/home/miroproxy/templates/2col/assets/css/themes/colors_custom.css"),
+                                StandardCharsets.UTF_8)
+                        .replaceAll("\\s+",
+                                "");
+            } catch (IOException e) {
+                log.error("Error reading custom colors CSS file", e);
+            }
+        }
         this.setSpecs();
         this.specs.stream().collect(Collectors.groupingBy(ProxySpec::getId)).forEach((id, duplicateSpecs) -> {
             if (duplicateSpecs.size() > 1)
@@ -231,6 +251,7 @@ public List<ProxySpec> getSpecs() {
         try {
             File specsFile = new File(specsPath);
             if (specsFile.lastModified() > specsFileTs) {
+                log.info("Reloading specs.yaml file as it was modified");
                 specsMap = new HashMap<>();
                 maxInstancesCache = new HashMap<>();
                 Representer representer = new Representer(new DumperOptions());
@@ -251,9 +272,11 @@ public List<ProxySpec> getSpecs() {
                     if (!containerEnv.containsKey("MIRO_LANG")) {
                         containerEnv.put("MIRO_LANG", miroLang);
                     }
-
                     if (!containerEnv.containsKey("MIRO_THEME")) {
                         containerEnv.put("MIRO_THEME", miroTheme);
+                        if (miroTheme.equals("custom")) {
+                            containerEnv.put("MIRO_CUSTOM_THEME_COLORS", customThemeColors);
+                        }
                     }
 
                     if (authentication.equals("none")) {

src/main/java/eu/openanalytics/shinyproxy/controllers/BaseController.java

@@ -140,15 +140,16 @@ protected void prepareMap(ModelMap map, HttpServletRequest request) {
         } else {
             map.put("showNavbar", defaultShowNavbar);
         }
-        
-        map.put("themeCss", "/assets/css/themes/" + environment.getProperty("proxy.theme", "default") + ".css");
+
+        map.put("themeCss", "/assets/css/themes/colors_" + environment.getProperty("proxy.theme", "default") + ".css");
         map.put("bootstrapCss", "/webjars/bootstrap/3.4.1/css/bootstrap.min.css");
         map.put("bootstrapJs", "/webjars/bootstrap/3.4.1/js/bootstrap.min.js");
         map.put("jqueryJs", "/webjars/jquery/3.7.1/jquery.min.js");
         map.put("handlebars", "/webjars/handlebars/4.7.7/handlebars.runtime.min.js");
 
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        boolean isLoggedIn = authentication != null && !(authentication instanceof AnonymousAuthenticationToken) && authentication.isAuthenticated();
+        boolean isLoggedIn = authentication != null && !(authentication instanceof AnonymousAuthenticationToken)
+                && authentication.isAuthenticated();
         map.put("isLoggedIn", isLoggedIn);
         map.put("isAdmin", userService.isAdmin(authentication));
         map.put("isSupportEnabled", isLoggedIn && defaultSupportAddress != null);
@@ -173,8 +174,8 @@ protected void prepareMap(ModelMap map, HttpServletRequest request) {
         }
         map.put("appLogos", appLogos);
 
-
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder
+                .currentRequestAttributes();
         HttpServletRequest httpServletRequest = servletRequestAttributes.getRequest();
         HttpServletResponse httpServletResponse = servletRequestAttributes.getResponse();
         map.put("request", httpServletRequest);
@@ -193,12 +194,12 @@ protected LogoInfo getAppLogoInfo(ProxySpec proxySpec) {
             }
 
             return LogoInfo.builder()
-                .src(src)
-                .width(coalesce(proxySpec.getLogoWidth(), defaultLogoWidth))
-                .height(coalesce(proxySpec.getLogoHeight(), defaultLogoHeight))
-                .style(coalesce(proxySpec.getLogoStyle(), defaultLogoStyle))
-                .classes(coalesce(proxySpec.getLogoClasses(), defaultLogoClasses))
-                .build();
+                    .src(src)
+                    .width(coalesce(proxySpec.getLogoWidth(), defaultLogoWidth))
+                    .height(coalesce(proxySpec.getLogoHeight(), defaultLogoHeight))
+                    .style(coalesce(proxySpec.getLogoStyle(), defaultLogoStyle))
+                    .classes(coalesce(proxySpec.getLogoClasses(), defaultLogoClasses))
+                    .build();
         });
     }
 
@@ -226,7 +227,8 @@ protected String resolveImageURI(String resourceURI) {
     }
 
     /**
-     * Checks whether starting a proxy violates the max instances of this spec and user.
+     * Checks whether starting a proxy violates the max instances of this spec and
+     * user.
      * This corresponds to the `max-instances` property of an app.
      */
     protected boolean validateMaxInstances(ProxySpec spec) {
@@ -236,15 +238,20 @@ protected boolean validateMaxInstances(ProxySpec spec) {
             return true;
         }
 
-        // note: there is a very small change that the user is able to start more instances than allowed, if the user
+        // note: there is a very small change that the user is able to start more
+        // instances than allowed, if the user
         // starts many proxies at once. E.g. in the following scenario:
         // - max proxies = 2
         // - user starts a proxy
-        // - user sends a start proxy request -> this function is called and returns true
-        // - just before this new proxy is added to the list of active proxies, the user sends a new start proxy request
-        // - again this new proxy is allowed, because there is still only one proxy in the list of active proxies
+        // - user sends a start proxy request -> this function is called and returns
+        // true
+        // - just before this new proxy is added to the list of active proxies, the user
+        // sends a new start proxy request
+        // - again this new proxy is allowed, because there is still only one proxy in
+        // the list of active proxies
         // -> the user has three proxies running.
-        // Because of chance that this happens is small and that the consequences are low, we accept this risk.
+        // Because of chance that this happens is small and that the consequences are
+        // low, we accept this risk.
         long currentAmountOfInstances = proxyService.getUserProxiesBySpecId(spec.getId()).count();
 
         return currentAmountOfInstances < maxInstances;