Skip to content

Commit 9627a39

Browse files
ryzhebokaryzheboka
committed
small corrections
1 parent e236bc9 commit 9627a39

File tree

15 files changed

+63
-74
lines changed

15 files changed

+63
-74
lines changed

‎common/taskana-common-data/src/main/resources/sql/sample-data/workbasket-access-list.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:00000000000000000000000000000000
6464
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000909', 'WBI:000000000000000000000000000000000909', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
6565

6666
-- permissions
67-
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'perm:userleads' , 'PERM_1' , true , true , true , false , true , false, false, false, false, false, false, false, false, false, false, false, false, true , false);
68-
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'perm:userleads' , 'PERM_1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true );
69-
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000005', 'WBI:100000000000000000000000000000000012', 'perm:userleads' , 'PERM_1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, false , false);
67+
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'Taskana:CallCenter:AB:AB\/A:CallCenter' , 'PERM_1' , true , true , true , false , true , false, false, false, false, false, false, false, false, false, false, false, false, true , false);
68+
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'Taskana:CallCenter:AB:AB\/A:CallCenter' , 'PERM_1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true );
69+
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000005', 'WBI:100000000000000000000000000000000012', 'Taskana:CallCenter:AB:AB\/A:CallCenter' , 'PERM_1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, false , false);

‎common/taskana-common-data/src/main/resources/sql/test-data/workbasket-access-list.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:00000000000000000000000000000000
5353
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WBI:000000000000000000000000000000000909', 'WBI:000000000000000000000000000000000909', 'user-b-1' , 'Bern, Bernd' , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true , true);
5454

5555
-- permissions
56-
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'perm:userleads' , 'PERM_1' , true , true , true , false , true , false, false, false, false, false, false, false, false, false, false, false, false, true , false);
57-
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'perm:userleads' , 'PERM_1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true );
58-
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000005', 'WBI:100000000000000000000000000000000012', 'perm:userleads' , 'PERM_1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, false , false);
56+
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , true , true , false , true , false, false, false, false, false, false, false, false, false, false, false, false, true , false);
57+
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , false, true , true , false , false, false, false, false, false, false, false, false, false, false, false, false, true , true );
58+
INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:200000000000000000000000000000000005', 'WBI:100000000000000000000000000000000012', 'taskana:callcenter:ab:ab/a:callcenter' , 'PERM_1' , true , false, true , false , false , false, false, false, false, false, false, false, false, false, false, false, false, false , false);

