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

KEYCLOAK-1092 Fix test for crud of federated identity links

Browse source
This commit is contained in:
mposolda 2015-03-16 16:48:32 +01:00
parent cb17db50c1
commit 5fe0c38498
3 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
forms/common-themes/src/main/resources/theme/admin/base/resources/partials/user-federated-identity.html
View file

@ -17,7 +17,7 @@
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>Identity Provider Name</th>
<th>Identity Provider Alias</th>
<th>Username</th>
</tr>
</thead>

3
services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java
View file

@ -267,9 +267,6 @@ public class UsersResource {
for (IdentityProviderModel identityProviderModel : realm.getIdentityProviders()) {
if (identityProviderModel.getId().equals(identity.getIdentityProvider())) {
FederatedIdentityRepresentation rep = ModelToRepresentation.toRepresentation(identity);
rep.setIdentityProvider(identityProviderModel.getName());
result.add(rep);
}
}

56
testsuite/integration/src/test/java/org/keycloak/testsuite/admin/UserTest.java
View file

@ -1,9 +1,12 @@
package org.keycloak.testsuite.admin;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.keycloak.admin.client.resource.IdentityProviderResource;
import org.keycloak.admin.client.resource.UserResource;
import org.keycloak.representations.idm.FederatedIdentityRepresentation;
import org.keycloak.representations.idm.IdentityProviderRepresentation;
import org.keycloak.representations.idm.UserRepresentation;
import javax.ws.rs.ClientErrorException;
@ -187,44 +190,53 @@ public class UserTest extends AbstractClientTest {
}
@Test
public void addFederatedIdentity() {
public void getFederatedIdentities() {
// Add sample identity provider
addSampleIdentityProvider();
// Add sample user
createUser();
UserResource user = realm.users().get("user1");
assertEquals(0, user.getFederatedIdentity().size());
// Add social link to the user
FederatedIdentityRepresentation link = new FederatedIdentityRepresentation();
link.setUserId("social-user-id");
link.setUserName("social-username");
Response response = user.addFederatedIdentity("social-provider-id", link);
assertEquals(204, response.getStatus());
}
@Test
@Ignore("Refactor based on KEYCLOAK-883")
public void getFederatedIdentities() {
addFederatedIdentity();
UserResource user = realm.users().get("user1");
assertEquals(1, user.getFederatedIdentity().size());
FederatedIdentityRepresentation link = user.getFederatedIdentity().get(0);
// Verify social link is here
user = realm.users().get("user1");
List<FederatedIdentityRepresentation> federatedIdentities = user.getFederatedIdentity();
assertEquals(1, federatedIdentities.size());
link = federatedIdentities.get(0);
assertEquals("social-provider-id", link.getIdentityProvider());
assertEquals("social-user-id", link.getUserId());
assertEquals("social-username", link.getUserName());
// Remove social link now
user.removeFederatedIdentity("social-provider-id");
assertEquals(0, user.getFederatedIdentity().size());
removeSampleIdentityProvider();
}
@Test
@Ignore("Refactor based on KEYCLOAK-883")
public void removeFederatedIdentity() {
addFederatedIdentity();
private void addSampleIdentityProvider() {
List<IdentityProviderRepresentation> providers = realm.identityProviders().findAll();
Assert.assertEquals(0, providers.size());
UserResource user = realm.users().get("user1");
assertEquals(1, user.getFederatedIdentity().size());
IdentityProviderRepresentation rep = new IdentityProviderRepresentation();
rep.setId("social-provider-id");
rep.setName("social-provider-name");
rep.setProviderId("social-provider-type");
realm.identityProviders().create(rep);
}
user.removeFederatedIdentity("social-provider-id");
assertEquals(0, user.getFederatedIdentity().size());
private void removeSampleIdentityProvider() {
IdentityProviderResource resource = realm.identityProviders().get("social-provider-id");
Assert.assertNotNull(resource);
resource.remove();
}
@Test