SAML TR added without custom RP configuration doesn't work #490 - tem…

…plates fix
GluuFederation · May 5, 2017 · 681ad2b · 681ad2b
1 parent 7350f76
commit 681ad2b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/configuration/template/shibboleth3/idp/metadata-providers.xml.vm b/configuration/template/shibboleth3/idp/metadata-providers.xml.vm
@@ -25,7 +25,6 @@
     <!-- ========================================================================================== -->
 
 #foreach( $trustRelationship in $trustParams.trusts )
-    #if($trustRelationship.specificRelyingPartyConfig and (not $trustRelationship.isFederation()))
 
         #set ($profileConfigMap = $trustRelationship.profileConfigurations)
         #if(!$profileConfigMap.isEmpty())
@@ -65,7 +64,6 @@
             #end
 
         #end
-    #end
 #end
 
 </MetadataProvider>
diff --git a/configuration/template/shibboleth3/idp/relying-party.xml.vm b/configuration/template/shibboleth3/idp/relying-party.xml.vm
@@ -68,7 +68,7 @@
     <util:list id="shibboleth.RelyingPartyOverrides">
 
 #foreach( $trustRelationship in $trustParams.trusts )
-    #if($trustRelationship.specificRelyingPartyConfig and (not $trustRelationship.isFederation()))
+
 
         #set ($profileConfigMap = $trustRelationship.profileConfigurations)
         #if(!$profileConfigMap.isEmpty())
@@ -79,6 +79,7 @@
         <bean parent="RelyingPartyByName" id="$relyingPartyId" c:relyingPartyIds="$entityId">
             <property name="profileConfigurations">
                 <list>
+            #if($trustRelationship.specificRelyingPartyConfig and (not $trustRelationship.isFederation()))
                 #foreach ($mapEntry in $profileConfigMap.entrySet())
 
                     #set($profileConfig = $mapEntry.value)
@@ -284,12 +285,11 @@
 
                     #end
                 #end
-
+            #end
                 </list>
             </property>
         </bean>
         #end
-    #end
 #end
 
     </util:list>