mirrors/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-25 16:42:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KEYCLOAK-16232] Streamify the UserCredentialStore and UserCredentialManager interfaces

Browse Source
This commit is contained in:
Stefan Guilhen
2020-11-26 10:25:06 -03:00
committed by Hynek Mlnařík
parent 73d0bb34c4
commit edef93cd49
43 changed files with 447 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java
View File

@@ -23,7 +23,6 @@ import org.keycloak.credential.CredentialAuthentication;
import org.keycloak.credential.CredentialInput;
import org.keycloak.credential.CredentialInputUpdater;
import org.keycloak.credential.CredentialInputValidator;
import org.keycloak.credential.CredentialModel;
import org.keycloak.federation.kerberos.impl.KerberosUsernamePasswordAuthenticator;
import org.keycloak.federation.kerberos.impl.SPNEGOAuthenticator;
import org.keycloak.models.CredentialValidationOutput;
@@ -41,10 +40,9 @@ import org.keycloak.storage.UserStorageProviderModel;
import org.keycloak.storage.user.ImportedUserValidation;
import org.keycloak.storage.user.UserLookupProvider;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;
/**
* @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
@@ -52,7 +50,7 @@ import java.util.Set;
public class KerberosFederationProvider implements UserStorageProvider,
UserLookupProvider,
CredentialInputValidator,
CredentialInputUpdater,
CredentialInputUpdater.Streams,
CredentialAuthentication,
ImportedUserValidation {
@@ -146,8 +144,8 @@ public class KerberosFederationProvider implements UserStorageProvider,
}
@Override
public Set<String> getDisableableCredentialTypes(RealmModel realm, UserModel user) {
return Collections.EMPTY_SET;
public Stream<String> getDisableableCredentialTypesStream(RealmModel realm, UserModel user) {
return Stream.empty();
}
@Override

7
federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProvider.java
View File

@@ -18,7 +18,6 @@
package org.keycloak.storage.ldap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -88,7 +87,7 @@ import org.keycloak.storage.user.UserRegistrationProvider;
*/
public class LDAPStorageProvider implements UserStorageProvider,
CredentialInputValidator,
CredentialInputUpdater,
CredentialInputUpdater.Streams,
CredentialAuthentication,
UserLookupProvider,
UserRegistrationProvider,
@@ -687,8 +686,8 @@ public class LDAPStorageProvider implements UserStorageProvider,
}
@Override
public Set<String> getDisableableCredentialTypes(RealmModel realm, UserModel user) {
return Collections.EMPTY_SET;
public Stream<String> getDisableableCredentialTypesStream(RealmModel realm, UserModel user) {
return Stream.empty();
}
public Set<String> getSupportedCredentialTypes() {

10
federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProvider.java
View File

@@ -21,7 +21,6 @@ import org.jboss.logging.Logger;
import org.keycloak.credential.CredentialInput;
import org.keycloak.credential.CredentialInputUpdater;
import org.keycloak.credential.CredentialInputValidator;
import org.keycloak.credential.CredentialModel;
import org.keycloak.federation.sssd.api.Sssd;
import org.keycloak.federation.sssd.api.Sssd.User;
import org.keycloak.federation.sssd.impl.PAMAuthenticator;
@@ -32,11 +31,10 @@ import org.keycloak.storage.UserStorageProvider;
import org.keycloak.storage.UserStorageProviderModel;
import org.keycloak.storage.user.ImportedUserValidation;
import org.keycloak.storage.user.UserLookupProvider;
import sun.security.util.Password;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream;
/**
* SPI provider implementation to retrieve data from SSSD and authenticate
@@ -47,7 +45,7 @@ import java.util.Set;
*/
public class SSSDFederationProvider implements UserStorageProvider,
UserLookupProvider,
CredentialInputUpdater,
CredentialInputUpdater.Streams,
CredentialInputValidator,
ImportedUserValidation {
@@ -205,7 +203,7 @@ public class SSSDFederationProvider implements UserStorageProvider,
}
@Override
public Set<String> getDisableableCredentialTypes(RealmModel realm, UserModel user) {
return Collections.EMPTY_SET;
public Stream<String> getDisableableCredentialTypesStream(RealmModel realm, UserModel user) {
return Stream.empty();
}
}