LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Fixed some test failures 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5886 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 5ed6bbd32b
pull/2/head
jensp 2019-03-27 20:30:39 +00:00
parent 1e699a6781
commit bf9efbbed2
9 changed files with 112 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ccm-core/src/main/java/org/libreccm/security/GroupManager.java
View File

@ -62,6 +62,7 @@ public class GroupManager implements Serializable {
@RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)
public void addMemberToGroup(final User user, final Group group) { public void addMemberToGroup(final User user, final Group group) {
if (user == null) { if (user == null) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"Can't add null as user to a group."); "Can't add null as user to a group.");

8
ccm-core/src/main/java/org/libreccm/security/GroupRepository.java
View File

@ -24,8 +24,10 @@ import org.libreccm.core.CoreConstants;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.UUID;
/** /**
* Repository for groups. * Repository for groups.
@ -133,6 +135,12 @@ public class GroupRepository extends AbstractEntityRepository<Long, Group> {
super.save(group); super.save(group);
} }
@Override
public void initNewEntity(final Group group) {
group.setUuid(UUID.randomUUID().toString());
}
@AuthorizationRequired @AuthorizationRequired
@RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN) @RequiresPrivilege(CoreConstants.PRIVILEGE_ADMIN)
@Transactional(Transactional.TxType.REQUIRED) @Transactional(Transactional.TxType.REQUIRED)

6
ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java
View File

@ -153,8 +153,10 @@ public class GroupManagerTest {
@Test @Test
@UsingDataSet("datasets/org/libreccm/security/GroupManagerTest/data.yml") @UsingDataSet("datasets/org/libreccm/security/GroupManagerTest/data.yml")
@ShouldMatchDataSet( @ShouldMatchDataSet(
value = "datasets/org/libreccm/security/GroupManagerTest/after-add.yml", excludeColumns = {"membership_id", "uuid"},
excludeColumns = {"membership_id"}) orderBy = {"group_memberships.membership_id"},
value = "datasets/org/libreccm/security/GroupManagerTest/after-add.yml"
)
@InSequence(200) @InSequence(200)
public void addUserToGroup() { public void addUserToGroup() {
final Group admins = groupRepository.findByName("admins").get(); final Group admins = groupRepository.findByName("admins").get();

24
ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java
View File

@ -149,15 +149,15 @@ public class GroupRepositoryTest {
final Optional<Group> editors, final Optional<Group> editors,
final Optional<Group> none) { final Optional<Group> none) {
assertThat(admins.isPresent(), is(true)); assertThat(admins.isPresent(), is(true));
assertThat(admins.get().getPartyId(), is(-10L)); assertThat(admins.get().getPartyId(), is(10L));
assertThat(admins.get().getName(), is(equalTo(ADMINS))); assertThat(admins.get().getName(), is(equalTo(ADMINS)));
assertThat(users.isPresent(), is(true)); assertThat(users.isPresent(), is(true));
assertThat(users.get().getPartyId(), is(-20L)); assertThat(users.get().getPartyId(), is(20L));
assertThat(users.get().getName(), is(equalTo(USERS))); assertThat(users.get().getName(), is(equalTo(USERS)));
assertThat(editors.isPresent(), is(true)); assertThat(editors.isPresent(), is(true));
assertThat(editors.get().getPartyId(), is(-30L)); assertThat(editors.get().getPartyId(), is(30L));
assertThat(editors.get().getName(), is(equalTo(EDITORS))); assertThat(editors.get().getName(), is(equalTo(EDITORS)));
assertThat(none.isPresent(), is(false)); assertThat(none.isPresent(), is(false));
@ -167,10 +167,10 @@ public class GroupRepositoryTest {
@UsingDataSet("datasets/org/libreccm/security/GroupRepositoryTest/data.yml") @UsingDataSet("datasets/org/libreccm/security/GroupRepositoryTest/data.yml")
@InSequence(100) @InSequence(100)
public void findGroupById() { public void findGroupById() {
final Optional<Group> admins = groupRepository.findById(-10L); final Optional<Group> admins = groupRepository.findById(10L);
final Optional<Group> users = groupRepository.findById(-20L); final Optional<Group> users = groupRepository.findById(20L);
final Optional<Group> editors = groupRepository.findById(-30L); final Optional<Group> editors = groupRepository.findById(30L);
final Optional<Group> none = groupRepository.findById(-999L); final Optional<Group> none = groupRepository.findById(999L);
checkGroups(admins, users, editors, none); checkGroups(admins, users, editors, none);
} }
@ -198,9 +198,11 @@ public class GroupRepositoryTest {
@Test @Test
@UsingDataSet("datasets/org/libreccm/security/GroupRepositoryTest/data.yml") @UsingDataSet("datasets/org/libreccm/security/GroupRepositoryTest/data.yml")
@ShouldMatchDataSet(value = "datasets/org/libreccm/security/" @ShouldMatchDataSet(
+ "GroupRepositoryTest/after-save-new.yml", excludeColumns = {"party_id", "uuid"},
excludeColumns = {"party_id"}) value = "datasets/org/libreccm/security/"
+ "GroupRepositoryTest/after-save-new.yml"
)
@InSequence(400) @InSequence(400)
public void saveNewGroup() { public void saveNewGroup() {
final Group authors = new Group(); final Group authors = new Group();
@ -216,7 +218,7 @@ public class GroupRepositoryTest {
excludeColumns = {"party_id"}) excludeColumns = {"party_id"})
@InSequence(500) @InSequence(500)
public void saveChangedGroup() { public void saveChangedGroup() {
final Group group = groupRepository.findById(-30L).get(); final Group group = groupRepository.findById(30L).get();
group.setName("authors"); group.setName("authors");
groupRepository.save(group); groupRepository.save(group);

25
ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java
View File

@ -151,11 +151,11 @@ public class PartyRepositoryTest {
@UsingDataSet("datasets/org/libreccm/security/PartyRepositoryTest/data.yml") @UsingDataSet("datasets/org/libreccm/security/PartyRepositoryTest/data.yml")
@InSequence(100) @InSequence(100)
public void findPartyById() { public void findPartyById() {
final User jdoe = (User) partyRepository.findById(-10L).get(); final User jdoe = (User) partyRepository.findById(10L).get();
final Group admins = (Group) partyRepository.findById(-20L).get(); final Group admins = (Group) partyRepository.findById(20L).get();
assertThat(jdoe, is(not(nullValue()))); assertThat(jdoe, is(not(nullValue())));
assertThat(jdoe.getPartyId(), is(-10L)); assertThat(jdoe.getPartyId(), is(10L));
assertThat(jdoe.getName(), is(equalTo(JDOE))); assertThat(jdoe.getName(), is(equalTo(JDOE)));
assertThat(jdoe.getFamilyName(), is(equalTo("Doe"))); assertThat(jdoe.getFamilyName(), is(equalTo("Doe")));
assertThat(jdoe.getGivenName(), is(equalTo("John"))); assertThat(jdoe.getGivenName(), is(equalTo("John")));
@ -164,7 +164,7 @@ public class PartyRepositoryTest {
"$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="))); "$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==")));
assertThat(admins, is(not(nullValue()))); assertThat(admins, is(not(nullValue())));
assertThat(admins.getPartyId(), is(-20L)); assertThat(admins.getPartyId(), is(20L));
assertThat(admins.getName(), is(equalTo(ADMINS))); assertThat(admins.getName(), is(equalTo(ADMINS)));
} }
@ -176,7 +176,7 @@ public class PartyRepositoryTest {
final Group admins = (Group) partyRepository.findByName(ADMINS).get(); final Group admins = (Group) partyRepository.findByName(ADMINS).get();
assertThat(jdoe, is(not(nullValue()))); assertThat(jdoe, is(not(nullValue())));
assertThat(jdoe.getPartyId(), is(-10L)); assertThat(jdoe.getPartyId(), is(10L));
assertThat(jdoe.getName(), is(equalTo(JDOE))); assertThat(jdoe.getName(), is(equalTo(JDOE)));
assertThat(jdoe.getFamilyName(), is(equalTo("Doe"))); assertThat(jdoe.getFamilyName(), is(equalTo("Doe")));
assertThat(jdoe.getGivenName(), is(equalTo("John"))); assertThat(jdoe.getGivenName(), is(equalTo("John")));
@ -185,7 +185,7 @@ public class PartyRepositoryTest {
"$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA=="))); "$shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==")));
assertThat(admins, is(not(nullValue()))); assertThat(admins, is(not(nullValue())));
assertThat(admins.getPartyId(), is(-20L)); assertThat(admins.getPartyId(), is(20L));
assertThat(admins.getName(), is(equalTo(ADMINS))); assertThat(admins.getName(), is(equalTo(ADMINS)));
} }
@ -200,9 +200,10 @@ public class PartyRepositoryTest {
@Test @Test
@UsingDataSet("datasets/org/libreccm/security/PartyRepositoryTest/data.yml") @UsingDataSet("datasets/org/libreccm/security/PartyRepositoryTest/data.yml")
@ShouldMatchDataSet(value = "datasets/org/libreccm/security/" @ShouldMatchDataSet(
+ "PartyRepositoryTest/after-save-new.yml", excludeColumns = {"party_id", "uuid", "password"},
excludeColumns = {"party_id", "password"} value = "datasets/org/libreccm/security/"
+ "PartyRepositoryTest/after-save-new.yml"
) )
@InSequence(300) @InSequence(300)
public void saveNewParty() { public void saveNewParty() {
@ -238,8 +239,8 @@ public class PartyRepositoryTest {
) )
@InSequence(400) @InSequence(400)
public void saveChangedParty() { public void saveChangedParty() {
final Party user = partyRepository.findById(-10L).get(); final Party user = partyRepository.findById(10L).get();
final Party group = partyRepository.findById(-20L).get(); final Party group = partyRepository.findById(20L).get();
user.setName("johndoe"); user.setName("johndoe");
group.setName("managers"); group.setName("managers");
@ -264,7 +265,7 @@ public class PartyRepositoryTest {
excludeColumns = {"party_id"}) excludeColumns = {"party_id"})
@InSequence(600) @InSequence(600)
public void deleteParty() { public void deleteParty() {
final Party user = partyRepository.findById(-10L).get(); final Party user = partyRepository.findById(10L).get();
shiro.getSystemUser().execute(() -> partyRepository.delete(user)); shiro.getSystemUser().execute(() -> partyRepository.delete(user));
} }

60
ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml
View File

@ -1,26 +1,26 @@
ccm_core.parties: ccm_core.parties:
# John Doe # John Doe
- party_id": 10 - party_id: 10
uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268
name: jdoe name: jdoe
# Max Muster # Max Muster
- party_id": 20 - party_id: 20
uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4
name: mmuster name: mmuster
# Joe Public # Joe Public
- party_id": 30 - party_id: 30
uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75
name: joe name: joe
# admins # admins
- party_id": 40 - party_id: 40
uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5
name: admins name: admins
# users # users
- party_id": 50 - party_id: 50
uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb
name: users name: users
# editors # editors
- party_id": 60 - party_id: 60
uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c
name: editors name: editors
ccm_core.users: ccm_core.users:
@ -30,7 +30,7 @@ ccm_core.users:
email_address: john.doe@example.com email_address: john.doe@example.com
family_name: Doe family_name: Doe
given_name: John given_name: John
party_id": 10 party_id: 10
# foo123 # foo123
password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
password_reset_required: false password_reset_required: false
@ -41,7 +41,7 @@ ccm_core.users:
email_address: max.mustermann@example.org email_address: max.mustermann@example.org
family_name: Mustermann family_name: Mustermann
given_name: Max given_name: Max
party_id": 20 party_id: 20
# foo123 # foo123
password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
password_reset_required: false password_reset_required: false
@ -52,45 +52,45 @@ ccm_core.users:
email_address: joe.public@example.com email_address: joe.public@example.com
family_name: Public family_name: Public
given_name: Joe given_name: Joe
party_id": 30 party_id: 30
password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
password_reset_required: false password_reset_required: false
verified: true verified: true
ccm_core.groups: ccm_core.groups:
# admins # admins
- party_id": 40 - party_id: 40
# users # users
- party_id": 50 - party_id: 50
# editors # editors
- party_id": 60 - party_id: 60
ccm_core.group_memberships: ccm_core.group_memberships:
# admins <-> jdoe # admins <-> jdoe
- membership_id": 100 - membership_id: 100
uuid: 1f9dad0a-c51a-49e7-8720-c3c669cde67e uuid: 1f9dad0a-c51a-49e7-8720-c3c669cde67e
group_id": 40 group_id: 40
member_id": 10 member_id: 10
# users <-> mmuster # users <-> mmuster
- membership_id": 200 - membership_id: 200
uuid: 3837b1c2-b4e4-44b9-a92f-2330d76b51df uuid: 3837b1c2-b4e4-44b9-a92f-2330d76b51df
group_id": 50 group_id: 50
member_id": 20 member_id: 20
# users <-> joe # users <-> joe
- membership_id": 300 - membership_id: 300
uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa
group_id": 50 group_id: 50
member_id": 30 member_id: 30
# editors <-> joe # editors <-> joe
- membership_id": 400 - membership_id: 400
uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd
group_id": 60 group_id: 60
member_id": 30 member_id: 30
# admins <-> mmuster # admins <-> mmuster
- membership_id": 500 - membership_id: 500
uuid: 555657c8-e8ce-41e1-a327-f853901c8813 uuid: 555657c8-e8ce-41e1-a327-f853901c8813
group_id": 40 group_id: 40
member_id": 20 member_id: 20
# editors <-> jdoe # editors <-> jdoe
- membership_id": 600 - membership_id: 600
uuid: ed78b175-3ff3-4f34-8a5f-829e2113c593 uuid: ed78b175-3ff3-4f34-8a5f-829e2113c593
group_id": 60 group_id: 60
member_id": 10 member_id: 10

36
ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml
View File

@ -1,26 +1,26 @@
ccm_core.parties: ccm_core.parties:
# John Doe # John Doe
- party_id": 10 - party_id: 10
uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268
name: jdoe name: jdoe
# Max Muster # Max Muster
- party_id": 20 - party_id: 20
uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4
name: mmuster name: mmuster
# Joe Public # Joe Public
- party_id": 30 - party_id: 30
uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75
name: joe name: joe
# admins # admins
- party_id": 40 - party_id: 40
uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5
name: admins name: admins
# users # users
- party_id": 50 - party_id: 50
uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb
name: users name: users
# editors # editors
- party_id": 60 - party_id: 60
uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c
name: editors name: editors
ccm_core.users: ccm_core.users:
@ -30,7 +30,7 @@ ccm_core.users:
email_address: john.doe@example.com email_address: john.doe@example.com
family_name: Doe family_name: Doe
given_name: John given_name: John
party_id": 10 party_id: 10
# foo123 # foo123
password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
password_reset_required: false password_reset_required: false
@ -41,7 +41,7 @@ ccm_core.users:
email_address: max.mustermann@example.org email_address: max.mustermann@example.org
family_name: Mustermann family_name: Mustermann
given_name: Max given_name: Max
party_id": 20 party_id: 20
# foo123 # foo123
password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
password_reset_required: false password_reset_required: false
@ -52,25 +52,25 @@ ccm_core.users:
email_address: joe.public@example.com email_address: joe.public@example.com
family_name: Public family_name: Public
given_name: Joe given_name: Joe
party_id": 30 party_id: 30
password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
password_reset_required: false password_reset_required: false
verified: true verified: true
ccm_core.groups: ccm_core.groups:
# admins # admins
- party_id": 40 - party_id: 40
# users # users
- party_id": 50 - party_id: 50
# editors # editors
- party_id": 60 - party_id: 60
ccm_core.group_memberships: ccm_core.group_memberships:
# users <-> joe # users <-> joe
- membership_id": 300 - membership_id: 300
uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa
group_id": 50 group_id: 50
member_id": 30 member_id: 30
# editors <-> joe # editors <-> joe
- membership_id": 400 - membership_id: 400
uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd
group_id": 60 group_id: 60
member_id": 30 member_id: 30

48
ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml
View File

@ -1,26 +1,26 @@
ccm_core.parties: ccm_core.parties:
# John Doe # John Doe
- party_id": 10 - party_id: 10
uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268
name: jdoe name: jdoe
# Max Muster # Max Muster
- party_id": 20 - party_id: 20
uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4
name: mmuster name: mmuster
# Joe Public # Joe Public
- party_id": 30 - party_id: 30
uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75 uuid: 7d5ad4a7-c2bd-4e49-8716-0bfb40413c75
name: joe name: joe
# admins # admins
- party_id": 40 - party_id: 40
uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5 uuid: 0fc446b7-a242-4407-9d04-b8ccaaa9dee5
name: admins name: admins
# users # users
- party_id": 50 - party_id: 50
uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb uuid: 2082d7fc-8268-4195-8cbe-eb826b1afaeb
name: users name: users
# editors # editors
- party_id": 60 - party_id: 60
uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c uuid: 176bfecc-c0fa-4e76-8935-5d6d0ec60e8c
name: editors name: editors
ccm_core.users: ccm_core.users:
@ -30,7 +30,7 @@ ccm_core.users:
email_address: john.doe@example.com email_address: john.doe@example.com
family_name: Doe family_name: Doe
given_name: John given_name: John
party_id": 10 party_id: 10
# foo123 # foo123
password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA==
password_reset_required: false password_reset_required: false
@ -41,7 +41,7 @@ ccm_core.users:
email_address: max.mustermann@example.org email_address: max.mustermann@example.org
family_name: Mustermann family_name: Mustermann
given_name: Max given_name: Max
party_id": 20 party_id: 20
# foo123 # foo123
password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q==
password_reset_required: false password_reset_required: false
@ -52,35 +52,35 @@ ccm_core.users:
email_address: joe.public@example.com email_address: joe.public@example.com
family_name: Public family_name: Public
given_name: Joe given_name: Joe
party_id": 30 party_id: 30
password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw==
password_reset_required: false password_reset_required: false
verified: true verified: true
ccm_core.groups: ccm_core.groups:
# admins # admins
- party_id": 40 - party_id: 40
# users # users
- party_id": 50 - party_id: 50
# editors # editors
- party_id": 60 - party_id: 60
ccm_core.group_memberships: ccm_core.group_memberships:
# admins <-> jdoe # admins <-> jdoe
- membership_id": 100 - membership_id: 100
uuid: 1f9dad0a-c51a-49e7-8720-c3c669cde67e uuid: 1f9dad0a-c51a-49e7-8720-c3c669cde67e
group_id": 40 group_id: 40
member_id": 10 member_id: 10
# users <-> mmuster # users <-> mmuster
- membership_id": 200 - membership_id: 200
uuid: 3837b1c2-b4e4-44b9-a92f-2330d76b51df uuid: 3837b1c2-b4e4-44b9-a92f-2330d76b51df
group_id": 50 group_id: 50
member_id": 20 member_id: 20
# users <-> joe # users <-> joe
- membership_id": 300 - membership_id: 300
uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa uuid: cf8ffbc6-96d3-4e23-9503-4b396ea112aa
group_id": 50 group_id: 50
member_id": 30 member_id: 30
# editors <-> joe # editors <-> joe
- membership_id": 400 - membership_id: 400
uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd uuid: 610ad227-cc55-4a8f-b532-3a5204f9d2dd
group_id": 60 group_id: 60
member_id": 30 member_id: 30

2
ccm-core/src/test/resources/datasets/org/libreccm/security/PartyRepositoryTest/after-save-changed.yml
View File

@ -2,7 +2,7 @@ ccm_core.parties:
# John Doe # John Doe
- party_id: 10 - party_id: 10
uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268 uuid: 631be113-7e86-453d-9f8b-8cb6cb6df268
name: jdoe name: johndoe
- party_id: 20 - party_id: 20
uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4 uuid: 3a61d302-97a5-4e46-bbc9-8d716f7c54c4
name: managers name: managers