mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-04-27 18:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict mistakes

Browse Source
This commit is contained in:
Bill Burke
2015-06-15 09:28:11 -04:00
parent 43bad9a608
commit 38a2ea2fdf
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/invalidation-cache/model-adapters/src/main/java/org/keycloak/models/cache/DefaultCacheUserProvider.java
Vendored
+2
View File
@@ -131,6 +131,7 @@ public class DefaultCacheUserProvider implements CacheUserProvider {
if (cached == null) {
UserModel model = getDelegate().getUserById(id, realm);
if (model == null) return null;
if (managedUsers.containsKey(id)) return managedUsers.get(id);
if (userInvalidations.containsKey(id)) return model;
cached = new CachedUser(realm, model);
cache.addCachedUser(realm.getId(), cached);
@@ -155,6 +156,7 @@ public class DefaultCacheUserProvider implements CacheUserProvider {
if (cached == null) {
UserModel model = getDelegate().getUserByUsername(username, realm);
if (model == null) return null;
if (managedUsers.containsKey(model.getId())) return managedUsers.get(model.getId());
if (userInvalidations.containsKey(model.getId())) return model;
cached = new CachedUser(realm, model);
cache.addCachedUser(realm.getId(), cached);
testsuite/integration/src/test/java/org/keycloak/testsuite/account/AccountTest.java
-1
View File
@@ -246,7 +246,6 @@ public class AccountTest {
events.expectLogin().session((String) null).error("invalid_user_credentials")
.removeDetail(Details.CONSENT)
.assertEvent();
events.expectLogin().session((String) null).user(userId).error("invalid_user_credentials").assertEvent();
loginPage.open();
loginPage.login("test-user@localhost", "new-password");
testsuite/integration/src/test/java/org/keycloak/testsuite/forms/LoginTest.java
+1 -1
View File
@@ -154,7 +154,7 @@ public class LoginTest {
Assert.assertEquals("Account is disabled, contact admin.", loginPage.getError());
events.expectLogin().user(userId).session((String) null).error("invalid_user_credentials")
events.expectLogin().user(userId).session((String) null).error("user_disabled")
.detail(Details.USERNAME, "login-test")
.removeDetail(Details.CONSENT)
.assertEvent();
testsuite/integration/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class OAuthGrantTest {
oauth.openLoginForm();
appPage.assertCurrent();
events.expectLogin()
.detail(Details.AUTH_METHOD, "sso")
.detail(Details.AUTH_METHOD, OIDCLoginProtocol.LOGIN_PROTOCOL)
.detail(Details.CONSENT, Details.CONSENT_VALUE_PERSISTED_CONSENT)
.removeDetail(Details.USERNAME)
.client("third-party").assertEvent();