diff options
Diffstat (limited to 'src/main/java/de/bwlehrpool/bwlp_guac')
-rw-r--r-- | src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java | 8 | ||||
-rw-r--r-- | src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java | 23 |
2 files changed, 24 insertions, 7 deletions
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java index 65258f7..4830d02 100644 --- a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java +++ b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java @@ -8,10 +8,10 @@ import javax.ws.rs.core.MediaType; public class BwlpREST { @GET - @Path("logoUrl") - @Produces(MediaType.TEXT_PLAIN) - public String getLogoUrl() { - return SlxConfig.logoUrl(); + @Path("logoConfig") + @Produces(MediaType.APPLICATION_JSON) + public String getLogoConfig() { + return "{ \"url\": \"" + SlxConfig.logoUrl() + "\", \"primary\": " + SlxConfig.logoPrimary() + " }"; } }
\ No newline at end of file diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java b/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java index f93c965..1fadac0 100644 --- a/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java +++ b/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java @@ -27,6 +27,13 @@ public class SlxConfig { } }; + private static final StringGuacamoleProperty LOGO_PRIMARY = new StringGuacamoleProperty() { + @Override + public String getName() { + return "slx-logo-primary"; + } + }; + static { Environment e; try { @@ -49,10 +56,20 @@ public class SlxConfig { public static String logoUrl() { try { - return ENVIRONMENT.getProperty(LOGO_URL); + String url = ENVIRONMENT.getProperty(LOGO_URL); + if (url == null) return ""; + return url; } catch (GuacamoleException e) { - LOGGER.warn("Cannot get logo url from properties", e); - return null; + return ""; + } + } + + public static boolean logoPrimary() { + try { + String primary = ENVIRONMENT.getProperty(LOGO_PRIMARY); + return primary != null && primary.equals("true"); + } catch (GuacamoleException e) { + return false; } } |