‎lib/taskana-core/src/test/java/acceptance/AbstractAccTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class AbstractAccTest {
4040
public static final String GROUP_2_DN =
4141
"cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA";
4242
public static final String PERM_1 =
43-
"perm:userleads";
43+
"taskana:callcenter:ab:ab/a:callcenter";
4444

4545
protected static TaskanaConfiguration taskanaConfiguration;
4646
protected static TaskanaEngine taskanaEngine;

‎rest/taskana-rest-spring-example-common/src/main/resources/taskana-example.ldif

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ objectclass: top
138138
givenName: Elena
139139
description: desc
140140
memberOf: cn=ksc-users,cn=groups,OU=Test,O=TASKANA
141-
permission: perm:userleads
142-
permission: perm/other
141+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
142+
permission: Taskana:CallCenter:AB:AB/A:CallCenter-vip
143143
memberOf: cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA
144144
uid: user-1-2
145145
sn: Eifrig
@@ -189,7 +189,7 @@ givenName: Simone
189189
description: desc
190190
memberOf: cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA
191191
memberOf: cn=ksc-users,cn=groups,OU=Test,O=TASKANA
192-
permission: perm:userleads
192+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
193193
uid: user-2-1
194194
sn: Müller
195195
ou: Organisationseinheit/Organisationseinheit KSC/Organisationseinheit KSC 2
@@ -424,14 +424,14 @@ objectclass: top
424424
dn: cn=Taskana:CallCenter:AB:AB/A:CallCenter,cn=groups,OU=Test,O=TASKANA
425425
uniquemember: uid=user-1-2,cn=users,OU=Test,O=TASKANA
426426
uniquemember: uid=user-2-1,cn=users,OU=Test,O=TASKANA
427-
permission: perm:userleads
427+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
428428
cn: Taskana:CallCenter:AB:AB/A:CallCenter
429429
objectclass: groupofuniquenames
430430
objectclass: top
431431

432432
dn: cn=g02,cn=groups,OU=Test,O=TASKANA
433433
uniquemember: uid=user-1-2,cn=users,OU=Test,O=TASKANA
434-
permission: perm/other
434+
permission: Taskana:CallCenter:AB:AB/A:CallCenter-vip
435435
cn: g02
436436
objectclass: groupofuniquenames
437437
objectclass: top

‎rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/ldap/LdapEmptySearchRootsForUseDnForGroupsDisabledTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ void should_FindPermissionsForUser_When_UserIdIsProvided() throws Exception {
3232
ldapClient.searchPermissionsAccessIdHas("user-1-2");
3333
assertThat(permissions)
3434
.extracting(AccessIdRepresentationModel::getAccessId)
35-
.containsExactlyInAnyOrder("perm:userleads", "perm/other");
35+
.containsExactlyInAnyOrder("taskana:callcenter:ab:ab/a:callcenter",
36+
"taskana:callcenter:ab:ab/a:callcenter-vip");
3637
}
3738

3839
@Test
@@ -43,7 +44,7 @@ void should_ReturnFullDnForUser_When_AccessIdOfUserIsGiven() throws Exception {
4344

4445
@Test
4546
void should_ReturnFullDnForPermission_When_AccessIdOfPermissionIsGiven() throws Exception {
46-
String dn = ldapClient.searchDnForAccessId("perm/other");
47+
String dn = ldapClient.searchDnForAccessId("taskana:callcenter:ab:ab/a:callcenter-vip");
4748
assertThat(dn).isEqualTo("cn=g02,cn=groups,ou=test,o=taskana");
4849
}
4950
}

‎rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/ldap/LdapEmptySearchRootsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ void should_FindPermissionsForUser_When_UserIdIsProvided() throws Exception {
3131
ldapClient.searchPermissionsAccessIdHas("user-1-2");
3232
assertThat(permissions)
3333
.extracting(AccessIdRepresentationModel::getAccessId)
34-
.containsExactlyInAnyOrder("perm:userleads", "perm/other");
34+
.containsExactlyInAnyOrder("taskana:callcenter:ab:ab/a:callcenter",
35+
"taskana:callcenter:ab:ab/a:callcenter-vip");
3536
}
3637

3738
@Test
@@ -42,7 +43,7 @@ void should_ReturnFullDnForUser_When_AccessIdOfUserIsGiven() throws Exception {
4243

4344
@Test
4445
void should_ReturnFullDnForPermission_When_AccessIdOfPermissionIsGiven() throws Exception {
45-
String dn = ldapClient.searchDnForAccessId("perm/other");
46+
String dn = ldapClient.searchDnForAccessId("taskana:callcenter:ab:ab/a:callcenter-vip");
4647
assertThat(dn).isEqualTo("cn=g02,cn=groups,ou=test,o=taskana");
4748
}
4849
}

‎rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/ldap/LdapForUseDnForGroupsDisabledTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ void should_FindAllUsersAndGroupAndPermissions_When_SearchWithSubstringOfName()
2929
assertThat(usersGroupsPermissions)
3030
.extracting(AccessIdRepresentationModel::getAccessId)
3131
.containsExactlyInAnyOrder(
32-
"teamlead-1", "teamlead-2", "ksc-teamleads",
33-
"perm:userleads");
32+
"teamlead-1", "teamlead-2", "ksc-teamleads");
3433
}
3534

3635
@Test
@@ -58,7 +57,12 @@ void should_FindPermissionsForUser_When_UserIdIsProvided() throws Exception {
5857
ldapClient.searchPermissionsAccessIdHas("user-1-2");
5958
assertThat(permissions)
6059
.extracting(AccessIdRepresentationModel::getAccessId)
61-
.containsExactlyInAnyOrder("perm/other", "perm:userleads");
60+
.containsExactlyInAnyOrder("taskana:callcenter:ab:ab/a:callcenter-vip",
61+
"taskana:callcenter:ab:ab/a:callcenter");
62+
assertThat(permissions)
63+
.extracting(AccessIdRepresentationModel::getName)
64+
.containsExactlyInAnyOrder("Taskana:CallCenter:AB:AB/A:CallCenter-vip",
65+
"Taskana:CallCenter:AB:AB/A:CallCenter");
6266
}
6367

