HAWKULAR-872 HAWKULAR-877 - Enabled Secret Store and changed token en…

…dpoint
hawkular · Dec 18, 2015 · e7d64a1 · e7d64a1
1 parent b302901
commit e7d64a1
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 9 deletions.
diff --git a/console/src/main/scripts/bower.json b/console/src/main/scripts/bower.json
@@ -25,7 +25,7 @@
     "ngInfiniteScroll": "1.2.1",
     "bootstrap-select": "1.6",
     "hawkular-charts": "0.6.13",
-    "hawkular-ui-services": "hawkular/hawkular-ui-services#a72948c0ede3b1f63bce73adfd5fa1595ee349f7",
+    "hawkular-ui-services": "0.8.18",
     "hawtio-core-navigation": "2.0.51",
     "hawtio-core": "2.0.18",
     "hawtio-template-cache": "2.0.4",

diff --git a/console/src/main/scripts/plugins/accounts/ts/tokens.ts b/console/src/main/scripts/plugins/accounts/ts/tokens.ts
@@ -66,7 +66,7 @@ module HawkularAccounts {
     }
 
     public create():void {
-      this.$window.location.href = '/hawkular/secret-store/v1/tokens/create?'
+      this.$window.location.href = '/secret-store/v1/tokens/create?'
         + 'Hawkular-Persona=' + encodeURI(this.$rootScope.currentPersona.id);
     }
 

diff --git a/dist/assembly.xml b/dist/assembly.xml
@@ -122,7 +122,7 @@
         <include>org.hawkular.metrics:hawkular-metrics-component</include>
         <include>org.hawkular.commons:hawkular-commons-embedded-cassandra-ear</include>
         <include>org.hawkular.accounts:hawkular-accounts-events-backend:war</include>
-        <include>org.hawkular.accounts:hawkular-accounts-secret-store:war</include>
+        <include>org.keycloak.secretstore:secret-store:war</include>
       </includes>
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <unpack>false</unpack>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -132,8 +132,8 @@
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.hawkular.accounts</groupId>
-      <artifactId>hawkular-accounts-secret-store</artifactId>
+      <groupId>org.keycloak.secretstore</groupId>
+      <artifactId>secret-store</artifactId>
       <type>war</type>
     </dependency>
 

diff --git a/dist/src/main/resources/wildfly/patches/standalone.xsl b/dist/src/main/resources/wildfly/patches/standalone.xsl
@@ -329,7 +329,7 @@
             <xsl:value-of select="$uuid.hawkular.accounts.backend"/>
           </credential>
         </secure-deployment>
-        <secure-deployment name="hawkular-accounts-secret-store.war">
+        <secure-deployment name="secret-store.war">
           <realm>hawkular</realm>
           <resource>hawkular-accounts-backend</resource>
           <use-resource-role-mappings>true</use-resource-role-mappings>

diff --git a/modules/hawkular-wildfly-agent-download/pom.xml b/modules/hawkular-wildfly-agent-download/pom.xml
@@ -44,6 +44,11 @@
       <artifactId>hawkular-accounts-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.keycloak.secretstore</groupId>
+      <artifactId>secret-store-undertow-filter</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.jboss.spec.javax.annotation</groupId>
       <artifactId>jboss-annotations-api_1.2_spec</artifactId>

diff --git a/modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/web.xml b/modules/hawkular-wildfly-agent-download/src/main/webapp/WEB-INF/web.xml
@@ -22,6 +22,11 @@
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
          version="3.1">
 
+  <context-param>
+    <param-name>org.keycloak.secretstore.enabled</param-name>
+    <param-value>true</param-value>
+  </context-param>
+
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Installer download endpoint</web-resource-name>

diff --git a/pom.xml b/pom.xml
@@ -93,6 +93,7 @@
     <version.org.hawkular.metrics>0.10.0.Final</version.org.hawkular.metrics>
     <version.org.hawkular.inventory>0.10.1.Final</version.org.hawkular.inventory>
     <version.org.keycloak>1.6.1.Final</version.org.keycloak>
+    <version.org.keycloak.secretstore>1.0.4.Final</version.org.keycloak.secretstore>
     <version.org.testng>6.5.2</version.org.testng>
   </properties>
 
@@ -114,12 +115,18 @@
       </dependency>
 
       <dependency>
-        <groupId>org.hawkular.accounts</groupId>
-        <artifactId>hawkular-accounts-secret-store</artifactId>
-        <version>${version.org.hawkular.accounts}</version>
+        <groupId>org.keycloak.secretstore</groupId>
+        <artifactId>secret-store</artifactId>
+        <version>${version.org.keycloak.secretstore}</version>
         <type>war</type>
       </dependency>
 
+      <dependency>
+        <groupId>org.keycloak.secretstore</groupId>
+        <artifactId>secret-store-undertow-filter</artifactId>
+        <version>${version.org.keycloak.secretstore}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.hawkular.accounts</groupId>
         <artifactId>hawkular-accounts-api</artifactId>