libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Username now shown when creating a user and edit username is not allowed

Browse source 
Closes #24183
This commit is contained in:
Pedro Igor 2023-10-20 11:49:35 -03:00
parent f4d1dd9b7f
commit e47389f199
2 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,9 @@ public abstract class AbstractUserProfileProvider<U extends UserProfileProvider>
KeycloakContext context = session.getContext();
RealmModel realm = context.getRealm();
if (REGISTRATION.equals(c.getContext()) || IDP_REVIEW.equals(c.getContext())) {
if (REGISTRATION.equals(c.getContext())
|| IDP_REVIEW.equals(c.getContext())
|| isNewUser(c)) {
return !realm.isRegistrationEmailAsUsername();
}

35
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/userprofile/UserProfileAdminTest.java
View file

@ -108,7 +108,7 @@ public class UserProfileAdminTest extends AbstractAdminTest {
}
@Test
public void testUsernameRequiredIfEmailAsUsernameDisabled() {
public void testUsernameRequiredAndWritableIfEmailAsUsernameDisabledAndEditUsernameAllowed() {
RealmResource realm = testRealm();
RealmRepresentation realmRep = realm.toRepresentation();
Boolean registrationEmailAsUsername = realmRep.isRegistrationEmailAsUsername();
@ -118,9 +118,41 @@ public class UserProfileAdminTest extends AbstractAdminTest {
realmRep.setRegistrationEmailAsUsername(registrationEmailAsUsername);
realm.update(realmRep);
});
Boolean editUsernameAllowed = realmRep.isEditUsernameAllowed();
realmRep.setEditUsernameAllowed(true);
realm.update(realmRep);
getCleanup().addCleanup(() -> {
realmRep.setEditUsernameAllowed(editUsernameAllowed);
realm.update(realmRep);
});
UserProfileResource userProfile = realm.users().userProfile();
UserProfileMetadata metadata = userProfile.getMetadata();
assertTrue(metadata.getAttributeMetadata(UserModel.USERNAME).isRequired());
assertFalse(metadata.getAttributeMetadata(UserModel.USERNAME).isReadOnly());
}
@Test
public void testUsernameRequiredAndWritableIfEmailAsUsernameDisabledAndEditUsernameDisabled() {
RealmResource realm = testRealm();
RealmRepresentation realmRep = realm.toRepresentation();
Boolean registrationEmailAsUsername = realmRep.isRegistrationEmailAsUsername();
realmRep.setRegistrationEmailAsUsername(false);
realm.update(realmRep);
getCleanup().addCleanup(() -> {
realmRep.setRegistrationEmailAsUsername(registrationEmailAsUsername);
realm.update(realmRep);
});
Boolean editUsernameAllowed = realmRep.isEditUsernameAllowed();
realmRep.setEditUsernameAllowed(false);
realm.update(realmRep);
getCleanup().addCleanup(() -> {
realmRep.setEditUsernameAllowed(editUsernameAllowed);
realm.update(realmRep);
});
UserProfileResource userProfile = realm.users().userProfile();
UserProfileMetadata metadata = userProfile.getMetadata();
assertTrue(metadata.getAttributeMetadata(UserModel.USERNAME).isRequired());
assertFalse(metadata.getAttributeMetadata(UserModel.USERNAME).isReadOnly());
}
@Test
@ -137,6 +169,7 @@ public class UserProfileAdminTest extends AbstractAdminTest {
UserProfileResource userProfile = realm.users().userProfile();
UserProfileMetadata metadata = userProfile.getMetadata();
assertFalse(metadata.getAttributeMetadata(UserModel.USERNAME).isRequired());
assertTrue(metadata.getAttributeMetadata(UserModel.USERNAME).isReadOnly());
}
@Test