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

Merge pull request #3210 from mposolda/master

Browse source 
KEYCLOAK-3537 Username not shown when validation error on Account pro…
This commit is contained in:
Marek Posolda 2016-09-08 10:04:38 +02:00 committed by GitHub
commit 76e1160b36
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/src/main/java/org/keycloak/forms/account/freemarker/model/AccountBean.java
View file

@ -73,7 +73,11 @@ public class AccountBean {
} }
public String getUsername() { public String getUsername() {
return profileFormData != null ? profileFormData.getFirst("username") : user.getUsername(); if (profileFormData != null && profileFormData.containsKey("username")) {
return profileFormData.getFirst("username");
} else {
return user.getUsername();
}
} }
public String getEmail() { public String getEmail() {

21
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountTest.java
View file

@ -377,12 +377,15 @@ public class AccountTest extends TestRealmKeycloakTest {
} }
@Test @Test
public void changeProfile() { public void changeProfile() throws Exception {
setEditUsernameAllowed(false);
profilePage.open(); profilePage.open();
loginPage.login("test-user@localhost", "password"); loginPage.login("test-user@localhost", "password");
events.expectLogin().client("account").detail(Details.REDIRECT_URI, ACCOUNT_REDIRECT).assertEvent(); events.expectLogin().client("account").detail(Details.REDIRECT_URI, ACCOUNT_REDIRECT).assertEvent();
Assert.assertEquals("test-user@localhost", profilePage.getUsername());
Assert.assertEquals("Tom", profilePage.getFirstName()); Assert.assertEquals("Tom", profilePage.getFirstName());
Assert.assertEquals("Brady", profilePage.getLastName()); Assert.assertEquals("Brady", profilePage.getLastName());
Assert.assertEquals("test-user@localhost", profilePage.getEmail()); Assert.assertEquals("test-user@localhost", profilePage.getEmail());
@ -391,6 +394,7 @@ public class AccountTest extends TestRealmKeycloakTest {
profilePage.updateProfile("", "New last", "new@email.com"); profilePage.updateProfile("", "New last", "new@email.com");
Assert.assertEquals("Please specify first name.", profilePage.getError()); Assert.assertEquals("Please specify first name.", profilePage.getError());
Assert.assertEquals("test-user@localhost", profilePage.getUsername());
Assert.assertEquals("", profilePage.getFirstName()); Assert.assertEquals("", profilePage.getFirstName());
Assert.assertEquals("New last", profilePage.getLastName()); Assert.assertEquals("New last", profilePage.getLastName());
Assert.assertEquals("new@email.com", profilePage.getEmail()); Assert.assertEquals("new@email.com", profilePage.getEmail());
@ -417,6 +421,7 @@ public class AccountTest extends TestRealmKeycloakTest {
profilePage.clickCancel(); profilePage.clickCancel();
Assert.assertEquals("test-user@localhost", profilePage.getUsername());
Assert.assertEquals("Tom", profilePage.getFirstName()); Assert.assertEquals("Tom", profilePage.getFirstName());
Assert.assertEquals("Brady", profilePage.getLastName()); Assert.assertEquals("Brady", profilePage.getLastName());
Assert.assertEquals("test-user@localhost", profilePage.getEmail()); Assert.assertEquals("test-user@localhost", profilePage.getEmail());
@ -426,6 +431,7 @@ public class AccountTest extends TestRealmKeycloakTest {
profilePage.updateProfile("New first", "New last", "new@email.com"); profilePage.updateProfile("New first", "New last", "new@email.com");
Assert.assertEquals("Your account has been updated.", profilePage.getSuccess()); Assert.assertEquals("Your account has been updated.", profilePage.getSuccess());
Assert.assertEquals("test-user@localhost", profilePage.getUsername());
Assert.assertEquals("New first", profilePage.getFirstName()); Assert.assertEquals("New first", profilePage.getFirstName());
Assert.assertEquals("New last", profilePage.getLastName()); Assert.assertEquals("New last", profilePage.getLastName());
Assert.assertEquals("new@email.com", profilePage.getEmail()); Assert.assertEquals("new@email.com", profilePage.getEmail());
@ -436,18 +442,21 @@ public class AccountTest extends TestRealmKeycloakTest {
// reset user for other tests // reset user for other tests
profilePage.updateProfile("Tom", "Brady", "test-user@localhost"); profilePage.updateProfile("Tom", "Brady", "test-user@localhost");
events.clear(); events.clear();
// Revert
setEditUsernameAllowed(true);
} }
private void setEditUsernameAllowed() { private void setEditUsernameAllowed(boolean allowed) {
RealmRepresentation testRealm = testRealm().toRepresentation(); RealmRepresentation testRealm = testRealm().toRepresentation();
testRealm.setEditUsernameAllowed(true); testRealm.setEditUsernameAllowed(allowed);
testRealm().update(testRealm); testRealm().update(testRealm);
} }
@Test @Test
public void changeUsername() { public void changeUsername() {
// allow to edit the username in realm // allow to edit the username in realm
setEditUsernameAllowed(); setEditUsernameAllowed(true);
profilePage.open(); profilePage.open();
loginPage.login("test-user@localhost", "password"); loginPage.login("test-user@localhost", "password");
@ -504,7 +513,7 @@ public class AccountTest extends TestRealmKeycloakTest {
@Test @Test
public void changeUsernameLoginWithOldUsername() { public void changeUsernameLoginWithOldUsername() {
addUser("change-username", "change-username@localhost"); addUser("change-username", "change-username@localhost");
setEditUsernameAllowed(); setEditUsernameAllowed(true);
profilePage.open(); profilePage.open();
loginPage.login("change-username", "password"); loginPage.login("change-username", "password");
@ -530,7 +539,7 @@ public class AccountTest extends TestRealmKeycloakTest {
@Test @Test
public void changeEmailLoginWithOldEmail() { public void changeEmailLoginWithOldEmail() {
addUser("change-email", "change-username@localhost"); addUser("change-email", "change-username@localhost");
setEditUsernameAllowed(); setEditUsernameAllowed(true);
profilePage.open(); profilePage.open();
loginPage.login("change-username@localhost", "password"); loginPage.login("change-username@localhost", "password");