6468
@Test

‎rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/ldap/LdapTest.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ void should_FindAllUsersAndGroupAndPermissions_When_SearchWithSubstringOfName()
2626
assertThat(usersGroupsPermissions)
2727
.extracting(AccessIdRepresentationModel::getAccessId)
2828
.containsExactlyInAnyOrder(
29-
"teamlead-1", "teamlead-2", "cn=ksc-teamleads,cn=groups,ou=test,o=taskana",
30-
"perm:userleads");
29+
"teamlead-1", "teamlead-2", "cn=ksc-teamleads,cn=groups,ou=test,o=taskana");
3130
}
3231

3332
@Test
@@ -55,7 +54,12 @@ void should_FindPermissionsForUser_When_UserIdIsProvided() throws Exception {
5554
ldapClient.searchPermissionsAccessIdHas("user-1-2");
5655
assertThat(permissions)
5756
.extracting(AccessIdRepresentationModel::getAccessId)
58-
.containsExactlyInAnyOrder("perm/other", "perm:userleads");
57+
.containsExactlyInAnyOrder("taskana:callcenter:ab:ab/a:callcenter-vip",
58+
"taskana:callcenter:ab:ab/a:callcenter");
59+
assertThat(permissions)
60+
.extracting(AccessIdRepresentationModel::getName)
61+
.containsExactlyInAnyOrder("Taskana:CallCenter:AB:AB/A:CallCenter-vip",
62+
"Taskana:CallCenter:AB:AB/A:CallCenter");
5963
}
6064

6165
@Test

‎rest/taskana-rest-spring-example-wildfly/src/test/resources/taskana-test.ldif

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ objectclass: top
133133
givenName: Elena
134134
description: desc
135135
memberOf: cn=ksc-users,cn=groups,OU=Test,O=TASKANA
136-
permission: perm:userleads
137-
permission: perm/other
136+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
137+
permission: Taskana:CallCenter:AB:AB/A:CallCenter-vip
138138
memberOf: cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA
139139
uid: user-1-2
140140
sn: Eifrig
@@ -184,7 +184,7 @@ givenName: Simone
184184
description: desc
185185
memberOf: cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA
186186
memberOf: cn=ksc-users,cn=groups,OU=Test,O=TASKANA
187-
permission: perm:userleads
187+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
188188
uid: user-2-1
189189
sn: Müller
190190
ou: Organisationseinheit/Organisationseinheit KSC/Organisationseinheit KSC 2
@@ -419,14 +419,14 @@ objectclass: top
419419
dn: cn=Taskana:CallCenter:AB:AB/A:CallCenter,cn=groups,OU=Test,O=TASKANA
420420
uniquemember: uid=user-1-2,cn=users,OU=Test,O=TASKANA
421421
uniquemember: uid=user-2-1,cn=users,OU=Test,O=TASKANA
422-
permission: perm:userleads
422+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
423423
cn: Taskana:CallCenter:AB:AB/A:CallCenter
424424
objectclass: groupofuniquenames
425425
objectclass: top
426426

427427
dn: cn=g02,cn=groups,OU=Test,O=TASKANA
428428
uniquemember: uid=user-1-2,cn=users,OU=Test,O=TASKANA
429-
permission: perm/other
429+
permission: Taskana:CallCenter:AB:AB/A:CallCenter-vip
430430
cn: g02
431431
objectclass: groupofuniquenames
432432
objectclass: top

