From 2f31c5b3a835d3fdd7e36c748c382d5788d46b09 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 24 May 2020 16:33:45 +0200 Subject: [PATCH] Several bugfixes Former-commit-id: 341404fca4bcca9ba1110cd09c6bbf6f1eb5369b --- .../main/java/org/libreccm/security/User.java | 2 +- .../org/libreccm/security/UserRepository.java | 3 +-- .../CategoryRepositoryTest.java | 3 +++ .../ConfigurationManagerTest.java | 3 +++ .../core/CcmObjectRepositoryTest.java | 3 +++ .../libreccm/imexport/GroupImportTest.java | 3 +++ .../imexport/GroupMembershipImportTest.java | 3 +++ .../org/libreccm/imexport/UserImportTest.java | 3 +++ .../modules/ConfigurationLoaderTest.java | 3 +++ .../AuthorizationInterceptorTest.java | 3 +++ .../security/ChallengeManagerTest.java | 3 +++ .../libreccm/security/GroupManagerTest.java | 3 +++ .../security/GroupRepositoryTest.java | 3 +++ .../security/OneTimeAuthManagerTest.java | 3 +++ .../security/PartyRepositoryTest.java | 3 +++ .../security/PermissionCheckerTest.java | 3 +++ .../security/PermissionManagerTest.java | 3 +++ .../libreccm/security/RoleManagerTest.java | 3 +++ .../libreccm/security/RoleRepositoryTest.java | 3 +++ .../security/SecuredCollectionTest.java | 3 +++ .../security/SecuredIteratorTest.java | 3 +++ .../java/org/libreccm/security/ShiroTest.java | 3 +++ .../libreccm/security/UserManagerTest.java | 3 +++ .../libreccm/security/UserRepositoryTest.java | 3 +++ .../CategoryManagerTest/data.yml | 2 +- .../after-import-single-membership.yml | 18 +++++++------- .../GroupMembershipImportTest/data.yml | 18 +++++++------- .../after-import-single-user.yml | 24 +++++++++---------- .../libreccm/imexport/UserImportTest/data.yml | 18 +++++++------- .../security/GroupManagerTest/after-add.yml | 6 ++--- .../GroupManagerTest/after-remove.yml | 6 ++--- .../security/GroupManagerTest/data.yml | 6 ++--- .../security/UserManagerTest/data.yml | 2 +- .../UserRepositoryTest/after-save-changed.yml | 2 +- .../UserRepositoryTest/after-save-new.yml | 2 +- .../data-email-duplicate.yml | 2 +- .../7cb9aba4-8071-4f27-af19-096e1473d050.json | 8 +++---- 37 files changed, 124 insertions(+), 61 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/security/User.java b/ccm-core/src/main/java/org/libreccm/security/User.java index 02c73a316..971524ccb 100644 --- a/ccm-core/src/main/java/org/libreccm/security/User.java +++ b/ccm-core/src/main/java/org/libreccm/security/User.java @@ -100,7 +100,7 @@ import javax.xml.bind.annotation.XmlTransient; + " u.primaryEmailAddress"), @NamedQuery(name = "User.countByPrimaryEmailAddress", query = "SELECT COUNT(u) FROM User u " - + "WHERE u.primaryEmailAddress.address = :emailAddress"), + + "WHERE u.primaryEmailAddress = :emailAddress"), @NamedQuery( name = "User.filterByNameAndEmail", query = "SELECT u FROM User u WHERE " diff --git a/ccm-core/src/main/java/org/libreccm/security/UserRepository.java b/ccm-core/src/main/java/org/libreccm/security/UserRepository.java index 68227f8d9..15b95a660 100644 --- a/ccm-core/src/main/java/org/libreccm/security/UserRepository.java +++ b/ccm-core/src/main/java/org/libreccm/security/UserRepository.java @@ -145,11 +145,10 @@ public class UserRepository extends AbstractEntityRepository { */ public Optional findByEmailAddress(final String emailAddress) { try { - return Optional.of( + return getSingleResult( getEntityManager() .createNamedQuery("User.findByEmailAddress", User.class) .setParameter("emailAddress", emailAddress) - .getSingleResult() ); } catch (NoResultException ex) { return Optional.empty(); diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java index 5732a8657..d24a5f434 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java @@ -140,6 +140,9 @@ public class CategoryRepositoryTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java index 18950de18..6a01bdadd 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java @@ -131,6 +131,9 @@ public class ConfigurationManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java index c1d2dbe24..b2614aaca 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -149,6 +149,9 @@ public class CcmObjectRepositoryTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java index d78e4fe82..e7301d6ed 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java @@ -246,6 +246,9 @@ public class GroupImportTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java index 15450c9ba..d2482e374 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java @@ -250,6 +250,9 @@ public class GroupMembershipImportTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java index 932935a5b..d49776b3e 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java @@ -245,6 +245,9 @@ public class UserImportTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("imports", "imports") diff --git a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java index 8d9e91700..6fbc978e7 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java @@ -108,6 +108,9 @@ public class ConfigurationLoaderTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java index 722078fbb..0e887fd3e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java @@ -140,6 +140,9 @@ public class AuthorizationInterceptorTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java index 69efff23b..c62648ee4 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java @@ -143,6 +143,9 @@ public class ChallengeManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java index 9a3fc30a1..5a9fa86c3 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java @@ -133,6 +133,9 @@ public class GroupManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java index cf1fd45ed..ed6eb36d2 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java @@ -133,6 +133,9 @@ public class GroupRepositoryTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java index 113c981ef..3268c913b 100644 --- a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java @@ -137,6 +137,9 @@ public class OneTimeAuthManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java index f319c01aa..75c42ec36 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java @@ -138,6 +138,9 @@ public class PartyRepositoryTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java index 993bcfd27..606def788 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -141,6 +141,9 @@ public class PermissionCheckerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java index 69d1ec666..e04593d16 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -142,6 +142,9 @@ public class PermissionManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java index c156ed3c0..fda5f0bb3 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java @@ -130,6 +130,9 @@ public class RoleManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java index 3d73761af..59f2b4911 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java @@ -141,6 +141,9 @@ public class RoleRepositoryTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java index ba8152f11..7db9bc60c 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java @@ -157,6 +157,9 @@ public class SecuredCollectionTest { ) .addClass(org.libreccm.imexport.Exportable.class) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java index 5909879d4..e001bcd40 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java @@ -159,6 +159,9 @@ public class SecuredIteratorTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java index 926276dc8..5dcd335f3 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java @@ -132,6 +132,9 @@ public class ShiroTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java index 93e236f57..9ff48220f 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java @@ -133,6 +133,9 @@ public class UserManagerTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("test-persistence.xml", "META-INF/persistence.xml") diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java index 16f8a99ab..dda494877 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java @@ -138,6 +138,9 @@ public class UserRepositoryTest { org.libreccm.testutils.dbunit.PgSqlJsonbType.class ) .addClass(org.libreccm.hibernate.AbstractCcmJsonUserType.class) + .addClass( + org.libreccm.hibernate.dialects.LibreCcmPgSql9Dialect.class + ) .addAsLibraries(getModuleDependencies()) .addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("test-persistence.xml", diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml index ed574ae6f..96e6965ca 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/data.yml @@ -92,7 +92,7 @@ ccm_core.users: - party_id: 3100 given_name: Jane family_name: Doe - primary_email_address: jane.doe@localhost + primary_email_address: jane.doe@example.org primary_email_address_bouncing: false primary_email_address_verified: true # foo123 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml index cc8672940..ca5f5f2bb 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/after-import-single-membership.yml @@ -22,36 +22,36 @@ ccm_core.parties: ccm_core.users: # John Doe - banned: false - bouncing: false - email_address: john.doe@example.com + primary_email_address_bouncing: false + primary_email_address: john.doe@example.com family_name: Doe given_name: John party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false - verified: true + primary_email_address_verified: true # Max Mustermann - banned: false - bouncing: false - email_address: max.mustermann@example.org + primary_email_address_bouncing: false + primary_email_address: max.mustermann@example.org family_name: Mustermann given_name: Max party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false - verified: true + primary_email_address_verified: true # Joe Public - banned: false - bouncing: false - email_address: joe.public@example.com + primary_email_address_bouncing: false + primary_email_address: joe.public@example.com family_name: Public given_name: Joe party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false - verified: true + primary_email_address_verified: true ccm_core.groups: # Group 1 - party_id: 100 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml index 13065290a..712df6246 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/GroupMembershipImportTest/data.yml @@ -22,36 +22,36 @@ ccm_core.parties: ccm_core.users: # John Doe - banned: false - bouncing: false - email_address: john.doe@example.com + primary_email_address_bouncing: false + primary_email_address: john.doe@example.com family_name: Doe given_name: John party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false - verified: true + primary_email_address_verified: true # Max Mustermann - banned: false - bouncing: false - email_address: max.mustermann@example.org + primary_email_address_bouncing: false + primary_email_address: max.mustermann@example.org family_name: Mustermann given_name: Max party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false - verified: true + primary_email_address_verified: true # Joe Public - banned: false - bouncing: false - email_address: joe.public@example.com + primary_email_address_bouncing: false + primary_email_address: joe.public@example.com family_name: Public given_name: Joe party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false - verified: true + primary_email_address_verified: true ccm_core.groups: # Group 1 - party_id: 100 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml index 00e5240eb..89fabff59 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/after-import-single-user.yml @@ -18,43 +18,43 @@ ccm_core.parties: ccm_core.users: # John Doe - banned: false - bouncing: false - email_address: john.doe@example.com + primary_email_address_bouncing: false + primary_email_address: john.doe@example.com family_name: Doe given_name: John party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false - verified: true + primary_email_address_verified: true # Max Mustermann - banned: false - bouncing: false - email_address: max.mustermann@example.org + primary_email_address_bouncing: false + primary_email_address: max.mustermann@example.org family_name: Mustermann given_name: Max party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false - verified: true + primary_email_address_verified: true # Joe Public - banned: false - bouncing: false - email_address: joe.public@example.com + primary_email_address_bouncing: false + primary_email_address: joe.public@example.com family_name: Public given_name: Joe party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false - verified: true + primary_email_address_verified: true # Jane Doe - banned: false - bouncing: false - email_address: jane.doe@libreccm.example + primary_email_address_bouncing: false + primary_email_address: jane.doe@libreccm.example family_name: Doe given_name: Jane party_id: 40 password: ofafodafa password_reset_required: false - verified: true + primary_email_address_verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml index db4ff6a87..f31b43553 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/imexport/UserImportTest/data.yml @@ -14,33 +14,33 @@ ccm_core.parties: ccm_core.users: # John Doe - banned: false - bouncing: false - email_address: john.doe@example.com + primary_email_address_bouncing: false + primary_email_address: john.doe@example.com family_name: Doe given_name: John party_id: 10 # foo123 password: $shiro1$SHA-512$500000$7xkDcZUN0/whJInHIvGsDw==$WhelBVmJU/cLV7lAkMOrE5B/mqCW0bUuid1WX+xBwzzAaekC5bYn9eeOFGJWhiDgmaC50ZCUmM96/iGsRoc4uA== password_reset_required: false - verified: true + primary_email_address_verified: true # Max Mustermann - banned: false - bouncing: false - email_address: max.mustermann@example.org + primary_email_address_bouncing: false + primary_email_address: max.mustermann@example.org family_name: Mustermann given_name: Max party_id: 20 # foo123 password: $shiro1$SHA-512$500000$Y7CnccN1h25sR7KCElMOXg==$CVLWBhetodaEzzhDfGjRcCFZtSW02xOnjH7xhBx0lbxO66grKIt6LWmXoUhLEydce1JZ7cbzNLYOxIwwTeqi5Q== password_reset_required: false - verified: true + primary_email_address_verified: true # Joe Public - banned: false - bouncing: false - email_address: joe.public@example.com + primary_email_address_bouncing: false + primary_email_address: joe.public@example.com family_name: Public given_name: Joe party_id: 30 password: $shiro1$SHA-512$500000$RUCYXAQt+XzUmj3x8oG5gw==$qU+lX160Jc6sNUOI9X85wlf2lzn4/hLJNURtjmw9LOYJ7vAqUFFmhyNCMxpzuHIpzeMELr+A0XReoSmtcZnOOw== password_reset_required: false - verified: true + primary_email_address_verified: true diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml index 1bb9cf79d..539bcffdf 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-add.yml @@ -27,7 +27,7 @@ ccm_core.users: # John Doe - banned: false primary_email_address: john.doe@example.com - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Doe given_name: John @@ -38,7 +38,7 @@ ccm_core.users: # Max Mustermann - banned: false primary_email_address: max.mustermann@example.org - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Mustermann given_name: Max @@ -49,7 +49,7 @@ ccm_core.users: # Joe Public - banned: false primary_email_address: joe.public@example.com - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Public given_name: Joe diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml index c5a232d84..ab4c7d579 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/after-remove.yml @@ -27,7 +27,7 @@ ccm_core.users: # John Doe - banned: false primary_email_address: john.doe@example.com - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Doe given_name: John @@ -38,7 +38,7 @@ ccm_core.users: # Max Mustermann - banned: false primary_email_address: max.mustermann@example.org - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Mustermann given_name: Max @@ -49,7 +49,7 @@ ccm_core.users: # Joe Public - banned: false primary_email_address: joe.public@example.com - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Public given_name: Joe diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml index 28cdb0f75..ad02cf283 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/GroupManagerTest/data.yml @@ -27,7 +27,7 @@ ccm_core.users: # John Doe - banned: false primary_email_address: john.doe@example.com - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Doe given_name: John @@ -38,7 +38,7 @@ ccm_core.users: # Max Mustermann - banned: false primary_email_address: max.mustermann@example.org - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Mustermann given_name: Max @@ -49,7 +49,7 @@ ccm_core.users: # Joe Public - banned: false primary_email_address: joe.public@example.com - primary_email_address_bouning: false + primary_email_address_bouncing: false primary_email_address_verified: true family_name: Public given_name: Joe diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml index dd7e20995..dcdc4a457 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserManagerTest/data.yml @@ -16,7 +16,7 @@ ccm_core.users: - banned: false primary_email_address: john.doe@example.com primary_email_address_bouncing: false - primary_email_address_verfified: true + primary_email_address_verified: true family_name: Doe given_name: John party_id: 10 diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml index 89a360863..9c5ef8d64 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-changed.yml @@ -14,7 +14,7 @@ ccm_core.parties: ccm_core.users: # John Doe - banned: false - primary_email_address: jd@example.com\" + primary_email_address: jd@example.com primary_email_address_bouncing: false primary_email_address_verified: true family_name: Doe diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml index 8d0beb848..d5135fcf1 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/after-save-new.yml @@ -52,7 +52,7 @@ ccm_core.users: banned: false primary_email_address: jane.doe@example.org primary_email_address_bouncing: false - primary_email_address_verified: true + primary_email_address_verified: false family_name: Doe given_name: Jane password: $shiro1$SHA-512$500000$24lA090z7GKYr4VFlZ6t4A==$/heoTHPA5huT1UfJ8Q+waXEG6AjUKhFYLFrj7KW/l0/z9O+QkiZTtfPfbcPblgjcEvrROMEIoQY4Z65S7rFLQg== diff --git a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml index f999cc8cd..42ef3fe71 100644 --- a/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml +++ b/ccm-core/src/test/resources/datasets/org/libreccm/security/UserRepositoryTest/data-email-duplicate.yml @@ -36,7 +36,7 @@ ccm_core.users: password_reset_required: false # Joe Public - banned: false - primary_email_address: joe.public@example.com + primary_email_address: max.mustermann@example.org primary_email_address_bouncing: false primary_email_address_verified: true family_name: Public diff --git a/ccm-core/src/test/resources/imports/org.libreccm.imexport.UserImportTest/org.libreccm.security.User/7cb9aba4-8071-4f27-af19-096e1473d050.json b/ccm-core/src/test/resources/imports/org.libreccm.imexport.UserImportTest/org.libreccm.security.User/7cb9aba4-8071-4f27-af19-096e1473d050.json index 39bf51b8c..e805bc658 100644 --- a/ccm-core/src/test/resources/imports/org.libreccm.imexport.UserImportTest/org.libreccm.security.User/7cb9aba4-8071-4f27-af19-096e1473d050.json +++ b/ccm-core/src/test/resources/imports/org.libreccm.imexport.UserImportTest/org.libreccm.security.User/7cb9aba4-8071-4f27-af19-096e1473d050.json @@ -4,11 +4,9 @@ "name": "janedoe", "givenName": "Jane", "familyName": "Doe", - "primaryEmailAddress": { - "address": "jane.doe@libreccm.example", - "bouncing": false, - "verified": true - }, + "primaryEmailAddress": "jane.doe@libreccm.example", + "primaryEmailAddressBouncing": false, + "primaryEmailAddressVerified": true, "banned": false, "password": "ofafodafa", "passwordResetRequired": false