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

Merge pull request #336 from patriot1burke/master

Browse source 
workarounds for resteasy 2.3.7 bugs
This commit is contained in:
Bill Burke 2014-04-10 22:34:19 -04:00
commit 51a718f337
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
forms/login-freemarker/src/main/java/org/keycloak/login/freemarker/FreeMarkerLoginForms.java
View file

@ -155,7 +155,10 @@ public class FreeMarkerLoginForms implements LoginForms {
if (message != null) {
attributes.put("message", new MessageBean(messages.containsKey(message) ? messages.getProperty(message) : message, messageType));
}
if (page == LoginFormsPages.OAUTH_GRANT) {
// for some reason Resteasy 2.3.7 doesn't like query params and form params with the same name and will null out the code form param
uriBuilder.replaceQuery(null);
}
URI baseUri = uriBuilder.build();
if (realm != null) {

2
server/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
View file

@ -3,6 +3,8 @@
<dependencies>
<module name="org.apache.httpcomponents"/>
<module name="org.bouncycastle"/>
<module name="org.codehaus.jackson.jackson-core-asl"/>
<module name="org.codehaus.jackson.jackson-mapper-asl"/>
</dependencies>
<exclusions>

1
services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
View file

@ -169,6 +169,7 @@ public class UsersResource {
for (ApplicationModel applicationModel : realm.getApplications()) {
if (applicationModel.getManagementUrl() == null) continue;
UserStats appStats = new ResourceAdminManager().getUserStats(realm, applicationModel, user);
if (appStats == null) continue;
if (appStats.isLoggedIn()) stats.put(applicationModel.getName(), appStats);
}
return stats;