HAWKULAR-119 - Replaced custom KC integration with hawtio's

hawkular · Apr 8, 2015 · d78540b · d78540b
1 parent 41e52a4
commit d78540b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 257 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ pids
 libs/
 node_modules/
 bower_components/
+*.js.map
 
 ._*
 .DS_Store

diff --git a/bower.json b/bower.json
@@ -36,10 +36,10 @@
     "hawtio-core": "2.0.11",
     "hawtio-template-cache": "2.0.2",
     "hawtio-utilities": "2.0.21",
+    "hawtio-oauth": "2.0.0",
     "lodash": "3.2.0",
     "moment": "2.9.0",
     "toastr": "2.1.1",
-    "keycloak": "1.1.0",
     "angular-resource": "1.3.15",
     "patternfly": "1.1.3"
   },

diff --git a/dist/hawkular-ui-components-accounts.js b/dist/hawkular-ui-components-accounts.js
diff --git a/plugins/accounts/index.html b/plugins/accounts/index.html
@@ -6,7 +6,6 @@
     <base href='/'>
     <meta charset="UTF8">
 
-    <link rel="stylesheet" href="libs/bootstrap/dist/css/bootstrap.css" />
     <link rel="stylesheet" href="libs/patternfly/dist/css/patternfly.css" />
 
     <!-- bower:css -->
@@ -21,7 +20,6 @@
     <!-- bower:js -->
     <!-- endbower -->
 
-    <script src="libs/bootstrap/dist/js/bootstrap.js"></script>
     <script src="libs/patternfly/dist/js/patternfly.js"></script>
 
 </head>
@@ -38,24 +36,5 @@
 
 <!-- add any scripts under dist/ here -->
 <script src="dist/hawkular-ui-components-accounts.js"></script>
-
-<script type="text/javascript">
-  window.keycloakReady = false;
-  window.keycloak = Keycloak("/keycloak.json");
-
-  window.keycloak.onAuthLogout = function() {
-    location.reload();
-  };
-
-  window.keycloak.onReady = function(authenticated) {
-    window.keycloakReady = true;
-  };
-
-  window.keycloak.init({ onLoad: 'login-required' }).error(function () {
-    alert("Couldn't log you in. Sorry.");
-    window.location.reload();
-  });
-</script>
-
 </body>
 </html>
diff --git a/plugins/accounts/plugins/accounts/ts/accountsPlugin.ts b/plugins/accounts/plugins/accounts/ts/accountsPlugin.ts
@@ -37,5 +37,15 @@ module HawkularAccounts {
         //HawtioNav.add(accountsTab);
     }]);
 
+    _module.run(['$rootScope', 'userDetails', ($rootScope, userDetails) => {
+        $rootScope.userDetails = userDetails;
+        $rootScope.userDetailsStr = angular.toJson(userDetails, true);
+    }]);
+
+    hawtioPluginLoader.registerPreBootstrapTask((next) => {
+        KeycloakConfig = "/keycloak.json";
+        next();
+    }, true);
+
     hawtioPluginLoader.addModule(HawkularAccounts.pluginName);
 }
diff --git a/plugins/accounts/plugins/accounts/ts/auth.ts b/plugins/accounts/plugins/accounts/ts/auth.ts
diff --git a/plugins/accounts/plugins/accounts/ts/authInterceptor.ts b/plugins/accounts/plugins/accounts/ts/authInterceptor.ts
diff --git a/plugins/accounts/plugins/includes.ts b/plugins/accounts/plugins/includes.ts
@@ -14,3 +14,4 @@
 /// limitations under the License.
 
 /// <reference path="../../../libs/hawtio-utilities/defs.d.ts"/>
+/// <reference path="../../../libs/hawtio-oauth/defs.d.ts"/>