libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

fix IE problems

Browse source
This commit is contained in:
Bill Burke 2014-05-13 22:33:46 -04:00
parent b30809d681
commit 639b7c5610
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java
View file

@ -258,7 +258,7 @@ public class AdminConsole {
@Path("js/keycloak.js") @Path("js/keycloak.js")
@Produces("text/javascript") @Produces("text/javascript")
public Response getKeycloakJs() { 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"); InputStream inputStream = getClass().getClassLoader().getResourceAsStream("keycloak.js");
if (inputStream != null) { if (inputStream != null) {
return Response.ok(inputStream).build(); return Response.ok(inputStream).build();
@ -271,7 +271,15 @@ public class AdminConsole {
@GET @GET
@Path("{path:.+}") @Path("{path:.+}")
public Response getResource(@PathParam("path") String 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 { try {
//logger.info("getting resource: " + path + " uri: " + uriInfo.getRequestUri().toString());
String themeName = realm.getAdminTheme(); String themeName = realm.getAdminTheme();
if (themeName == null || themeName.trim().equals("")) { if (themeName == null || themeName.trim().equals("")) {
themeName = Config.getThemeAdmin(); themeName = Config.getThemeAdmin();

2
services/src/main/java/org/keycloak/services/resources/admin/AdminRoot.java
View file

@ -92,12 +92,10 @@ public class AdminRoot {
@Path("{realm}/console") @Path("{realm}/console")
public AdminConsole getAdminConsole(final @PathParam("realm") String name) { public AdminConsole getAdminConsole(final @PathParam("realm") String name) {
logger.info("*** get console for realm: " + name);
RealmManager realmManager = new RealmManager(session); RealmManager realmManager = new RealmManager(session);
RealmModel realm = locateRealm(name, realmManager); RealmModel realm = locateRealm(name, realmManager);
AdminConsole service = new AdminConsole(realm); AdminConsole service = new AdminConsole(realm);
ResteasyProviderFactory.getInstance().injectProperties(service); ResteasyProviderFactory.getInstance().injectProperties(service);
logger.info("returning AdminConsole");
return service; return service;
} }