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

Moving logic to create service accounts in local storage only to legacy module

Browse source
This commit is contained in:
Alexander Schwartz 2022-05-17 11:12:28 +02:00 committed by Hynek Mlnařík
parent e396d0daa1
commit a43321c720
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
model/legacy-private/src/main/java/org/keycloak/storage/UserStorageManager.java
View file

@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
import org.jboss.logging.Logger;
import org.keycloak.common.constants.ServiceAccountConstants;
import org.keycloak.common.util.reflections.Types;
import org.keycloak.component.ComponentFactory;
import org.keycloak.component.ComponentModel;
@ -267,6 +268,11 @@ public class UserStorageManager extends AbstractStorageManager<UserStorageProvid
@Override
public UserModel addUser(RealmModel realm, String username) {
if (username.startsWith(ServiceAccountConstants.SERVICE_ACCOUNT_USER_PREFIX)) {
// Don't use federation for service account user
return localStorage().addUser(realm, username);
}
return getEnabledStorageProviders(realm, UserRegistrationProvider.class)
.map(provider -> provider.addUser(realm, username))
.filter(Objects::nonNull)

3
services/src/main/java/org/keycloak/services/managers/ClientManager.java
View file

@ -159,8 +159,7 @@ public class ClientManager {
String username = ServiceAccountConstants.SERVICE_ACCOUNT_USER_PREFIX + client.getClientId();
logger.debugf("Creating service account user '%s'", username);
// Don't use federation for service account user
UserModel user = realmManager.getSession().userLocalStorage().addUser(client.getRealm(), username);
UserModel user = realmManager.getSession().users().addUser(client.getRealm(), username);
user.setEnabled(true);
user.setServiceAccountClientLink(client.getId());
}