Improve Keycloak plugin's Ajax beforeSend settings

hawtio · Mar 7, 2018 · 1fb0eaa · 1fb0eaa
1 parent dbda093
commit 1fb0eaa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/plugins/keycloak/keycloak.module.ts b/plugins/keycloak/keycloak.module.ts
@@ -32,7 +32,8 @@ namespace HawtioKeycloak {
     }
   }
 
-  function loginUserDetails(userDetails: Core.AuthService, postLogoutTasks: Core.Tasks): void {
+  function loginUserDetails(userDetails: Core.AuthService, keycloakService: KeycloakService,
+    postLogoutTasks: Core.Tasks): void {
     'ngInject';
 
     if (!isKeycloakEnabled()) {
@@ -41,14 +42,7 @@ namespace HawtioKeycloak {
 
     userDetails.login(userProfile.username, null, userProfile.token);
 
-    log.debug("Setting authorization header to token");
-    $.ajaxSetup({
-      beforeSend: (xhr: JQueryXHR, settings: JQueryAjaxSettings) => {
-        if (userDetails.token) {
-          xhr.setRequestHeader('Authorization', 'Bearer ' + userDetails.token);
-        }
-      }
-    });
+    keycloakService.setupJQueryAjax(userDetails);
 
     log.debug("Register 'LogoutKeycloak' to postLogoutTasks");
     postLogoutTasks.addTask('LogoutKeycloak', () => {

diff --git a/plugins/keycloak/keycloak.service.ts b/plugins/keycloak/keycloak.service.ts
@@ -23,6 +23,31 @@ namespace HawtioKeycloak {
         });
     }
 
+    setupJQueryAjax(userDetails: Core.AuthService): void {
+      log.debug("Setting authorization header to token");
+      $.ajaxSetup({
+        beforeSend: (xhr: JQueryXHR, settings: JQueryAjaxSettings) => {
+          if (this.keycloak.authenticated && !this.keycloak.isTokenExpired(TOKEN_UPDATE_INTERVAL)) {
+            // hawtio uses BearerTokenLoginModule on server side
+            xhr.setRequestHeader('Authorization', Core.getBasicAuthHeader(keycloak.subject, keycloak.token));
+          } else {
+            log.debug("Skipped request", settings.url, "for now.");
+            this.updateToken(
+              (token) => {
+                if (token) {
+                  log.debug('Keycloak token refreshed. Set new value to userDetails');
+                  userDetails.token = token;
+                }
+                log.debug("Re-sending request after successfully update keycloak token:", settings.url);
+                $.ajax(settings);
+              },
+              () => userDetails.logout());
+            return false;
+          }
+        }
+      });
+    }
+
   }
 
 }