8000 fix for service account role management in admin v2 by edewit · Pull Request #48166 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

fix for service account role management in admin v2 #48166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edewit merged 12 commits into from
May 21, 2026
Merged

fix for service account role management in admin v2 #48166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e29cafd
fix for service account role management in admin v2
edewit Apr 16, 2026
fcbac42
fixed merge error
edewit Apr 27, 2026
00346d2
fix test
edewit Apr 28, 2026
577037f
fixed build error
edewit May 11, 2026
eedfb8e
fixed tests
edewit May 11, 2026
8e31feb
Remove unused RealmAdminResource from DefaultClientsApi and DefaultAd…
Pepo48 May 14, 2026
2ff50a4
Update rest/admin-v2/services/src/main/java/org/keycloak/services/cli…
edewit May 18, 2026
ef73539
also update the context
edewit May 18, 2026
86db6bd
fix merge error
edewit May 20, 2026
ae432a2
revert change
edewit May 20, 2026
5a75bfc
Update rest/admin-v2/services/src/main/java/org/keycloak/rest/admin/a…
edewit May 20, 2026
2a1df24
Update rest/admin-v2/services/src/main/java/org/keycloak/rest/admin/a…
edewit May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions quarkus/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-quarkus-server</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-core-deployment</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions rest/admin-v2/api/src/main/java/org/keycloak/admin/api/client/ClientApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.io.InputStream;

import jakarta.validation.Valid;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.DELETE;
import jakarta.ws.rs.GET;
Expand Down Expand Up @@ -42,7 +41,7 @@ public interface ClientApi {
@APIResponse(responseCode = "200", content = @Content(schema = @Schema(implementation = BaseClientRepresentation.class))),
@APIResponse(responseCode = "201", description = "Created", content = @Content(schema = @Schema(implementation = BaseClientRepresentation.class)))
})
Response createOrUpdateClient(@Valid BaseClientRepresentation client);
Response createOrUpdateClient(BaseClientRepresentation client);

@PATCH
@Consumes(PatchTypeNames.JSON_MERGE)
Expand Down
19 changes: 8 additions & 11 deletions rest/admin-v2/services/src/main/java/org/keycloak/rest/admin/api/DefaultAdminApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
package org.keycloak.rest.admin.api;

import jakarta.ws.rs.NotFoundException;

import org.keycloak.admin.api.AdminApi;
import org.keycloak.admin.api.client.ClientsApi;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
import org.keycloak.protocol.oidc.TokenManager;
import org.keycloak.rest.admin.api.client.DefaultClientsApi;
import org.keycloak.services.resources.admin.AdminRoot;
import org.keycloak.services.resources.admin.RealmAdminResource;
import org.keycloak.services.resources.admin.RealmsAdminResource;
import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator;
import org.keycloak.services.resources.admin.fgap.AdminPermissions;

Expand All @@ -17,20 +16,18 @@ public class DefaultAdminApi implements AdminApi {
private final RealmModel realm;
private final AdminPermissionEvaluator permissions;

// v1 resources
private final RealmAdminResource realmAdminResource;

public DefaultAdminApi(KeycloakSession session, String realmName) {
this.session = session;
var authInfo = AdminRoot.authenticateRealmAdminRequest(session);
this.permissions = AdminPermissions.evaluator(session, authInfo.getRealm(), authInfo);
this.realm = session.realms().getRealmByName(realmName);
// remove v1 resource once we are not attached to API v1
this.realmAdminResource = new RealmsAdminResource(session, authInfo, new TokenManager()).getRealmAdmin(realmName);
RealmModel realm = session.realms().getRealmByName(realmName);
Comment thread
edewit marked this conversation as resolved.
Resolved
if (realm == null) throw new NotFoundException("Realm not found.");
session.getContext().setRealm(realm);
this.realm = realm;
this.permissions = AdminPermissions.evaluator(session, realm, authInfo);
}

@Override
public ClientsApi clientsV2() {
return new DefaultClientsApi(session, realm, permissions, realmAdminResource);
return new DefaultClientsApi(session, realm, permissions);
}
}
7 changes: 2 additions & 5 deletions .../admin-v2/services/src/main/java/org/keycloak/rest/admin/api/client/DefaultClientApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.keycloak.services.ServiceException;
import org.keycloak.services.client.ClientService;
import org.keycloak.services.client.DefaultClientService;
import org.keycloak.services.resources.admin.RealmAdminResource;
import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator;


Expand All @@ -34,14 +33,12 @@ public class DefaultClientApi implements ClientApi {
public DefaultClientApi(@Nonnull KeycloakSession session,
@Nonnull RealmModel realm,
@Nonnull String clientId,
@Nonnull AdminPermissionEvaluator permissions,
// remove v1 resource once we are not attached to API v1
@Nonnull RealmAdminResource realmAdminResource) {
@Nonnull AdminPermissionEvaluator permissions) {
this.session = session;
this.clientId = clientId;
this.realm = realm;
this.permissions = permissions;
this.clientService = new DefaultClientService(session, realm, permissions, realmAdminResource);
this.clientService = new DefaultClientService(session, realm, permissions);
}

@GET
Expand Down
13 changes: 3 additions & 10 deletions ...admin-v2/services/src/main/java/org/keycloak/rest/admin/api/client/DefaultClientsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.keycloak.services.client.ClientService;
import org.keycloak.services.client.ClientService.ClientProjectionOptions;
import org.keycloak.services.client.DefaultClientService;
import org.keycloak.services.resources.admin.RealmAdminResource;
import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator;

public class DefaultClientsApi implements ClientsApi {
Expand All @@ -29,19 +28,13 @@ public class DefaultClientsApi implements ClientsApi {
private final RealmModel realm;
private final ClientService clientService;

// v1 resources
private final RealmAdminResource realmAdminResource;

public DefaultClientsApi(@Nonnull KeycloakSession session,
@Nonnull RealmModel realm,
@Nonnull AdminPermissionEvaluator permissions,
// remove v1 resource once we are not attached to API v1
@Nonnull RealmAdminResource realmAdminResource) {
@Nonnull AdminPermissionEvaluator permissions) {
this.session = session;
this.realm = realm;
this.permissions = permissions;
this.realmAdminResource = realmAdminResource;
this.clientService = new DefaultClientService(session, realm, permissions, realmAdminResource);
this.clientService = new DefaultClientService(session, realm, permissions);
}

@Override
Expand Down Expand Up @@ -71,7 +64,7 @@ private void enforceAntiPhishingIfClientMissing(String clientId) {
@Override
public ClientApi client(@PathParam("id") String clientId) {
enforceAntiPhishingIfClientMissing(clientId);
return new DefaultClientApi(session, realm, clientId, permissions, realmAdminResource);
return new DefaultClientApi(session, realm, clientId, permissions);
}

}
Loading
Loading
0