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

Do not show username field when updating profile if UPDATE_EMAIL feature is enabled and email as username is enabled

Browse source 
Closes #16263
This commit is contained in:
Pedro Igor 2023-01-04 19:19:08 -03:00 committed by Marek Posolda
parent 141c9dd803
commit 53ee95764e
3 changed files with 122 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
services/src/main/java/org/keycloak/userprofile/AbstractUserProfileProvider.java
View file

@ -79,6 +79,9 @@ public abstract class AbstractUserProfileProvider<U extends UserProfileProvider>
case ACCOUNT_OLD:
case ACCOUNT:
case UPDATE_PROFILE:
if (realm.isRegistrationEmailAsUsername()) {
return false;
}
return realm.isEditUsernameAllowed();
case UPDATE_EMAIL:
return realm.isRegistrationEmailAsUsername();
@ -99,6 +102,9 @@ public abstract class AbstractUserProfileProvider<U extends UserProfileProvider>
case IDP_REVIEW:
return !realm.isRegistrationEmailAsUsername();
case UPDATE_PROFILE:
if (realm.isRegistrationEmailAsUsername()) {
return false;
}
return realm.isEditUsernameAllowed();
case UPDATE_EMAIL:
return false;
@ -112,6 +118,12 @@ public abstract class AbstractUserProfileProvider<U extends UserProfileProvider>
}
private static boolean readEmailCondition(AttributeContext c) {
RealmModel realm = c.getSession().getContext().getRealm();
if (realm.isRegistrationEmailAsUsername() && !realm.isEditUsernameAllowed()) {
return false;
}
return !Profile.isFeatureEnabled(Profile.Feature.UPDATE_EMAIL) || c.getContext() != UPDATE_PROFILE;
}

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

@ -132,6 +132,14 @@ public class VerifyProfilePage extends AbstractPage {
}
}
public boolean isEmailPresent() {
try {
return driver.findElement(By.id("email")).isDisplayed();
} catch (NoSuchElementException nse) {
return false;
}
}
public boolean isUsernameEnabled() {
try {
return driver.findElement(By.id("username")).isEnabled();

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

@ -272,6 +272,10 @@ public class VerifyProfileTest extends AbstractTestRealmKeycloakTest {
+ "{\"name\": \"email\", " + VerifyProfileTest.PERMISSIONS_ALL + "}"
+ "]}");
RealmRepresentation realm = testRealm().toRepresentation();
realm.setEditUsernameAllowed(true);
testRealm().update(realm);
loginPage.open();
loginPage.login("login-test5", "password");
@ -384,6 +388,9 @@ public class VerifyProfileTest extends AbstractTestRealmKeycloakTest {
public void testUsernameOnlyIfEditAllowed() {
RealmRepresentation realm = testRealm().toRepresentation();
setUserProfileConfiguration(CONFIGURATION_FOR_USER_EDIT);
updateUser(user5Id, null, "ExistingLast", null);
boolean r = realm.isEditUsernameAllowed();
try {
setUserProfileConfiguration(null);
@ -392,9 +399,11 @@ public class VerifyProfileTest extends AbstractTestRealmKeycloakTest {
testRealm().update(realm);
loginPage.open();
loginPage.login("login-test", "password");
loginPage.login("login-test5", "password");
verifyProfilePage.assertCurrent();
assertFalse(verifyProfilePage.isUsernamePresent());
assertTrue(verifyProfilePage.isEmailPresent());
realm.setEditUsernameAllowed(true);
testRealm().update(realm);
@ -407,6 +416,98 @@ public class VerifyProfileTest extends AbstractTestRealmKeycloakTest {
}
}
@Test
public void testUsernameOnlyIfEmailAsUsernameIsDisabled() {
RealmRepresentation realm = testRealm().toRepresentation();
setUserProfileConfiguration(CONFIGURATION_FOR_USER_EDIT);
updateUser(user5Id, null, "ExistingLast", null);
try {
setUserProfileConfiguration(null);
realm.setEditUsernameAllowed(true);
realm.setRegistrationEmailAsUsername(true);
testRealm().update(realm);
loginPage.open();
loginPage.login("login-test5", "password");
verifyProfilePage.assertCurrent();
assertFalse(verifyProfilePage.isUsernamePresent());
assertTrue(verifyProfilePage.isEmailPresent());
realm.setEditUsernameAllowed(false);
realm.setRegistrationEmailAsUsername(true);
testRealm().update(realm);
driver.navigate().refresh();
verifyProfilePage.assertCurrent();
assertFalse(verifyProfilePage.isUsernamePresent());
assertFalse(verifyProfilePage.isEmailPresent());
realm.setEditUsernameAllowed(true);
realm.setRegistrationEmailAsUsername(false);
testRealm().update(realm);
driver.navigate().refresh();
verifyProfilePage.assertCurrent();
assertTrue(verifyProfilePage.isUsernamePresent());
assertTrue(verifyProfilePage.isEmailPresent());
} finally {
realm.setEditUsernameAllowed(false);
realm.setRegistrationEmailAsUsername(false);
testRealm().update(realm);
}
}
@Test
@EnableFeature(Profile.Feature.UPDATE_EMAIL)
public void testUsernameOnlyIfEmailAsUsernameIsDisabledWithUpdateEmailFeature() throws Exception {
reconnectAdminClient();
RealmRepresentation realm = testRealm().toRepresentation();
setUserProfileConfiguration(CONFIGURATION_FOR_USER_EDIT);
updateUser(user5Id, null, "ExistingLast", null);
try {
setUserProfileConfiguration(null);
realm.setEditUsernameAllowed(true);
realm.setRegistrationEmailAsUsername(true);
testRealm().update(realm);
loginPage.open();
loginPage.login("login-test5", "password");
verifyProfilePage.assertCurrent();
assertFalse(verifyProfilePage.isUsernamePresent());
assertFalse(verifyProfilePage.isEmailPresent());
realm.setEditUsernameAllowed(false);
realm.setRegistrationEmailAsUsername(true);
testRealm().update(realm);
driver.navigate().refresh();
verifyProfilePage.assertCurrent();
assertFalse(verifyProfilePage.isUsernamePresent());
assertFalse(verifyProfilePage.isEmailPresent());
realm.setEditUsernameAllowed(true);
realm.setRegistrationEmailAsUsername(false);
testRealm().update(realm);
driver.navigate().refresh();
verifyProfilePage.assertCurrent();
assertTrue(verifyProfilePage.isUsernamePresent());
assertFalse(verifyProfilePage.isEmailPresent());
} finally {
realm.setEditUsernameAllowed(false);
realm.setRegistrationEmailAsUsername(false);
testRealm().update(realm);
}
}
@Test
public void testOptionalAttribute() {
setUserProfileConfiguration("{\"attributes\": ["