‎rest/taskana-rest-spring-test-lib/src/main/resources/taskana-test.ldif

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ objectclass: top
138138
givenName: Elena
139139
description: desc
140140
memberOf: cn=ksc-users,cn=groups,OU=Test,O=TASKANA
141-
permission: perm:userleads
142-
permission: perm/other
141+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
142+
permission: Taskana:CallCenter:AB:AB/A:CallCenter-vip
143143
memberOf: cn=Organisationseinheit KSC 1,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA
144144
uid: user-1-2
145145
sn: Eifrig
@@ -189,7 +189,7 @@ givenName: Simone
189189
description: desc
190190
memberOf: cn=Organisationseinheit KSC 2,cn=Organisationseinheit KSC,cn=organisation,OU=Test,O=TASKANA
191191
memberOf: cn=ksc-users,cn=groups,OU=Test,O=TASKANA
192-
permission: perm:userleads
192+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
193193
uid: user-2-1
194194
sn: Müller
195195
ou: Organisationseinheit/Organisationseinheit KSC/Organisationseinheit KSC 2
@@ -421,17 +421,17 @@ objectclass: top
421421
# Permissions
422422
########################
423423

424-
dn: cn=Taskana:CallCenter:AB:AB/A:CallCenter,cn=groups,OU=Test,O=TASKANA
424+
dn: cn=g01,cn=groups,OU=Test,O=TASKANA
425425
uniquemember: uid=user-1-2,cn=users,OU=Test,O=TASKANA
426426
uniquemember: uid=user-2-1,cn=users,OU=Test,O=TASKANA
427-
permission: perm:userleads
428-
cn: Taskana:CallCenter:AB:AB/A:CallCenter
427+
permission: Taskana:CallCenter:AB:AB/A:CallCenter
428+
cn: g01
429429
objectclass: groupofuniquenames
430430
objectclass: top
431431

432432
dn: cn=g02,cn=groups,OU=Test,O=TASKANA
433433
uniquemember: uid=user-1-2,cn=users,OU=Test,O=TASKANA
434-
permission: perm/other
434+
permission: Taskana:CallCenter:AB:AB/A:CallCenter-vip
435435
cn: g02
436436
objectclass: groupofuniquenames
437437
objectclass: top

