From 45e8d0a5a1e5d855465f57216e11427686c51064 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 4 Oct 2023 16:43:38 -0700
Subject: [PATCH] SHIBUI-2617

Fixing bug with the conditional ref not generating in the XML correctly (and causing the xml generation to fail)
---
 .../JPAMetadataResolverServiceImpl.groovy     | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index c92544cbf..49376aaec 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/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))
-//                    }
-//                }
-//            }
         }
     }