1 files changed, 8 insertions, 2 deletions
diff --git a/id/server/modules/moa-id-module-ehvd_integration/src/main/java/at/gv/egovernment/moa/id/auth/modules/ehvd/task/InjectEhvdInformationTask.java b/id/server/modules/moa-id-module-ehvd_integration/src/main/java/at/gv/egovernment/moa/id/auth/modules/ehvd/task/InjectEhvdInformationTask.java
index 8f22c6ffc..ee5dbb2fd 100644
--- a/id/server/modules/moa-id-module-ehvd_integration/src/main/java/at/gv/egovernment/moa/id/auth/modules/ehvd/task/InjectEhvdInformationTask.java
+++ b/id/server/modules/moa-id-module-ehvd_integration/src/main/java/at/gv/egovernment/moa/id/auth/modules/ehvd/task/InjectEhvdInformationTask.java
@@ -37,6 +37,8 @@ import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSessionWrapper;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
+import at.gv.egovernment.moa.id.auth.modules.ehvd.ConfigurationProperties;
+import at.gv.egovernment.moa.id.auth.modules.ehvd.service.EhvdCommunicationService.EhvdResponseHolder;
 import at.gv.egovernment.moa.id.auth.modules.ehvd.service.IEhvdCommunication;
 import at.gv.egovernment.moa.id.commons.api.exceptions.MOAIDException;
 import at.gv.egovernment.moa.logging.Logger;
@@ -72,12 +74,16 @@ public class InjectEhvdInformationTask extends AbstractAuthServletTask {
       validateInternalState(session);
 
       // requesting roles from EHVD
-      final List<String> ehvdRoles = ehvdService.getRoles(session.getIdentityLink());
+      final EhvdResponseHolder ehvdResponse = ehvdService.getRoles(session.getIdentityLink());
 
       // inject EHVD roles
       session.setGenericDataToSession(PVPAttributeDefinitions.ROLES_NAME,
-          StringUtils.join(ehvdRoles, ";"));
+          StringUtils.join(ehvdResponse.getRoles(), ";"));
 
+      // inject full EHVD response
+      session.setGenericDataToSession(ConfigurationProperties.ATTRIBUTE_URN_EHVD_PREFIX, 
+          ehvdResponse.getFullGdaResponse());
+      
       // store MOASession into database
       requestStoreage.storePendingRequest(pendingReq);