‎rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/TaskanaEngineController.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.List;
44
import java.util.Map;
5-
import javax.naming.InvalidNameException;
65
import org.springframework.beans.factory.annotation.Autowired;
76
import org.springframework.hateoas.config.EnableHypermediaSupport;
87
import org.springframework.http.ResponseEntity;
@@ -16,7 +15,6 @@
1615
import pro.taskana.common.api.ConfigurationService;
1716
import pro.taskana.common.api.TaskanaEngine;
1817
import pro.taskana.common.api.security.CurrentUserContext;
19-
import pro.taskana.common.rest.ldap.LdapClient;
2018
import pro.taskana.common.rest.models.CustomAttributesRepresentationModel;
2119
import pro.taskana.common.rest.models.TaskanaUserInfoRepresentationModel;
2220
import pro.taskana.common.rest.models.VersionRepresentationModel;
@@ -30,19 +28,17 @@ public class TaskanaEngineController {
3028
private final TaskanaEngine taskanaEngine;
3129
private final CurrentUserContext currentUserContext;
3230
private final ConfigurationService configurationService;
33-
private final LdapClient ldapClient;
3431

3532
@Autowired
3633
TaskanaEngineController(
3734
TaskanaConfiguration taskanaConfiguration,
3835
TaskanaEngine taskanaEngine,
3936
CurrentUserContext currentUserContext,
40-
ConfigurationService configurationService, LdapClient ldapClient) {
37+
ConfigurationService configurationService) {
4138
this.taskanaConfiguration = taskanaConfiguration;
4239
this.taskanaEngine = taskanaEngine;
4340
this.currentUserContext = currentUserContext;
4441
this.configurationService = configurationService;
45-
this.ldapClient = ldapClient;
4642
}
4743

4844
/**
@@ -101,18 +97,13 @@ public ResponseEntity<Map<String, List<String>>> getClassificationCategoriesByTy
10197
* This endpoint computes all information of the current user.
10298
*
10399
* @return the information of the current user.
104-
* @throws InvalidNameException if the dn is invalid.
105100
*/
106101
@GetMapping(path = RestEndpoints.URL_CURRENT_USER)
107102
@Transactional(readOnly = true, rollbackFor = Exception.class)
108-
public ResponseEntity<TaskanaUserInfoRepresentationModel> getCurrentUserInfo()
109-
throws InvalidNameException {
103+
public ResponseEntity<TaskanaUserInfoRepresentationModel> getCurrentUserInfo() {
110104
TaskanaUserInfoRepresentationModel resource = new TaskanaUserInfoRepresentationModel();
111105
resource.setUserId(currentUserContext.getUserid());
112106
resource.setGroupIds(currentUserContext.getGroupIds());
113-
Map<String, List<String>> groupsAndPermissions =
114-
ldapClient.searchAccessIdForGroupsAndPermissionsByDn(currentUserContext.getGroupIds());
115-
resource.setPermissionIds(groupsAndPermissions.get("permissions"));
116107
taskanaConfiguration.getRoleMap().keySet().stream()
117108
.filter(taskanaEngine::isUserInRole)
118109
.forEach(resource.getRoles()::add);

‎rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/models/TaskanaUserInfoRepresentationModel.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ public class TaskanaUserInfoRepresentationModel
1515
/** All groups the current user is a member of. */
1616
private List<String> groupIds = new ArrayList<>();
1717
/** All permissions the current user has. */
18-
private List<String> permissionIds = new ArrayList<>();
19-
/** All taskana roles the current user fulfills. */
2018
private List<TaskanaRole> roles = new ArrayList<>();
2119

2220
public String getUserId() {
@@ -35,14 +33,6 @@ public void setGroupIds(List<String> groupIds) {
3533
this.groupIds = groupIds;
3634
}
3735

38-
public List<String> getPermissionIds() {
39-
return permissionIds;
40-
}
41-
42-
public void setPermissionIds(List<String> permissionIds) {
43-
this.permissionIds = permissionIds;
44-
}
45-
4636
public List<TaskanaRole> getRoles() {
4737
return roles;
4838
}
@@ -57,8 +47,6 @@ public void setRoles(List<TaskanaRole> roles) {
5747
+ userId
5848
+ ", groupIds="
5949
+ groupIds
60-
+ ", permissionIds="
61-
+ permissionIds
6250
+ ", roles="
6351
+ roles
6452
+ "]";

‎rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/AccessIdControllerForUseDnForGroupsDisabledIntTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ Stream<DynamicTest> should_ResolveAccessId_When_SearchingForDnOrCn() {
4949
Pair.of("ksc-use", "ksc-users"),
5050
Pair.of("user-b-2", "user-b-2"),
5151
Pair.of("User-b-2", "user-b-2"),
52-
Pair.of("perm:userleads", "perm:userleads"),
53-
Pair.of("cn=g02,cn=groups,OU=Test,O=TASKANA", "perm/other"));
52+
Pair.of("cn=g01,cn=groups,OU=Test,O=TASKANA",
53+
"taskana:callcenter:ab:ab/a:callcenter"),
54+
Pair.of("cn=g02,cn=groups,OU=Test,O=TASKANA",
55+
"taskana:callcenter:ab:ab/a:callcenter-vip"));
5456

5557
ThrowingConsumer<Pair<String, String>> test =
5658
pair -> {
@@ -162,8 +164,8 @@ void should_ReturnAccessIdsOfPermissionsTheAccessIdIsMemberOf_ifAccessIdOfUserIs
162164
.isNotNull()
163165
.extracting(AccessIdRepresentationModel::getAccessId)
164166
.usingElementComparator(String.CASE_INSENSITIVE_ORDER)
165-
.containsExactlyInAnyOrder("perm:userleads",
166-
"perm/other");
167+
.containsExactlyInAnyOrder("taskana:callcenter:ab:ab/a:callcenter",
168+
"taskana:callcenter:ab:ab/a:callcenter-vip");
167169
}
168170

169171
@Test
@@ -196,7 +198,7 @@ void should_ValidateAccessIdWithEqualsFilterAndReturnAccessIdsOfPermissionsAcces
196198
.extracting(AccessIdRepresentationModel::getAccessId)
197199
.usingElementComparator(String.CASE_INSENSITIVE_ORDER)
198200
.containsExactlyInAnyOrder(
199-
"perm:userleads");
201+
"taskana:callcenter:ab:ab/a:callcenter");
200202
}
201203

202204
@Test

0 commit comments

Comments
 (0)