Part of OpenConext/OpenConext-Invite#410

Author: oharsta

manage-server/src/main/java/manage/hook/ProvisioningHook.java

@@ -64,7 +64,7 @@ private void validate(MetaData newMetaData) {
         Schema schema = metaDataAutoConfiguration.schema(EntityType.PROV.getType());
         String provisioningType = (String) metaDataFields.get("provisioning_type");
         Map.of(
-                "scim", List.of("scim_url", "scim_user", "scim_password"),
+                "scim", List.of("scim_url"),
                 "graph", List.of("graph_client_id", "graph_secret", "graph_tenant"),
                 "eva", List.of("eva_url", "eva_token")
         ).forEach((type, required) -> {
@@ -77,6 +77,18 @@ private void validate(MetaData newMetaData) {
                 });
             }
         });
+        if (provisioningType.equals("scim")) {
+            if (!StringUtils.hasText((String) metaDataFields.get("scim_bearer_token"))) {
+                List.of("scim_user", "scim_password").forEach(attribute -> {
+                    if (!StringUtils.hasText((String) metaDataFields.get(attribute))) {
+                        failures.add(new ValidationException(schema,
+                                String.format("%s is required with provisioningType scim when no scim_bearer_token is configured",
+                                        attribute), attribute));
+                    }
+                });
+
+            }
+        }
         ValidationException.throwFor(schema, failures);
     }
 

manage-server/src/test/java/manage/hook/ProvisioningHookTest.java

@@ -58,6 +58,13 @@ public void prePost() {
         assertThrows(ValidationException.class, () -> provisioningHook.prePost(metaData, apiUser));
     }
 
+    @Test
+    public void prePostValid() {
+        MetaData metaData = new MetaData(EntityType.PROV.getType(), new HashMap<>(Map.of("metaDataFields",
+                Map.of("provisioning_type", "scim", "scim_url", "http://scim", "scim_bearer_token", "token"))));
+        provisioningHook.prePost(metaData, apiUser);
+    }
+
     @Test
     @SuppressWarnings("unchecked")
     public void prePostEduIDScimProvisioningMissingInstitutionGUID() {