HAWKULAR-139 - Fixes to get the basic auth working

hawkular · Apr 17, 2015 · 2c3e9a0 · 2c3e9a0
1 parent 70b5275
commit 2c3e9a0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/distribution/assembly.xml b/distribution/assembly.xml
@@ -57,6 +57,10 @@
     <fileSet>
       <directory>src/main/resources</directory>
       <outputDirectory>/</outputDirectory>
+      <excludes>
+        <!-- We handle this file specially (at the end of this file) -->
+        <exclude>**/hawkular-realm*json</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -109,6 +109,12 @@
                   <outputDir>
                     ${project.build.directory}/unpacked/keycloak-appliance-dist-all-${version.keycloak}/keycloak/standalone/configuration
                   </outputDir>
+                  <parameters>
+                    <parameter>
+                      <name>uuid.hawkular.accounts.backend</name>
+                      <value>${uuid.hawkular.accounts.backend}</value>
+                    </parameter>
+                  </parameters>
                 </transformationSet>
               </transformationSets>
             </configuration>
@@ -150,7 +156,7 @@
                 def uuidBackend = UUID.randomUUID().toString()
                 def uuidUi = UUID.randomUUID().toString()
                 project.properties.setProperty('uuid.hawkular.accounts.backend', uuidBackend.toString())
-                project.properties.setProperty('uuid.hawkular.accounts.ui', uuidUi.toString())
+                project.properties.setProperty('uuid.hawkular.ui', uuidUi.toString())
               </source>
             </configuration>
           </execution>

diff --git a/distribution/src/main/resources/standalone/configuration/hawkular-realm.json b/distribution/src/main/resources/standalone/configuration/hawkular-realm.json
@@ -84,7 +84,7 @@
     {
       "name": "hawkular-accounts-backend",
       "enabled": true,
-      "bearerOnly" : true,
+      "bearerOnly" : false,
       "publicClient": false,
       "secret" : "${uuid.hawkular.accounts.backend}"
     },

diff --git a/distribution/src/main/xslt/standalone.xsl b/distribution/src/main/xslt/standalone.xsl
@@ -22,6 +22,7 @@
                 exclude-result-prefixes="xalan j">
 
   <xsl:param name="config"/>
+  <xsl:param name="uuid.hawkular.accounts.backend"/>
 
   <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
   <xsl:strip-space elements="*"/>
@@ -66,6 +67,8 @@
       <resource>hawkular-accounts-backend</resource>
       <use-resource-role-mappings>true</use-resource-role-mappings>
       <enable-cors>true</enable-cors>
+      <enable-basic-auth>true</enable-basic-auth>
+      <credential name="secret"><xsl:value-of select="$uuid.hawkular.accounts.backend" /></credential>
     </secure-deployment>
   </xsl:template>