Add keycloak config to other web.xml files to have it available in ha…

…wtio-default.war
hawtio · Feb 3, 2015 · 139b505 · 139b505
1 parent 2bb7ef2
commit 139b505
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 1 deletion.
diff --git a/hawtio-base/src/main/webapp/WEB-INF/web.xml b/hawtio-base/src/main/webapp/WEB-INF/web.xml
@@ -36,6 +36,20 @@
     <env-entry-value>*</env-entry-value>
   </env-entry>
 
+  <env-entry>
+    <description>Enable/disable Keycloak integration. Value is really a boolean</description>
+    <env-entry-name>hawtio/keycloakEnabled</env-entry-name>
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>false</env-entry-value>
+  </env-entry>
+
+  <env-entry>
+    <description>Keycloak config file used for frontend. Will use default location if not provided</description>
+    <env-entry-name>hawtio/keycloakClientConfig</env-entry-name>
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value></env-entry-value>
+  </env-entry>
+
   <env-entry>
     <description>Path to store file uploads, defaults to ${java.io.tmpdir}/uploads if blank</description>
     <env-entry-name>hawtio/uploadDirectory</env-entry-name>
@@ -180,6 +194,15 @@
     <url-pattern>/auth/logout/*</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>keycloak</servlet-name>
+    <servlet-class>io.hawt.web.keycloak.KeycloakServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>keycloak</servlet-name>
+    <url-pattern>/keycloak/*</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>plugin</servlet-name>
     <servlet-class>io.hawt.web.PluginServlet</servlet-class>

diff --git a/hawtio-jboss/src/main/webapp/WEB-INF/web.xml b/hawtio-jboss/src/main/webapp/WEB-INF/web.xml
@@ -36,6 +36,20 @@
     <env-entry-value>${hawtio.realm:*}</env-entry-value>
   </env-entry>
 
+  <env-entry>
+    <description>Enable/disable Keycloak integration. Value is really a boolean</description>
+    <env-entry-name>hawtio/keycloakEnabled</env-entry-name>
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>${hawtio.keycloakEnabled:false}</env-entry-value>
+  </env-entry>
+
+  <env-entry>
+    <description>Keycloak config file used for frontend. Will use default location if not provided</description>
+    <env-entry-name>hawtio/keycloakClientConfig</env-entry-name>
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>${hawtio.keycloakClientConfig:}</env-entry-value>
+  </env-entry>
+
   <env-entry>
     <description>Path to store file uploads, defaults to ${java.io.tmpdir}/uploads if blank</description>
     <env-entry-name>hawtio/uploadDirectory</env-entry-name>
@@ -180,6 +194,15 @@
     <url-pattern>/auth/logout/*</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>keycloak</servlet-name>
+    <servlet-class>io.hawt.web.keycloak.KeycloakServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>keycloak</servlet-name>
+    <url-pattern>/keycloak/*</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>plugin</servlet-name>
     <servlet-class>io.hawt.web.PluginServlet</servlet-class>

diff --git a/hawtio-web/src/main/webapp/app/core/js/keycloakLogin.ts b/hawtio-web/src/main/webapp/app/core/js/keycloakLogin.ts
@@ -16,7 +16,7 @@ module Core {
       type: "GET",
       success: function (response) {
         log.debug("Got response for check if keycloak is enabled: ", response);
-        var keycloakEnabled: boolean = response;
+        var keycloakEnabled: boolean = (response === true || response === "true");
 
         var keycloakContext: KeycloakContext = createKeycloakContext(keycloakEnabled);
         callback(keycloakContext);