Added support to insert a reference to an organization or role into o…

…peratorRef. - Members of the organizations (direct only) or roles can be used as operators of manual applications - only org:default relation.
Evolveum · Jun 21, 2021 · 94e4635 · 94e4635
1 parent 506aaf0
commit 94e4635
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -8061,7 +8061,7 @@
                 <xsd:annotation>
                     <xsd:documentation>
                         Reference to users that should execute operations on manual resources.
-                        It may point to user or organization. (Currently only users are supported.)
+                        It may point to user, role (only role members) or organization (only direct org. members).
                         If more than one operator is specified they are considered equivalent.
                     </xsd:documentation>
                     <xsd:appinfo>

diff --git a/...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java b/...ain/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java
@@ -226,7 +226,31 @@ private PrismObject<CaseType> addCase(String operation, String description, Stri
         ResourceBusinessConfigurationType businessConfiguration = resource.asObjectable().getBusiness();
         List<ObjectReferenceType> operators = new ArrayList<>();
         if (businessConfiguration != null) {
-            operators.addAll(businessConfiguration.getOperatorRef());
+            businessConfiguration.getOperatorRef().stream().forEach((ObjectReferenceType operatorRef) -> {
+
+                if (operatorRef.getType().equals(RoleType.COMPLEX_TYPE)
+                        || operatorRef.getType().equals(OrgType.COMPLEX_TYPE)) {
+                    ObjectQuery membersQuery = getPrismContext().queryFor(UserType.class)
+                            .type(UserType.class)
+                            .item(FocusType.F_ROLE_MEMBERSHIP_REF)
+                            .ref(getPrismContext().itemFactory().createReferenceValue(operatorRef.getOid()))
+                            .build();
+
+                    List<PrismObject<UserType>> members = null;
+
+                    try {
+                        members = repositoryService.searchObjects(UserType.class, membersQuery, null, result);
+                    } catch (SchemaException ex) {
+                        LOGGER.error("Manual connector could not find members in operators role {}", ex);
+                    }
+
+                    if (members != null && !members.isEmpty()) {
+                        operators.addAll(ObjectTypeUtil.objectListToReferences(members));
+                    }
+                } else {
+                    operators.add(operatorRef);
+                }
+            });
         }
         if (operators.isEmpty() && configuration.getDefaultAssignee() != null) {
             ObjectQuery query = getPrismContext().queryFor(UserType.class)