From bdde67db3fb7a8d2b8728e94c85c612282014aa3 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 17 Feb 2020 21:31:01 +0100
Subject: [PATCH] UUIDs for generated entities were not set in several setup
 classes

---
 .../java/org/libreccm/security/ApplicationRoleSetup.java   | 1 +
 .../main/java/org/libreccm/security/SystemUsersSetup.java  | 7 +++++++
 .../java/org/libreccm/security/ShortcutsRolesSetup.java    | 5 +++++
 3 files changed, 13 insertions(+)

diff --git a/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java b/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java
index 5468d15ef..098784099 100644
--- a/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java
+++ b/ccm-core/src/main/java/org/libreccm/security/ApplicationRoleSetup.java
@@ -43,6 +43,7 @@ public class ApplicationRoleSetup {
 
     public Role createRole(final String name) {
         final Role role = new Role();
+        role.setUuid(UUID.randomUUID().toString());
         role.setName(name);
 
         entityManager.persist(role);
diff --git a/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java b/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
index bab83d242..3b84eceae 100644
--- a/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
+++ b/ccm-core/src/main/java/org/libreccm/security/SystemUsersSetup.java
@@ -26,9 +26,11 @@ import org.libreccm.core.EmailAddress;
 import org.libreccm.modules.InstallEvent;
 
 import javax.persistence.EntityManager;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import java.util.UUID;
 
 /**
  * Class used by {@link CcmCore#install(org.libreccm.modules.InstallEvent)} to
@@ -79,6 +81,7 @@ public class SystemUsersSetup {
             ADMIN_PASSWORD, DEFAULT_ADMIN_PW);;
 
         final User admin = new User();
+        admin.setUuid(UUID.randomUUID().toString());
         admin.setName(adminName);
         admin.setFamilyName(adminFamilyName);
         admin.setGivenName(adminGivenName);
@@ -88,13 +91,16 @@ public class SystemUsersSetup {
         admin.setPassword(adminPassword);
 
         final Role adminRole = new Role();
+        adminRole.setUuid(UUID.randomUUID().toString());
         adminRole.setName(CoreConstants.SYS_ADMIN_ROLE);
 
         final RoleMembership membership = new RoleMembership();
+        membership.setUuid(UUID.randomUUID().toString());
         membership.setRole(adminRole);
         membership.setMember(admin);
 
         final Permission adminPermission = new Permission();
+        adminPermission.setUuid(UUID.randomUUID().toString());
         adminPermission.setGrantee(adminRole);
         adminPermission.setGrantedPrivilege("*");
 
@@ -109,6 +115,7 @@ public class SystemUsersSetup {
 
     private void createPublicUser() {
         final User user = new User();
+        user.setUuid(UUID.randomUUID().toString());
         user.setName("public-user");
         user.setFamilyName("LibreCCM");
         user.setGivenName("Public User");
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/security/ShortcutsRolesSetup.java b/ccm-shortcuts/src/main/java/org/libreccm/security/ShortcutsRolesSetup.java
index 50b9db000..297496edc 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/security/ShortcutsRolesSetup.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/security/ShortcutsRolesSetup.java
@@ -19,8 +19,11 @@
 package org.libreccm.security;
 
 import javax.persistence.EntityManager;
+
 import org.libreccm.shortcuts.ShortcutsConstants;
 
+import java.util.UUID;
+
 /**
  * Setups the {@code shortcuts-manager} role. The
  * {@link ShortcutsConstants#SHORTSCUT_MANAGE_PRIVILEGE} is granted to this
@@ -38,10 +41,12 @@ public class ShortcutsRolesSetup {
 
     public void setupShortcutsRoles() {
         final Role shortcutsManager = new Role();
+        shortcutsManager.setUuid(UUID.randomUUID().toString());
         shortcutsManager.setName("shortcuts-manager");
         entityManager.persist(shortcutsManager);
 
         final Permission permission = new Permission();
+        permission.setUuid(UUID.randomUUID().toString());
         permission.setGrantee(shortcutsManager);
         permission.setGrantedPrivilege(
             ShortcutsConstants.SHORTSCUT_MANAGE_PRIVILEGE);