keycloak-memoizeit

fix IE problems

5/13/2014 11:33:46 PM

Details

diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
index 6eb7b62..889990f 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
@@ -258,7 +258,7 @@ public class AdminConsole {
     @Path("js/keycloak.js")
     @Produces("text/javascript")
     public Response getKeycloakJs() {
-        logger.info("**** getting console keycloak.js");
+        //logger.info("**** -> getting console keycloak.js" + " uri: " + uriInfo.getRequestUri().toString());
         InputStream inputStream = getClass().getClassLoader().getResourceAsStream("keycloak.js");
         if (inputStream != null) {
             return Response.ok(inputStream).build();
@@ -271,7 +271,15 @@ public class AdminConsole {
     @GET
     @Path("{path:.+}")
     public Response getResource(@PathParam("path") String path) {
+        // todo
+        // I don't know why I need this.  On IE 11, if I don't have this, getKeycloakJs() isn't invoked
+        // I just can't figure out what the difference is between IE11 and FF for console/js/keycloak.js calls
+        if (path.equals("js/keycloak.js")) {
+            return getKeycloakJs();
+        }
+
         try {
+            //logger.info("getting resource: " + path + " uri: " + uriInfo.getRequestUri().toString());
             String themeName = realm.getAdminTheme();
             if (themeName == null || themeName.trim().equals("")) {
                 themeName = Config.getThemeAdmin();
diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java
index c558d66..88b4be3 100755
--- a/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java
+++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java
@@ -92,12 +92,10 @@ public class AdminRoot {
 
     @Path("{realm}/console")
     public AdminConsole getAdminConsole(final @PathParam("realm") String name) {
-        logger.info("*** get console for realm: " + name);
         RealmManager realmManager = new RealmManager(session);
         RealmModel realm = locateRealm(name, realmManager);
         AdminConsole service = new AdminConsole(realm);
         ResteasyProviderFactory.getInstance().injectProperties(service);
-        logger.info("returning AdminConsole");
         return service;
     }