Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove dependency on keycloak-server-spi-private from keycloak-model-… #43627

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove dependency on keycloak-server-spi-private from keycloak-model-… #43627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 4 deletions model/storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-spi-private</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions ...orage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

import org.keycloak.common.util.MultivaluedHashMap;
import org.keycloak.component.ComponentModel;
import org.keycloak.credential.UserCredentialManager;
import org.keycloak.models.ClientModel;
import org.keycloak.models.GroupModel;
import org.keycloak.models.KeycloakSession;
Expand Down Expand Up @@ -401,7 +400,7 @@ public void setEmailVerified(boolean verified) {

@Override
public SubjectCredentialManager credentialManager() {
return new UserCredentialManager(session, realm, this);
return session.getUserCredentialManager(this);
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions server-spi-private/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@
<artifactId>keycloak-server-spi</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-model-storage</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
Expand Down
0 ...oak/credential/UserCredentialManager.java → ...oak/credential/UserCredentialManager.java
View file
Open in desktop
File renamed without changes.
0 ...keycloak/executors/ExecutorsProvider.java → ...keycloak/executors/ExecutorsProvider.java
View file
Open in desktop
File renamed without changes.
0 ...k/executors/ExecutorsProviderFactory.java → ...k/executors/ExecutorsProviderFactory.java
View file
Open in desktop
File renamed without changes.
7 changes: 7 additions & 0 deletions server-spi/src/main/java/org/keycloak/models/KeycloakSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,13 @@ default <T> T getAttributeOrDefault(String attribute, T defaultValue) {
*/
UserProvider users();

/**
* Default implementation of {@link SubjectCredentialManager} suitable for most of user providers
*
* @return user credential manager
*/
SubjectCredentialManager getUserCredentialManager(UserModel user);

/**
* Key manager
*
Expand Down
0 ...cloak/models/UserModelDefaultMethods.java → ...cloak/models/UserModelDefaultMethods.java
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.keycloak.common.util.StackUtil;
import org.keycloak.component.ComponentFactory;
import org.keycloak.component.ComponentModel;
import org.keycloak.credential.UserCredentialManager;
import org.keycloak.jose.jws.DefaultTokenManager;
import org.keycloak.keys.DefaultKeyManager;
import org.keycloak.models.ClientProvider;
Expand All @@ -35,9 +36,11 @@
import org.keycloak.models.RealmProvider;
import org.keycloak.models.RoleProvider;
import org.keycloak.models.SingleUseObjectProvider;
import org.keycloak.models.SubjectCredentialManager;
import org.keycloak.models.ThemeManager;
import org.keycloak.models.TokenManager;
import org.keycloak.models.UserLoginFailureProvider;
import org.keycloak.models.UserModel;
import org.keycloak.models.UserProvider;
import org.keycloak.models.UserSessionProvider;
import org.keycloak.models.utils.KeycloakModelUtils;
Expand Down Expand Up @@ -165,6 +168,11 @@ public UserProvider users() {
return getDatastoreProvider().users();
}

@Override
public SubjectCredentialManager getUserCredentialManager(UserModel user) {
return new UserCredentialManager(this, getContext().getRealm(), user);
}

@SuppressWarnings("unchecked")
@Override
public <T extends Provider> T getProvider(Class<T> clazz) {
Expand Down
Loading