From a63fad02579b6536f337a18d6898934f46528dd2 Mon Sep 17 00:00:00 2001 From: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Date: Mon, 22 Jun 2020 15:36:44 +0200 Subject: [PATCH] TSK-1283: general refactoring + made accessIds lowercase --- .../src/main/resources/taskana-test.ldif | 64 +++++++++++++++- .../internal/WorkbasketServiceImpl.java | 3 + .../test/java/acceptance/AbstractAccTest.java | 12 ++- .../UpdateClassificationAccTest.java | 4 +- .../config/TaskanaRoleConfigAccTest.java | 22 ++++-- .../acceptance/task/CompleteTaskAccTest.java | 6 +- .../task/DeleteTaskCommentAccTest.java | 4 +- .../QueryTaskByClassificationNameAccTest.java | 4 +- .../task/QueryTaskWithAttachmentAccTest.java | 4 +- .../task/QueryTasksByWorkbasketAccTest.java | 4 +- .../acceptance/task/TransferTaskAccTest.java | 46 +++-------- ...DeleteWorkbasketAuthorizationsAccTest.java | 22 +++++- .../DistributionTargetsAccTest.java | 4 +- .../workbasket/GetWorkbasketAccTest.java | 4 +- .../workbasket/QueryWorkbasketAccTest.java | 76 +++++-------------- .../QueryWorkbasketByPermissionAccTest.java | 4 +- ...QueryWorkbasketsWithPaginationAccTest.java | 24 ++---- ...UpdateWorkbasketAuthorizationsAccTest.java | 15 ++-- .../src/test/resources/taskana.properties | 9 +-- .../sample-data/workbasket-access-list.sql | 32 ++++---- .../sql/test-data/workbasket-access-list.sql | 32 ++++---- .../src/main/resources/taskana.properties | 8 +- .../src/main/resources/taskana.properties | 8 +- .../src/main/resources/taskana-example.ldif | 65 +++++++++++++++- .../src/test/resources/taskana-test.ldif | 64 +++++++++++++++- .../src/test/resources/taskana.properties | 14 ++-- .../src/main/resources/taskana.properties | 8 +- .../src/test/resources/taskana.properties | 8 +- .../src/test/resources/taskana-test.ldif | 26 +++++++ .../src/test/resources/taskana.properties | 6 +- 30 files changed, 374 insertions(+), 228 deletions(-) diff --git a/history/taskana-simplehistory-spring-test/src/main/resources/taskana-test.ldif b/history/taskana-simplehistory-spring-test/src/main/resources/taskana-test.ldif index 50c6347ad..8d1b56686 100644 --- a/history/taskana-simplehistory-spring-test/src/main/resources/taskana-test.ldif +++ b/history/taskana-simplehistory-spring-test/src/main/resources/taskana-test.ldif @@ -25,6 +25,32 @@ objectclass: container ######################## # Users General ######################## +dn: uid=monitor,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Monitor +description: desc +uid: monitor +sn: Monitor +ou: Organisationseinheit/Organisationseinheit IT +cn: monitor monitor +userPassword: monitor + +dn: uid=taskadmin,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Task +description: desc +uid: taskadmin +sn: Admin +ou: Organisationseinheit/Organisationseinheit IT +cn: Task admin +userPassword: taskadmin + dn: uid=admin,cn=users,OU=Test,O=TASKANA objectclass: inetorgperson objectclass: organizationalperson @@ -101,7 +127,7 @@ objectclass: inetorgperson objectclass: organizationalperson objectclass: person objectclass: top -givenName: Frauke Faul +givenName: Frauke description: desc uid: teamlead-2 sn: Faul @@ -135,6 +161,36 @@ ou: Organisationseinheit/Organisationseinheit KSC/Organisationseinheit KSC 2 cn: Tim Schläfrig userPassword: user-2-1 +######################## +# Users Domäne B +######################## +dn: uid=user-b-1,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Bernd +description: desc +uid: user-b-1 +sn: Bern +ou: Organisationseinheit/Organisationseinheit B +cn: Bernd Bern +userPassword: user-b-1 + +dn: uid=user-b-2,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Brunhilde +description: desc +uid: user-b-2 +sn: Bio +ou: Organisationseinheit/Organisationseinheit B +cn: Brunhilde Bio +userPassword: user-b-2 + + ######################## # Groups ######################## @@ -192,3 +248,9 @@ uniquemember: uid=user-2-2,cn=users,OU=Test,O=TASKANA cn: Organisationseinheit KSC 2 objectclass: groupofuniquenames objectclass: top + +dn: cn=Organisationseinheit B,cn=organisation,OU=Test,O=TASKANA +cn: Organisationseinheit B +objectclass: groupofuniquenames +objectclass: top + diff --git a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java index 792a886bd..7c05d7fdc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/workbasket/internal/WorkbasketServiceImpl.java @@ -853,6 +853,9 @@ public class WorkbasketServiceImpl implements WorkbasketService { taskanaEngine.getEngine().checkRoleMembership(TaskanaRole.BUSINESS_ADMIN, TaskanaRole.ADMIN); try { taskanaEngine.openConnection(); + if (TaskanaEngineConfiguration.shouldUseLowerCaseForAccessIds() && accessId != null) { + accessId = accessId.toLowerCase(); + } workbasketAccessMapper.deleteAccessItemsForAccessId(accessId); } finally { taskanaEngine.returnConnection(); diff --git a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java index a030928ac..8af0b7d0d 100644 --- a/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java @@ -29,17 +29,15 @@ import pro.taskana.task.api.models.ObjectReference; /** Base class for all acceptance tests. */ public abstract class AbstractAccTest { + public static final String GROUP_1_DN = + "cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA"; + public static final String GROUP_2_DN = + "cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA"; + protected static TaskanaEngineConfiguration taskanaEngineConfiguration; protected static TaskanaEngine taskanaEngine; protected static WorkingDaysToDaysConverter converter; - public static final String GROUP_1_DN = - "cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC," - + "cn=organisation,OU=Test,O=TASKANA"; - public static final String GROUP_2_DN = - "cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC," - + "cn=organisation,OU=Test,O=TASKANA"; - @BeforeAll public static void setupTest() throws Exception { resetDb(false); diff --git a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java index bc34990ec..754bf36e3 100644 --- a/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/classification/UpdateClassificationAccTest.java @@ -103,9 +103,7 @@ class UpdateClassificationAccTest extends AbstractAccTest { assertThatThrownBy(updateClassificationCall).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId( - user = "businessadmin", - groups = {"user-1-1"}) // to read the task + @WithAccessId(user = "businessadmin", groups = "user-1-1") // to read the task @Test void testUpdateTaskOnClassificationKeyCategoryChange() throws Exception { setupTest(); diff --git a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java index 04c25bb90..b472b62bd 100644 --- a/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/config/TaskanaRoleConfigAccTest.java @@ -41,19 +41,31 @@ class TaskanaRoleConfigAccTest extends TaskanaEngineImpl { assertThat(rolesConfigured).containsOnly(TaskanaRole.values()); Set users = getConfiguration().getRoleMap().get(TaskanaRole.USER); - assertThat(users).contains("user-1-1", "user-1-2"); + assertThat(users) + .containsExactlyInAnyOrder( + "teamlead-1", + "teamlead-2", + "user-1-1", + "user-1-2", + "user-2-1", + "user-2-2", + "user-b-1", + "user-b-2"); Set admins = getConfiguration().getRoleMap().get(TaskanaRole.ADMIN); - assertThat(admins).contains("uid=admin,cn=users,ou=test,o=taskana", "admin"); + assertThat(admins).containsExactlyInAnyOrder("uid=admin,cn=users,ou=test,o=taskana", "admin"); Set taskAdmins = getConfiguration().getRoleMap().get(TaskanaRole.TASK_ADMIN); - assertThat(taskAdmins).contains("taskadmin"); + assertThat(taskAdmins).containsExactlyInAnyOrder("taskadmin"); Set businessAdmins = getConfiguration().getRoleMap().get(TaskanaRole.BUSINESS_ADMIN); - assertThat(businessAdmins).contains("businessadmin", "teamlead-2"); + assertThat(businessAdmins) + .containsExactlyInAnyOrder( + "businessadmin", "cn=business-admins,cn=groups,ou=test,o=taskana"); Set monitorAccessIds = getConfiguration().getRoleMap().get(TaskanaRole.MONITOR); - assertThat(monitorAccessIds).contains("monitor"); + assertThat(monitorAccessIds) + .containsExactlyInAnyOrder("monitor", "cn=monitor-users,cn=groups,ou=test,o=taskana"); } @Test diff --git a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java index c6222e61e..29aa16d8e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/CompleteTaskAccTest.java @@ -286,7 +286,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(TaskState.READY).isEqualTo(createdTask.getState()); } - @WithAccessId(user = "admin", groups = "admin") + @WithAccessId(user = "admin") @Test void testForceCancelClaimSuccessfull() throws TaskNotFoundException, InvalidStateException, InvalidOwnerException, @@ -547,9 +547,7 @@ class CompleteTaskAccTest extends AbstractAccTest { assertThat(before).isEqualTo(after); } - @WithAccessId( - user = "user-1-2", - groups = {"user-1-1"}) // to read task + @WithAccessId(user = "user-1-2", groups = "user-1-1") // to read task @Test void should_CompleteTaskWhenAlreadyClaimedByDifferentUser_When_BulkForceCompletingTasks() throws Exception { diff --git a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java index d4b0c7214..bc8027fb9 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/DeleteTaskCommentAccTest.java @@ -47,9 +47,7 @@ public class DeleteTaskCommentAccTest extends AbstractAccTest { assertThat(taskCommentsAfterDeletion).hasSize(1); } - @WithAccessId( - user = "user-1-2", - groups = {"user-1-1"}) // to read comments + @WithAccessId(user = "user-1-2", groups = "user-1-1") // to read comments @Test void should_FailToDeleteTaskComment_When_UserHasNoAuthorization() throws NotAuthorizedException, TaskNotFoundException { diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java index 9d11c6343..2f71bd5d9 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskByClassificationNameAccTest.java @@ -79,9 +79,7 @@ class QueryTaskByClassificationNameAccTest extends AbstractAccTest { assertThat(tasks).hasSize(1); } - @WithAccessId( - user = "user-1-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) @Test void testQueryByClassificationNameLike() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java index 201fa58aa..67481d6cc 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTaskWithAttachmentAccTest.java @@ -85,7 +85,7 @@ class QueryTaskWithAttachmentAccTest extends AbstractAccTest { assertThat(queryAttachmentSummaries) .hasSize(originalAttachments.size()) - .containsExactlyElementsOf(originalAttachments) // same values + .containsExactlyInAnyOrderElementsOf(originalAttachments) // same values .usingElementComparator(REFERENCE_COMPARATOR) .doesNotContainAnyElementsOf(originalAttachments); // but not same reference } @@ -113,7 +113,7 @@ class QueryTaskWithAttachmentAccTest extends AbstractAccTest { assertThat(queryAttachmentSummaries) .hasSize(originalAttachments.size()) - .containsExactlyElementsOf(originalAttachments) // same values + .containsExactlyInAnyOrderElementsOf(originalAttachments) // same values .usingElementComparator(REFERENCE_COMPARATOR) .doesNotContainAnyElementsOf(originalAttachments); // but not same reference } diff --git a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java index 4db6d1b68..aa3e68e8e 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java @@ -26,9 +26,7 @@ class QueryTasksByWorkbasketAccTest extends AbstractAccTest { super(); } - @WithAccessId( - user = "user-1-2", - groups = {GROUP_2_DN}) + @WithAccessId(user = "user-1-2", groups = GROUP_2_DN) @Test void testQueryForWorkbasketKeyDomain() { TaskService taskService = taskanaEngine.getTaskService(); diff --git a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java index a02a75e77..d624c4126 100644 --- a/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java @@ -38,9 +38,7 @@ class TransferTaskAccTest extends AbstractAccTest { super(); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_TransferTaskToWorkbasket_When_WorkbasketIdIsProvided() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, @@ -79,9 +77,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferredTask.getState()).isEqualTo(TaskState.READY); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_TransferTaskToWorkbasket_When_WorkbasketKeyAndDomainIsProvided() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, @@ -100,9 +96,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferredTask.getState()).isEqualTo(TaskState.READY); } - @WithAccessId( - user = "user-1-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) @Test void should_ChangeDomain_When_TransferingTaskToWorkbasketWithDifferentDomain() throws NotAuthorizedException, WorkbasketNotFoundException, TaskNotFoundException, @@ -131,9 +125,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(NotAuthorizedException.class); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_ThrowException_When_DestinationWorkbasketDoesNotExist() throws NotAuthorizedException, TaskNotFoundException, InvalidStateException, @@ -162,7 +154,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(TaskNotFoundException.class); } - @WithAccessId(user = "teamlead-1", groups = "teamlead-1") + @WithAccessId(user = "teamlead-1") @Test void should_ThrowException_When_TransferWithNoTransferAuthorization() { TaskService taskService = taskanaEngine.getTaskService(); @@ -182,9 +174,7 @@ class TransferTaskAccTest extends AbstractAccTest { + "'WBI:100000000000000000000000000000000005' is needed."); } - @WithAccessId( - user = "user-1-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) @Test void should_ThrowException_When_TransferWithNoAppendAuthorization() throws NotAuthorizedException, TaskNotFoundException { @@ -218,9 +208,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidStateException.class); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_BulkTransferTasks_When_WorkbasketIdIsProvided() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -257,9 +245,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThat(transferredTask.getOwner()).isNull(); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_BulkTransferOnlyValidTasks_When_SomeTasksToTransferCauseExceptions() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -336,9 +322,7 @@ class TransferTaskAccTest extends AbstractAccTest { .hasMessageContaining("APPEND"); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_TransferTasks_When_TransferTasksWithListNotSupportingRemove() { TaskService taskService = taskanaEngine.getTaskService(); @@ -352,9 +336,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatCode(call).doesNotThrowAnyException(); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_ThrowException_When_TransferTasksWithInvalidTasksIdList() { TaskService taskService = taskanaEngine.getTaskService(); @@ -379,9 +361,7 @@ class TransferTaskAccTest extends AbstractAccTest { .hasMessage("TaskIds must not contain only invalid arguments."); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_ThrowException_When_TransferEmptyTaskIdList() { TaskService taskService = taskanaEngine.getTaskService(); @@ -393,9 +373,7 @@ class TransferTaskAccTest extends AbstractAccTest { assertThatThrownBy(call).isInstanceOf(InvalidArgumentException.class); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void should_BulkTransferTasks_When_WorkbasketKeyAndDomainIsProvided() throws WorkbasketNotFoundException, NotAuthorizedException, InvalidArgumentException, diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java index caa7ffab3..998ccbfbc 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAuthorizationsAccTest.java @@ -1,9 +1,11 @@ package acceptance.workbasket; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import acceptance.AbstractAccTest; import org.assertj.core.api.ThrowableAssert.ThrowingCallable; +import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestTemplate; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,25 +18,37 @@ import pro.taskana.workbasket.api.WorkbasketService; @ExtendWith(JaasExtension.class) class DeleteWorkbasketAuthorizationsAccTest extends AbstractAccTest { + private static final WorkbasketService WORKBASKET_SERVICE = taskanaEngine.getWorkbasketService(); + @WithAccessId(user = "user-1-1") @WithAccessId(user = "taskadmin") @TestTemplate void should_ThrowException_When_UserRoleIsNotAdminOrBusinessAdmin() { - final WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - ThrowingCallable deleteWorkbasketAccessItemCall = () -> { - workbasketService.deleteWorkbasketAccessItemsForAccessId("group-1"); + WORKBASKET_SERVICE.deleteWorkbasketAccessItemsForAccessId("group-1"); }; assertThatThrownBy(deleteWorkbasketAccessItemCall).isInstanceOf(NotAuthorizedException.class); deleteWorkbasketAccessItemCall = () -> { - workbasketService.deleteWorkbasketAccessItem("WAI:100000000000000000000000000000000001"); + WORKBASKET_SERVICE.deleteWorkbasketAccessItem("WAI:100000000000000000000000000000000001"); }; assertThatThrownBy(deleteWorkbasketAccessItemCall).isInstanceOf(NotAuthorizedException.class); } + + @WithAccessId(user = "admin") + @Test + void should_DeleteAccessItem_When_AccessIdIsNotLowercase() throws Exception { + String workbasketId = "WBI:100000000000000000000000000000000004"; + + int beforeDeletingAccessId = WORKBASKET_SERVICE.getWorkbasketAccessItems(workbasketId).size(); + WORKBASKET_SERVICE.deleteWorkbasketAccessItemsForAccessId("TEAMLEAD-2"); + int afterDeletingAccessId = WORKBASKET_SERVICE.getWorkbasketAccessItems(workbasketId).size(); + + assertThat(beforeDeletingAccessId).isGreaterThan(afterDeletingAccessId); + } } diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java index bdaa2f010..2063de178 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java @@ -218,9 +218,7 @@ class DistributionTargetsAccTest extends AbstractAccTest { assertThat(distributionTargets).isEmpty(); } - @WithAccessId( - user = "user-1-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) @Test void testAddDistributionTargetsFailsNotAuthorized() throws NotAuthorizedException, WorkbasketNotFoundException { diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java index 41255bdb1..3d61951bc 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java @@ -106,9 +106,7 @@ class GetWorkbasketAccTest extends AbstractAccTest { assertThat(workbasket.getCustom4()).isEqualTo("custom4"); } - @WithAccessId( - user = "user-1-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) @Test void testGetWorkbasketPermissions() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java index cbf3a82dc..705e891b8 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java @@ -76,9 +76,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(workbaskets).hasSize(count); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketValuesForColumnName() { List columnValueList = workbasketService.createWorkbasketQuery().listValues(NAME, null); @@ -95,9 +93,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(columnValueList).hasSize(4); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByDomain() { List results = @@ -105,9 +101,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(1); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByDomainAndType() { List results = @@ -119,9 +113,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(6); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByName() { List results = @@ -133,9 +125,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .isEqualTo("GPK_KSC"); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByNameStartsWith() { List results = @@ -143,9 +133,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByNameContains() { List results = @@ -156,9 +144,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(5); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByNameContainsCaseInsensitive() { List results = @@ -166,9 +152,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByDescription() { List results = @@ -181,9 +165,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByOwnerLike() { List results = @@ -195,9 +177,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(1); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByKey() { List results = @@ -205,9 +185,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(1); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByMultipleKeys() { List results = @@ -215,9 +193,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByMultipleKeysWithUnknownKey() { List results = @@ -225,9 +201,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(2); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByKeyContains() { List results = @@ -235,9 +209,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByKeyContainsIgnoreCase() { List results = @@ -245,9 +217,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByKeyOrNameContainsIgnoreCase() { List results = @@ -255,9 +225,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByNameStartsWithSortedByNameAscending() { List results = @@ -309,9 +277,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { .isSortedAccordingTo(CASE_INSENSITIVE_ORDER.reversed()); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByCreated() { List results = @@ -319,9 +285,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByModified() { List results = @@ -351,9 +315,7 @@ class QueryWorkbasketAccTest extends AbstractAccTest { assertThat(results).hasSize(13); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testQueryWorkbasketByDomainLike() { List results = diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java index f1aa5117f..4560729b4 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketByPermissionAccTest.java @@ -122,9 +122,7 @@ class QueryWorkbasketByPermissionAccTest extends AbstractAccTest { } } - @WithAccessId( - user = "user-1-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "user-1-1", groups = GROUP_1_DN) @Test void testQueryAllTransferTargetsForUserAndGroupFromSubject() throws SystemException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java index 07f28846c..0b69230dc 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java @@ -20,9 +20,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { super(); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testGetFirstPageOfWorkbasketQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -31,9 +29,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(5); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testGetSecondPageOfWorkbasketQueryWithOffset() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -61,9 +57,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(3); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testPaginationWithPages() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -109,9 +103,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(4); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testPaginationNullAndNegativeLimitsIgnoring() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -147,9 +139,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(results).hasSize(9); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testCountOfWorkbasketQuery() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); @@ -157,9 +147,7 @@ class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest { assertThat(count).isEqualTo(9L); } - @WithAccessId( - user = "teamlead-1", - groups = {GROUP_1_DN}) + @WithAccessId(user = "teamlead-1", groups = GROUP_1_DN) @Test void testWorkbasketQueryDomA() { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java index 28885d790..5a0b78198 100644 --- a/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java +++ b/lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java @@ -139,9 +139,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { .isInstanceOf(InvalidArgumentException.class); } - @WithAccessId( - user = "businessadmin", - groups = {GROUP_2_DN}) + @WithAccessId(user = "businessadmin", groups = GROUP_2_DN) @Test void testUpdatedAccessItemLeadsToNotAuthorizedException() throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException, @@ -167,7 +165,7 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { workbasketService.getWorkbasketAccessItems("WBI:100000000000000000000000000000000008"); WorkbasketAccessItem theAccessItem = accessItems.stream() - .filter(x -> groupName.equals(x.getAccessId())) + .filter(x -> groupName.equalsIgnoreCase(x.getAccessId())) .findFirst() .orElse(null); @@ -295,15 +293,14 @@ class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest { @Test void testDeleteAccessItemsForAccessId() throws NotAuthorizedException { WorkbasketService workbasketService = taskanaEngine.getWorkbasketService(); - final String accessId = GROUP_1_DN; final long accessIdCountBefore = - workbasketService.createWorkbasketAccessItemQuery().accessIdIn(accessId).count(); + workbasketService.createWorkbasketAccessItemQuery().accessIdIn(GROUP_1_DN).count(); - workbasketService.deleteWorkbasketAccessItemsForAccessId(accessId); + workbasketService.deleteWorkbasketAccessItemsForAccessId(GROUP_1_DN); final long accessIdCountAfter = - workbasketService.createWorkbasketAccessItemQuery().accessIdIn(accessId).count(); - assertThat(accessIdCountBefore > accessIdCountAfter).isTrue(); + workbasketService.createWorkbasketAccessItemQuery().accessIdIn(GROUP_1_DN).count(); + assertThat(accessIdCountBefore).isGreaterThan(accessIdCountAfter); } @WithAccessId(user = "businessadmin") diff --git a/lib/taskana-core/src/test/resources/taskana.properties b/lib/taskana-core/src/test/resources/taskana.properties index b257eb368..ac1d20476 100644 --- a/lib/taskana-core/src/test/resources/taskana.properties +++ b/lib/taskana-core/src/test/resources/taskana.properties @@ -1,9 +1,8 @@ -taskana.roles.user= teamlead-1 | teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2 -taskana.roles.Admin=admin |uid=admin,cn=users,OU=Test,O=TASKANA -taskana.roles.businessadmin=businessadmin|TEAMLEAD-2 -taskana.roles.monitor=monitor +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA +taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA +taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA taskana.roles.taskadmin=taskadmin - taskana.domains=Domain_A , DOMAIN_B taskana.classification.types=TASK , document taskana.classification.categories.task=EXTERNAL, manual, autoMAtic, Process diff --git a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql b/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql index 961373e98..47f12477f 100644 --- a/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql +++ b/lib/taskana-data/src/main/resources/sql/sample-data/workbasket-access-list.sql @@ -9,23 +9,23 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000014', 'WBI:100000000000000000000000000000000014', 'user-b-1' , 'Bernd Bern' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000015', 'WBI:100000000000000000000000000000000015', 'user-b-2' , 'Brundhilde Bio' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); -- group internal access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -- teamlead substitution INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead-1' , 'Titus Toll' , true , true , true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -- cross team tranfers -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -- Team GPK access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); -- Cross team GPK access INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead-1' , 'Titus Toll' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); @@ -33,10 +33,10 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead-1' , 'Titus Toll' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -- Access to other domains -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -- Access to workbaskets for sorting test INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000900', 'WBI:000000000000000000000000000000000900', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); diff --git a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql b/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql index 961373e98..47f12477f 100644 --- a/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql +++ b/lib/taskana-data/src/main/resources/sql/test-data/workbasket-access-list.sql @@ -9,23 +9,23 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000014', 'WBI:100000000000000000000000000000000014', 'user-b-1' , 'Bernd Bern' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:B00000000000000000000000000000000015', 'WBI:100000000000000000000000000000000015', 'user-b-2' , 'Brundhilde Bio' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); -- group internal access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -- teamlead substitution INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead-1' , 'Titus Toll' , true , true , true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -- cross team tranfers -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -- Team GPK access -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); -- Cross team GPK access INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead-1' , 'Titus Toll' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead-2' , 'Frauke Faul' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); @@ -33,10 +33,10 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:10000000000000000000000000000000 INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000123', 'WBI:100000000000000000000000000000000010', 'teamlead-1' , 'Titus Toll' , true , false, false , false , false , false, false, false, false, false, false, false, false, false, false, false, false); -- Access to other domains -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012', 'cn=organisationseinheit ksc 1,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'WBI:100000000000000000000000000000000014', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); +INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000026', 'WBI:100000000000000000000000000000000015', 'cn=organisationseinheit ksc 2,cn=organisationseinheit ksc,cn=organisation,ou=test,o=taskana', 'KSC 2' , true , true , true , true , false , false, false, false, false, false, false, false, false, false, false, false, false); -- Access to workbaskets for sorting test INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000900', 'WBI:000000000000000000000000000000000900', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true); diff --git a/lib/taskana-spring-example/src/main/resources/taskana.properties b/lib/taskana-spring-example/src/main/resources/taskana.properties index 3b466a412..5af925012 100644 --- a/lib/taskana-spring-example/src/main/resources/taskana.properties +++ b/lib/taskana-spring-example/src/main/resources/taskana.properties @@ -1,7 +1,7 @@ -taskana.roles.user = group1 | group2|teamlead-1 | teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2| max|elena|simone -taskana.roles.Admin=name=konrad,Organisation=novatec|admin -taskana.roles.businessadmin=max|Moritz|businessadmin -taskana.roles.taskadmin=peter | taskadmin +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA +taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA +taskana.roles.taskadmin=taskadmin taskana.domains= Domain_A , DOMAIN_B taskana.classification.types= TASK , document diff --git a/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties b/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties index 645de2f9d..4e621dea0 100644 --- a/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties +++ b/rest/taskana-rest-spring-example-boot/src/main/resources/taskana.properties @@ -1,7 +1,7 @@ -taskana.roles.user = teamlead-1 |teamlead-2 |user-1-1| user-1-2| user-2-1| user-2-2 -taskana.roles.Admin=admin -taskana.roles.businessadmin=businessadmin| cn=business-admins,cn=groups,OU=Test,O=TASKANA -taskana.roles.monitor=teamlead-2 | monitor +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA +taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA +taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA taskana.roles.taskadmin=taskadmin taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C diff --git a/rest/taskana-rest-spring-example-common/src/main/resources/taskana-example.ldif b/rest/taskana-rest-spring-example-common/src/main/resources/taskana-example.ldif index 7685a4305..8d1b56686 100644 --- a/rest/taskana-rest-spring-example-common/src/main/resources/taskana-example.ldif +++ b/rest/taskana-rest-spring-example-common/src/main/resources/taskana-example.ldif @@ -25,6 +25,32 @@ objectclass: container ######################## # Users General ######################## +dn: uid=monitor,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Monitor +description: desc +uid: monitor +sn: Monitor +ou: Organisationseinheit/Organisationseinheit IT +cn: monitor monitor +userPassword: monitor + +dn: uid=taskadmin,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Task +description: desc +uid: taskadmin +sn: Admin +ou: Organisationseinheit/Organisationseinheit IT +cn: Task admin +userPassword: taskadmin + dn: uid=admin,cn=users,OU=Test,O=TASKANA objectclass: inetorgperson objectclass: organizationalperson @@ -101,7 +127,7 @@ objectclass: inetorgperson objectclass: organizationalperson objectclass: person objectclass: top -givenName: Frauke Faul +givenName: Frauke description: desc uid: teamlead-2 sn: Faul @@ -135,6 +161,36 @@ ou: Organisationseinheit/Organisationseinheit KSC/Organisationseinheit KSC 2 cn: Tim Schläfrig userPassword: user-2-1 +######################## +# Users Domäne B +######################## +dn: uid=user-b-1,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Bernd +description: desc +uid: user-b-1 +sn: Bern +ou: Organisationseinheit/Organisationseinheit B +cn: Bernd Bern +userPassword: user-b-1 + +dn: uid=user-b-2,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Brunhilde +description: desc +uid: user-b-2 +sn: Bio +ou: Organisationseinheit/Organisationseinheit B +cn: Brunhilde Bio +userPassword: user-b-2 + + ######################## # Groups ######################## @@ -157,6 +213,7 @@ objectclass: top dn: cn=business-admins,cn=groups,OU=Test,O=TASKANA uniquemember: uid=teamlead-1,cn=users,OU=Test,O=TASKANA uniquemember: uid=teamlead-2,cn=users,OU=Test,O=TASKANA +uniquemember: uid=businessadmin,cn=users,OU=Test,O=TASKANA cn: business-admins objectclass: groupofuniquenames objectclass: top @@ -191,3 +248,9 @@ uniquemember: uid=user-2-2,cn=users,OU=Test,O=TASKANA cn: Organisationseinheit KSC 2 objectclass: groupofuniquenames objectclass: top + +dn: cn=Organisationseinheit B,cn=organisation,OU=Test,O=TASKANA +cn: Organisationseinheit B +objectclass: groupofuniquenames +objectclass: top + diff --git a/rest/taskana-rest-spring-example-common/src/test/resources/taskana-test.ldif b/rest/taskana-rest-spring-example-common/src/test/resources/taskana-test.ldif index 50c6347ad..8d1b56686 100644 --- a/rest/taskana-rest-spring-example-common/src/test/resources/taskana-test.ldif +++ b/rest/taskana-rest-spring-example-common/src/test/resources/taskana-test.ldif @@ -25,6 +25,32 @@ objectclass: container ######################## # Users General ######################## +dn: uid=monitor,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Monitor +description: desc +uid: monitor +sn: Monitor +ou: Organisationseinheit/Organisationseinheit IT +cn: monitor monitor +userPassword: monitor + +dn: uid=taskadmin,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Task +description: desc +uid: taskadmin +sn: Admin +ou: Organisationseinheit/Organisationseinheit IT +cn: Task admin +userPassword: taskadmin + dn: uid=admin,cn=users,OU=Test,O=TASKANA objectclass: inetorgperson objectclass: organizationalperson @@ -101,7 +127,7 @@ objectclass: inetorgperson objectclass: organizationalperson objectclass: person objectclass: top -givenName: Frauke Faul +givenName: Frauke description: desc uid: teamlead-2 sn: Faul @@ -135,6 +161,36 @@ ou: Organisationseinheit/Organisationseinheit KSC/Organisationseinheit KSC 2 cn: Tim Schläfrig userPassword: user-2-1 +######################## +# Users Domäne B +######################## +dn: uid=user-b-1,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Bernd +description: desc +uid: user-b-1 +sn: Bern +ou: Organisationseinheit/Organisationseinheit B +cn: Bernd Bern +userPassword: user-b-1 + +dn: uid=user-b-2,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Brunhilde +description: desc +uid: user-b-2 +sn: Bio +ou: Organisationseinheit/Organisationseinheit B +cn: Brunhilde Bio +userPassword: user-b-2 + + ######################## # Groups ######################## @@ -192,3 +248,9 @@ uniquemember: uid=user-2-2,cn=users,OU=Test,O=TASKANA cn: Organisationseinheit KSC 2 objectclass: groupofuniquenames objectclass: top + +dn: cn=Organisationseinheit B,cn=organisation,OU=Test,O=TASKANA +cn: Organisationseinheit B +objectclass: groupofuniquenames +objectclass: top + diff --git a/rest/taskana-rest-spring-example-common/src/test/resources/taskana.properties b/rest/taskana-rest-spring-example-common/src/test/resources/taskana.properties index 4354bb091..2f49004ec 100644 --- a/rest/taskana-rest-spring-example-common/src/test/resources/taskana.properties +++ b/rest/taskana-rest-spring-example-common/src/test/resources/taskana.properties @@ -1,14 +1,12 @@ -taskana.roles.user = teamlead-1 |teamlead-2 |user-1-1| user-1-2| user-2-1| user-2-2 -taskana.roles.Admin=admin -taskana.roles.businessadmin=businessadmin| cn=business-admins,cn=groups,OU=Test,O=TASKANA -taskana.roles.monitor=teamlead-2 | monitor +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA +taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA +taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA taskana.roles.taskadmin=taskadmin - taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C taskana.classification.types=TASK,DOCUMENT -taskana.classification.categories.task= EXTERNAL, manual, autoMAtic, Process -taskana.classification.categories.document= EXTERNAL - +taskana.classification.categories.task=EXTERNAL, manual, autoMAtic, Process +taskana.classification.categories.document=EXTERNAL taskana.jobs.maxRetries=3 taskana.jobs.batchSize=50 taskana.jobs.cleanup.runEvery=P1D diff --git a/rest/taskana-rest-spring-example-wildfly/src/main/resources/taskana.properties b/rest/taskana-rest-spring-example-wildfly/src/main/resources/taskana.properties index 9a51f3c51..1798e6ac9 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/main/resources/taskana.properties +++ b/rest/taskana-rest-spring-example-wildfly/src/main/resources/taskana.properties @@ -1,7 +1,7 @@ -taskana.roles.user = teamlead-1 |teamlead-2 |user-1-1| user-1-1| user-1-2| user-2-1| user-2-2 -taskana.roles.Admin=admin -taskana.roles.businessadmin=businessadmin -taskana.roles.monitor=teamlead-2 | monitor +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA +taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA +taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA taskana.roles.taskadmin=taskadmin taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C,DEFAULT_DOMAIN diff --git a/rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana.properties b/rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana.properties index b0f407afd..a96fecaf1 100644 --- a/rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana.properties +++ b/rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana.properties @@ -1,7 +1,7 @@ -taskana.roles.user = teamlead-1 | teamlead-2 | user-1-1 | user-1-1 | user-1-2 | user-2-1 | user-2-2 -taskana.roles.Admin=admin -taskana.roles.businessadmin=businessadmin -taskana.roles.monitor=teamlead-2 | monitor +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA +taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA +taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA taskana.roles.taskadmin=taskadmin taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C diff --git a/rest/taskana-rest-spring/src/test/resources/taskana-test.ldif b/rest/taskana-rest-spring/src/test/resources/taskana-test.ldif index 89abc1ef0..8d1b56686 100644 --- a/rest/taskana-rest-spring/src/test/resources/taskana-test.ldif +++ b/rest/taskana-rest-spring/src/test/resources/taskana-test.ldif @@ -25,6 +25,32 @@ objectclass: container ######################## # Users General ######################## +dn: uid=monitor,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Monitor +description: desc +uid: monitor +sn: Monitor +ou: Organisationseinheit/Organisationseinheit IT +cn: monitor monitor +userPassword: monitor + +dn: uid=taskadmin,cn=users,OU=Test,O=TASKANA +objectclass: inetorgperson +objectclass: organizationalperson +objectclass: person +objectclass: top +givenName: Task +description: desc +uid: taskadmin +sn: Admin +ou: Organisationseinheit/Organisationseinheit IT +cn: Task admin +userPassword: taskadmin + dn: uid=admin,cn=users,OU=Test,O=TASKANA objectclass: inetorgperson objectclass: organizationalperson diff --git a/rest/taskana-rest-spring/src/test/resources/taskana.properties b/rest/taskana-rest-spring/src/test/resources/taskana.properties index a3263675e..a96fecaf1 100644 --- a/rest/taskana-rest-spring/src/test/resources/taskana.properties +++ b/rest/taskana-rest-spring/src/test/resources/taskana.properties @@ -1,7 +1,7 @@ -taskana.roles.user = teamlead-1 |teamlead-2 |user-1-1| user-1-2| user-2-1| user-2-2 -taskana.roles.Admin=admin +taskana.roles.user=teamlead-1 | teamlead-2 | user-1-1 | user-1-2 | user-2-1 | user-2-2 | user-b-1 | user-b-2 +taskana.roles.admin=admin | uid=admin,cn=users,OU=Test,O=TASKANA taskana.roles.businessadmin=businessadmin | cn=business-admins,cn=groups,OU=Test,O=TASKANA -taskana.roles.monitor=cn=monitor-users,cn=groups,OU=Test,O=TASKANA +taskana.roles.monitor=monitor | cn=monitor-users,cn=groups,OU=Test,O=TASKANA taskana.roles.taskadmin=taskadmin taskana.domains=DOMAIN_A,DOMAIN_B,DOMAIN_C