Move AttributeReleaseAs filter to Output filtering

The Consent screen does not have to show the updated attribute name change. As this is purely to serve the SP in getting the familiar attributes. The end user should not be concerned with the dialect of the SP. The attribute is still released, only the name is changed.
OpenConext · Aug 14, 2024 · 9530940 · 9530940
1 parent 8039220
commit 9530940
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/library/EngineBlock/Corto/Filter/Input.php b/library/EngineBlock/Corto/Filter/Input.php
@@ -93,9 +93,6 @@ public function getCommands()
 
             // Apply the Attribute Release Policy before we do consent.
             new EngineBlock_Corto_Filter_Command_AttributeReleasePolicy(),
-
-            // Apply the 'release as' logic
-            new EngineBlock_Corto_Filter_Command_AttributeReleaseAs()
         );
 
         if (!$featureConfiguration->isEnabled('eb.run_all_manipulations_prior_to_consent')) {

diff --git a/library/EngineBlock/Corto/Filter/Output.php b/library/EngineBlock/Corto/Filter/Output.php
@@ -68,6 +68,9 @@ public function getCommands()
             // Then don't continue with the rest of the modifications
             new EngineBlock_Corto_Filter_Command_RejectProcessingMode(),
 
+            // Apply the ARP 'release_as' logic
+            new EngineBlock_Corto_Filter_Command_AttributeReleaseAs(),
+
             // Run custom attribute manipulations
             new EngineBlock_Corto_Filter_Command_RunAttributeManipulations(
                 EngineBlock_Corto_Filter_Command_RunAttributeManipulations::TYPE_SP

diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeReleasePolicy.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/AttributeReleasePolicy.feature
@@ -81,10 +81,11 @@ Feature:
     When I log in at "Release As"
     And I pass through EngineBlock
     And I pass through the IdP
-    Then the response should not contain "urn:mace:dir:attribute-def:uid"
-    And the response should contain "UiD"
+    Then the response should contain "urn:mace:dir:attribute-def:uid"
+    And the response should not contain "UiD"
     When I give my consent
     And I pass through EngineBlock
+    # The release_as logic is applied after consent
     Then the response should not contain "urn:mace:dir:attribute-def:uid"
     And the response should contain "UiD"
 

diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/ServiceRegistryFixture.php b/src/OpenConext/EngineBlockFunctionalTestingBundle/Fixtures/ServiceRegistryFixture.php
@@ -43,8 +43,7 @@
 use SAML2\Constants;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @SuppressWarnings(PHPMD.TooManyPublicMethods)
+ * @SuppressWarnings("PMD")
  */
 class ServiceRegistryFixture
 {