SHIBUI-2059

Missing json for bundles with attribute release
TIER · Sep 16, 2021 · 762fe32 · 762fe32
1 parent 4d68c38
commit 762fe32
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -1,29 +1,41 @@
 package edu.internet2.tier.shibboleth.admin.ui.service
 
 import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConfiguration
+import edu.internet2.tier.shibboleth.admin.ui.domain.AttributeBundle
 import edu.internet2.tier.shibboleth.admin.ui.domain.IRelyingPartyOverrideProperty
 import edu.internet2.tier.shibboleth.admin.ui.security.model.User
 import edu.internet2.tier.shibboleth.admin.ui.security.service.UserService
+import lombok.NoArgsConstructor
 import org.springframework.beans.factory.annotation.Autowired
 
 /**
  * @author Bill Smith (wsmith@unicon.net)
  */
+@NoArgsConstructor
 class JsonSchemaBuilderService {
+    @Autowired
+    AttributeBundleService attributeBundleService
 
     @Autowired
     CustomPropertiesConfiguration customPropertiesConfiguration
 
+    @Autowired
     UserService userService
 
-    JsonSchemaBuilderService(UserService userService) {
-        this.userService = userService
-    }
-
     void addReleaseAttributesToJson(Object json) {
-        json['enum'] = customPropertiesConfiguration.getAttributes().collect {
+        List<Object> result = new ArrayList<>()
+        List<String> resultNames = new ArrayList<>()
+        attributeBundleService.findAll().forEach({ bundle ->
+            result.add(bundle.getAttributes())
+            resultNames.add(bundle.getName())
+        })
+
+        result.addAll(customPropertiesConfiguration.getAttributes().collect {
             it['name']
-        }
+        })
+
+        json['enum'] = result
+        json['enumNames'] = resultNames
     }
 
     void addRelyingPartyOverridesToJson(Object json) {
@@ -79,4 +91,4 @@ class JsonSchemaBuilderService {
             serviceEnabled.remove('description')
         }
     }
-}
+}
diff --git a/...u/internet2/tier/shibboleth/admin/ui/configuration/JsonSchemaComponentsConfiguration.java b/...u/internet2/tier/shibboleth/admin/ui/configuration/JsonSchemaComponentsConfiguration.java
@@ -100,6 +100,6 @@ public JsonSchemaResourceLocationRegistry jsonSchemaResourceLocationRegistry(Res
 
     @Bean
     public JsonSchemaBuilderService jsonSchemaBuilderService(UserService userService) {
-        return new JsonSchemaBuilderService(userService);
+        return new JsonSchemaBuilderService();
     }
-}
+}