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

merge

Browse source
This commit is contained in:
Bill Burke 2016-11-06 08:52:10 -05:00
parent 14dc0ff92f
commit 5a86623c88
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
federation/ldap2/src/main/java/org/keycloak/storage/ldap/mappers/LDAPMappersComparator.java
View file

@ -62,8 +62,8 @@ public class LDAPMappersComparator {
@Override
public int compare(ComponentModel o1, ComponentModel o2) {
// UserAttributeLDAPFederationMapper first
boolean isO1AttrMapper = o1.getProviderType().equals(UserAttributeLDAPStorageMapperFactory.PROVIDER_ID);
boolean isO2AttrMapper = o2.getProviderType().equals(UserAttributeLDAPStorageMapperFactory.PROVIDER_ID);
boolean isO1AttrMapper = o1.getProviderId().equals(UserAttributeLDAPStorageMapperFactory.PROVIDER_ID);
boolean isO2AttrMapper = o2.getProviderId().equals(UserAttributeLDAPStorageMapperFactory.PROVIDER_ID);
if (!isO1AttrMapper) {
if (isO2AttrMapper) {
return 1;

2
services/src/main/java/org/keycloak/credential/OTPCredentialProvider.java
View file

@ -230,7 +230,7 @@ public class OTPCredentialProvider implements CredentialProvider, CredentialInpu
} else {
TimeBasedOTP validator = new TimeBasedOTP(policy.getAlgorithm(), policy.getDigits(), policy.getPeriod(), policy.getLookAheadWindow());
List<CredentialModel> creds = getCachedCredentials(user, CredentialModel.TOTP);
if (creds.isEmpty()) {
if (creds == null) {
creds = getCredentialStore().getStoredCredentialsByType(realm, user, CredentialModel.TOTP);
} else {
logger.debugv("Cache hit for TOTP for user {0}", user.getUsername());