SHIBUI-2617

Fixing bug with the conditional ref not generating in the XML correctly (and causing the xml generation to fail)
TIER · Oct 4, 2023 · 45e8d0a · 45e8d0a
1 parent e6baac8
commit 45e8d0a
Showing 1 changed file with 1 addition and 19 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -126,7 +126,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     }
                     break
                 case AlgorithmFilterTarget.AlgorithmFilterTargetType.CONDITION_REF:
-                    ConditionRef(xmlObject.getValue())
+                    ConditionRef(filter.algorithmFilterTarget.getValue().get(0))
                     break
                 case AlgorithmFilterTarget.AlgorithmFilterTargetType.CONDITION_SCRIPT:
                     ConditionScript() {
@@ -140,24 +140,6 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                     // do nothing, we'd have exploded elsewhere previously.
                     break
             }
-//            filter.unknownXMLObjects.each { xmlObject ->
-//                {
-//                    if (xmlObject instanceof Entity) {
-//                        Entity(xmlObject.getValue())
-//                    } else if (xmlObject instanceof ConditionRef) {
-//                        ConditionRef(xmlObject.getValue())
-//                    } else if (xmlObject instanceof ConditionScript) {
-//                        ConditionScript() {
-//                            Script() {
-//                                def script = xmlObject.getValue()
-//                                mkp.yieldUnescaped("\n<![CDATA[\n${script}\n]]>\n")
-//                            }
-//                        }
-//                    } else {
-//                        mkp.yieldUnescaped(openSamlObjects.marshalToXmlString(xmlObject, false))
-//                    }
-//                }
-//            }
         }
     }