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

[KEYCLOAK-2645] Reset password page says 'You need to change your password to activate your account.'

Browse source
This commit is contained in:
Bruno Oliveira 2017-11-29 06:43:01 -02:00 committed by Stian Thorgersen
parent 2be78a0239
commit 6a528a3ee6
5 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java
View file

@ -62,6 +62,8 @@ import java.net.URI;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.*; import java.util.*;
import static org.keycloak.models.UserModel.RequiredAction.UPDATE_PASSWORD;
/** /**
* @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a> * @author <a href="mailto:sthorger@redhat.com">Stian Thorgersen</a>
*/ */
@ -132,7 +134,8 @@ public class FreeMarkerLoginFormsProvider implements LoginFormsProvider {
page = LoginFormsPages.LOGIN_UPDATE_PROFILE; page = LoginFormsPages.LOGIN_UPDATE_PROFILE;
break; break;
case UPDATE_PASSWORD: case UPDATE_PASSWORD:
actionMessage = Messages.UPDATE_PASSWORD; boolean isRequestedByAdmin = user.getRequiredActions().stream().filter(Objects::nonNull).anyMatch(UPDATE_PASSWORD.toString()::contains);
actionMessage = isRequestedByAdmin ? Messages.UPDATE_PASSWORD : Messages.RESET_PASSWORD;
page = LoginFormsPages.LOGIN_UPDATE_PASSWORD; page = LoginFormsPages.LOGIN_UPDATE_PASSWORD;
break; break;
case VERIFY_EMAIL: case VERIFY_EMAIL:

2
services/src/main/java/org/keycloak/services/messages/Messages.java
View file

@ -77,6 +77,8 @@ public class Messages {
public static final String UPDATE_PROFILE = "updateProfileMessage"; public static final String UPDATE_PROFILE = "updateProfileMessage";
public static final String RESET_PASSWORD = "resetPasswordMessage";
public static final String UPDATE_PASSWORD = "updatePasswordMessage"; public static final String UPDATE_PASSWORD = "updatePasswordMessage";
public static final String VERIFY_EMAIL = "verifyEmailMessage"; public static final String VERIFY_EMAIL = "verifyEmailMessage";

6
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java
View file

@ -36,6 +36,9 @@ public class LoginPasswordUpdatePage extends LanguageComboboxAwarePage {
@FindBy(className = "alert-error") @FindBy(className = "alert-error")
private WebElement loginErrorMessage; private WebElement loginErrorMessage;
@FindBy(xpath = "//span[@class='kc-feedback-text']")
private WebElement feedbackMessage;
public void changePassword(String newPassword, String passwordConfirm) { public void changePassword(String newPassword, String passwordConfirm) {
newPasswordInput.sendKeys(newPassword); newPasswordInput.sendKeys(newPassword);
passwordConfirmInput.sendKeys(passwordConfirm); passwordConfirmInput.sendKeys(passwordConfirm);
@ -55,4 +58,7 @@ public class LoginPasswordUpdatePage extends LanguageComboboxAwarePage {
return loginErrorMessage != null ? loginErrorMessage.getText() : null; return loginErrorMessage != null ? loginErrorMessage.getText() : null;
} }
public String getFeedbackMessage() {
return feedbackMessage.getText();
}
} }

3
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java
View file

@ -50,6 +50,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import org.junit.*; import org.junit.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
/** /**
@ -258,6 +259,8 @@ public class ResetPasswordTest extends AbstractTestRealmKeycloakTest {
updatePasswordPage.assertCurrent(); updatePasswordPage.assertCurrent();
assertEquals("You need to change your password.", updatePasswordPage.getFeedbackMessage());
updatePasswordPage.changePassword(password, password); updatePasswordPage.changePassword(password, password);
events.expectRequiredAction(EventType.UPDATE_PASSWORD).user(userId).detail(Details.USERNAME, username.trim()).assertEvent(); events.expectRequiredAction(EventType.UPDATE_PASSWORD).user(userId).detail(Details.USERNAME, username.trim()).assertEvent();

1
themes/src/main/resources/theme/base/login/messages/messages_en.properties
View file

@ -160,6 +160,7 @@ confirmLinkIdpContinue=Add to existing account
configureTotpMessage=You need to set up Mobile Authenticator to activate your account. configureTotpMessage=You need to set up Mobile Authenticator to activate your account.
updateProfileMessage=You need to update your user profile to activate your account. updateProfileMessage=You need to update your user profile to activate your account.
updatePasswordMessage=You need to change your password to activate your account. updatePasswordMessage=You need to change your password to activate your account.
resetPasswordMessage=You need to change your password.
verifyEmailMessage=You need to verify your email address to activate your account. verifyEmailMessage=You need to verify your email address to activate your account.
linkIdpMessage=You need to verify your email address to link your account with {0}. linkIdpMessage=You need to verify your email address to link your account with {0}.