fix(matching): store pendingRequest and set relayState again in case of ms-connector staging

1 files changed, 9 insertions, 3 deletions

diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java
index b18c6a36..690ce0bd 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java
@@ -49,6 +49,7 @@ import at.gv.egiz.eaaf.core.impl.idp.auth.data.EidAuthProcessDataWrapper;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import eu.eidas.auth.commons.EidasParameterKeys;
 import eu.eidas.auth.commons.light.ILightResponse;
+import eu.eidas.auth.commons.light.impl.LightResponse;
 import eu.eidas.auth.commons.tx.BinaryLightToken;
 import eu.eidas.specificcommunication.BinaryLightTokenHelper;
 import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
@@ -166,18 +167,23 @@ public class ReceiveAuthnResponseAlternativeTask extends AbstractAuthServletTask
   }
   
   private void forwardToOtherStage(HttpServletResponse response, ExecutionContext executionContext, 
-      ILightResponse eidasResponse, String stagingEndpoint) throws SpecificCommunicationException, IOException {
+      ILightResponse eidasResponse, String stagingEndpoint) 
+          throws SpecificCommunicationException, IOException, EaafException {
     executionContext.put(MsEidasNodeConstants.EXECCONTEXT_PARAM_MSCONNECTOR_STAGING, true);
-    
+                
     final SpecificCommunicationService specificConnectorCommunicationService =
         (SpecificCommunicationService) context.getBean(
             SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
-    BinaryLightToken token = specificConnectorCommunicationService.putResponse(eidasResponse);
+    BinaryLightToken token = specificConnectorCommunicationService.putResponse(
+        LightResponse.builder(eidasResponse).relayState(pendingReq.getPendingRequestId()).build());
     final String tokenBase64 = BinaryLightTokenHelper.encodeBinaryLightTokenBase64(token);    
     
     final UriComponentsBuilder redirectUrl = UriComponentsBuilder.fromHttpUrl(stagingEndpoint);
     redirectUrl.queryParam(EidasParameterKeys.TOKEN.toString(), tokenBase64);
 
+    // store pendingRequest
+    requestStoreage.storePendingRequest(pendingReq);
+    
     log.debug("Forward to other stage .... ");
     response.sendRedirect(redirectUrl.build().encode().toString());