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

timeout message

Browse source
This commit is contained in:
Bill Burke 2015-06-17 10:16:21 -04:00
parent 1aa338fe3e
commit f5b4a0788e
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java
View file

@ -399,7 +399,7 @@ public class AuthenticationProcessor {
} else if (e.getError() == Error.EXPIRED_CODE) { } else if (e.getError() == Error.EXPIRED_CODE) {
event.error(Errors.EXPIRED_CODE); event.error(Errors.EXPIRED_CODE);
return ErrorPage.error(session, Messages.INVALID_CODE); return ErrorPage.error(session, Messages.EXPIRED_CODE);
}else { }else {
event.error(Errors.INVALID_USER_CREDENTIALS); event.error(Errors.INVALID_USER_CREDENTIALS);

4
services/src/main/java/org/keycloak/services/resources/LoginActionsService.java
View file

@ -172,7 +172,7 @@ public class LoginActionsService {
} else if (!clientCode.isActionActive(requiredAction)) { } else if (!clientCode.isActionActive(requiredAction)) {
event.client(clientCode.getClientSession().getClient()); event.client(clientCode.getClientSession().getClient());
event.error(Errors.EXPIRED_CODE); event.error(Errors.EXPIRED_CODE);
response = ErrorPage.error(session, Messages.INVALID_CODE); response = ErrorPage.error(session, Messages.EXPIRED_CODE);
return false; return false;
} else { } else {
return true; return true;
@ -190,7 +190,7 @@ public class LoginActionsService {
} else if (!(clientCode.isActionActive(requiredAction) || clientCode.isActionActive(alternativeRequiredAction))) { } else if (!(clientCode.isActionActive(requiredAction) || clientCode.isActionActive(alternativeRequiredAction))) {
event.client(clientCode.getClientSession().getClient()); event.client(clientCode.getClientSession().getClient());
event.error(Errors.EXPIRED_CODE); event.error(Errors.EXPIRED_CODE);
response = ErrorPage.error(session, Messages.INVALID_CODE); response = ErrorPage.error(session, Messages.EXPIRED_CODE);
return false; return false;
} else { } else {
return true; return true;

2
testsuite/integration/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java
View file

@ -370,7 +370,7 @@ public class ResetPasswordTest {
errorPage.assertCurrent(); errorPage.assertCurrent();
assertEquals("An error occurred, please login again through your application.", errorPage.getError()); assertEquals("Login timeout. Please login again.", errorPage.getError());
events.expectRequiredAction(EventType.RESET_PASSWORD).error("expired_code").client("test-app").user((String) null).session((String) null).clearDetails().assertEvent(); events.expectRequiredAction(EventType.RESET_PASSWORD).error("expired_code").client("test-app").user((String) null).session((String) null).clearDetails().assertEvent();
} finally { } finally {