diff --git a/components/java/login-portal/WebContent/WEB-INF/jsp/login.jsp b/components/java/login-portal/WebContent/WEB-INF/jsp/login.jsp
index 5761cc8..7aea186 100644
--- a/components/java/login-portal/WebContent/WEB-INF/jsp/login.jsp
+++ b/components/java/login-portal/WebContent/WEB-INF/jsp/login.jsp
@@ -28,6 +28,9 @@
${info_message}
+
+ <%= appSettings.getAlertMessage() %>
+
diff --git a/components/java/login-portal/build.gradle b/components/java/login-portal/build.gradle
index 1fb914d..edbdfe6 100644
--- a/components/java/login-portal/build.gradle
+++ b/components/java/login-portal/build.gradle
@@ -18,7 +18,7 @@ repositories {
}
checkstyle {
- maxWarnings 4345
+ maxWarnings 4365
}
dependencies {
diff --git a/components/java/login-portal/src/org/sciserver/sso/AppSettings.java b/components/java/login-portal/src/org/sciserver/sso/AppSettings.java
index 0799247..386ac17 100644
--- a/components/java/login-portal/src/org/sciserver/sso/AppSettings.java
+++ b/components/java/login-portal/src/org/sciserver/sso/AppSettings.java
@@ -52,6 +52,8 @@ public class AppSettings {
private final boolean keycloakEnabled;
+ private final String alertMessage;
+ private final boolean isAlertMessage;
private final String disclaimerInfo;
private final boolean displaySciserverLogin;
private final String keycloakLoginButtonText;
@@ -121,6 +123,8 @@ public AppSettings(Properties properties) {
sciserverVersion = properties.getProperty("sciserver.version");
+ alertMessage = properties.getProperty("alertMessage", "");
+ isAlertMessage = alertMessage != null && alertMessage.length() > 0;
disclaimerInfo = properties.getProperty("disclaimerInfo");
isDisclaimerInfo = disclaimerInfo.length() > 0 ? true : false;
displaySciserverLogin = Boolean.parseBoolean(properties.getProperty("displaySciserverLogin"));
@@ -286,6 +290,14 @@ public boolean isKeycloakEnabled() {
return keycloakEnabled;
}
+ public String getAlertMessage() {
+ return alertMessage;
+ }
+
+ public boolean showAlertMessage() {
+ return isAlertMessage;
+ }
+
public String getDisclaimerInfo() {
return disclaimerInfo;
}
diff --git a/helm/sciserver/files/login-portal-application.properties b/helm/sciserver/files/login-portal-application.properties
index 971701e..647f539 100644
--- a/helm/sciserver/files/login-portal-application.properties
+++ b/helm/sciserver/files/login-portal-application.properties
@@ -51,6 +51,7 @@ validation_code.secret_key ={{ required "A secret key is required for the login
sciserver.version={{ .Chart.AppVersion }}
+alertMessage={{ .Values.loginPortal.alertMessage }}
disclaimerInfo={{ .Values.loginPortal.disclaimerInfo }}
displaySciserverLogin={{ .Values.loginPortal.displaySciserverLogin }}
keycloakLoginButtonText={{ .Values.loginPortal.keycloakLoginButtonText }}
diff --git a/helm/sciserver/values.yaml b/helm/sciserver/values.yaml
index 9da4e11..d9006bd 100644
--- a/helm/sciserver/values.yaml
+++ b/helm/sciserver/values.yaml
@@ -101,6 +101,7 @@ loginPortal:
# when validationEnabled is true. One way to create:
# dd if=/dev/urandom bs=1 count=32 2>/dev/null | base64
secretKey: "KQB7Lb7ACGHjHh8ikzjqb0GyeElfQpb1q/pUtFW1NFs="
+ alertMessage:
disclaimerInfo:
displaySciserverLogin: true
keycloakLoginButtonText: "Sign in with Globus"