1 files changed, 9 insertions, 11 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
index 9c7f45146..811d828e1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
@@ -3,6 +3,8 @@ package at.gv.egovernment.moa.id.protocols.stork2;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.data.IAuthData;
+import at.gv.egovernment.moa.id.data.SLOInformationInterface;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.moduls.IAction;
@@ -28,28 +30,26 @@ import javax.xml.namespace.QName;
 import java.io.StringWriter;
 import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  *
  */
 public class MandateRetrievalRequest implements IAction {
 
-    private AuthenticationSession moaSession;
+    private IAuthData authData;
     private MOASTORKRequest moaStorkRequest;
 
-    public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
+    public SLOInformationInterface processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, IAuthData authData) throws MOAIDException {
         Logger.debug("Entering AttributeRequest for MandateProvider");
         httpResp.reset();
-        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(req.getOAURL());
         if (oaParam == null)
-            throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
+            throw new AuthenticationException("stork.12", new Object[]{req.getOAURL()});
 
         MOASTORKResponse moaStorkResponse = new MOASTORKResponse();
         STORKAttrQueryResponse attrResponse = new STORKAttrQueryResponse();
 
-        this.moaSession = moasession;
+        this.authData = authData;
 
         if ((req instanceof MOASTORKRequest)) {
             this.moaStorkRequest = (MOASTORKRequest) req;
@@ -63,10 +63,10 @@ public class MandateRetrievalRequest implements IAction {
             MandateContainer mandateContainer = null;
 
             try {
-                mandateContainer = new CorporateBodyMandateContainer(new String(moaSession.getMISMandate().getMandate(), "UTF-8"));
+                mandateContainer = new CorporateBodyMandateContainer(new String(authData.getMISMandate().getMandate(), "UTF-8"));
             } catch (Exception ex) {
                 try {
-                    mandateContainer = new PhyPersonMandateContainer(new String(moaSession.getMISMandate().getMandate(), "UTF-8"));
+                    mandateContainer = new PhyPersonMandateContainer(new String(authData.getMISMandate().getMandate(), "UTF-8"));
                 } catch (Exception ex2) {
                     Logger.error("Could not extract data and create mandate container.");
                     throw new MOAIDException("stork.16", new Object[] {}); // TODO
@@ -285,6 +285,4 @@ public class MandateRetrievalRequest implements IAction {
     public String getDefaultActionName() {
         return STORKProtocol.MANDATERETRIEVALREQUEST;
     }
-
-
 }