libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

stuff

Browse source
This commit is contained in:
Bill Burke 2014-05-26 12:49:56 -04:00
parent ab2932f75e
commit 1f8b2d4c7b
3 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
services/pom.xml
View file

@ -197,5 +197,30 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<reportSets>
<reportSet>
<configuration>
<doclet>com.lunatech.doclets.jax.jaxrs.JAXRSDoclet</doclet>
<docletArtifacts>
<docletArtifact>
<groupId>com.lunatech.jax-doclets</groupId>
<artifactId>doclets</artifactId>
<version>0.10.0</version>
</docletArtifact>
</docletArtifacts>
</configuration>
<reports>
<report>javadoc</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project> </project>

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

@ -80,7 +80,7 @@ public class AdminRoot {
).build(); ).build();
} }
@Path("index.html") @Path("index.{hack:html}")
@GET @GET
public Response masterRealmAdminConsoleRedirectHtml() { public Response masterRealmAdminConsoleRedirectHtml() {
return masterRealmAdminConsoleRedirect(); return masterRealmAdminConsoleRedirect();

3
services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java
View file

@ -74,7 +74,7 @@ public class RealmsAdminResource {
@GET @GET
@NoCache @NoCache
@Produces("application/json") @Produces("application/json")
public List<RealmRepresentation> getRealms() { public List<RealmRepresentation> getRealms() {
RealmManager realmManager = new RealmManager(session); RealmManager realmManager = new RealmManager(session);
List<RealmRepresentation> reps = new ArrayList<RealmRepresentation>(); List<RealmRepresentation> reps = new ArrayList<RealmRepresentation>();
if (auth.getRealm().equals(realmManager.getKeycloakAdminstrationRealm())) { if (auth.getRealm().equals(realmManager.getKeycloakAdminstrationRealm())) {
@ -90,6 +90,7 @@ public class RealmsAdminResource {
return reps; return reps;
} }
protected void addRealmRep(List<RealmRepresentation> reps, RealmModel realm, ApplicationModel realmManagementApplication) { protected void addRealmRep(List<RealmRepresentation> reps, RealmModel realm, ApplicationModel realmManagementApplication) {
if (auth.hasAppRole(realmManagementApplication, AdminRoles.MANAGE_REALM)) { if (auth.hasAppRole(realmManagementApplication, AdminRoles.MANAGE_REALM)) {
reps.add(ModelToRepresentation.toRepresentation(realm)); reps.add(ModelToRepresentation.toRepresentation(realm));