1 files changed, 17 insertions, 17 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
index 7269e361c..a3996d52b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -5,6 +5,7 @@ import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.data.IAuthData;
 import at.gv.egovernment.moa.id.data.SLOInformationInterface;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IRequest;
@@ -34,13 +35,13 @@ public class AuthenticationRequest implements IAction {
 
 
     private VelocityEngine velocityEngine;
-    private AuthenticationSession moaSession = null;
+    private IAuthData authData = null;
     private MOASTORKRequest moaStorkRequest = null;
 
 
-    public SLOInformationInterface processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
+    public SLOInformationInterface processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, IAuthData authData) throws MOAIDException {
 
-        this.moaSession = moasession;
+        this.authData = authData;
 
         if (req instanceof MOASTORKRequest) {
 
@@ -49,9 +50,10 @@ public class AuthenticationRequest implements IAction {
             Logger.debug("Entering MOASTORKRequest");
             httpResp.reset();
             
-            OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+            //TODO: CHECK: req.getOAURL() should return the unique OA identifier
+            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();
             
@@ -77,7 +79,7 @@ public class AuthenticationRequest implements IAction {
                 }
 
                 // Get personal attributtes from MOA/IdentityLink
-                moaStorkResponse.setPersonalAttributeList(populateAttributes());
+                moaStorkResponse.setPersonalAttributeList(populateAttributes(oaParam));
 
 
             }
@@ -115,7 +117,7 @@ public class AuthenticationRequest implements IAction {
             Logger.debug("Data container prepared");
 
             //TODO: in case of Single LogOut -> SLO information has to be stored
-            return (new AttributeCollector()).processRequest(container, httpReq, httpResp, moasession, oaParam);
+            return (new AttributeCollector()).processRequest(container, httpReq, httpResp, authData, oaParam);
         } else {
             Logger.error("Could not recognize request.");
             throw new MOAIDException("stork.15", null);
@@ -137,16 +139,16 @@ public class AuthenticationRequest implements IAction {
 
 
     // does nothing
-    public void mandate(AuthenticationSession moasession) {
+    public void mandate(IAuthData authData) {
 
-        if (moasession.getUseMandate()) {
+        if (authData.isUseMandate()) {
             try {
-                MISMandate mandate = moasession.getMISMandate();
+                MISMandate mandate = authData.getMISMandate();
                 String owbpk = mandate.getOWbPK();
                 byte[] mand = mandate.getMandate();
                 String profprep = mandate.getProfRep();
                 //String textdesc = mandate.getTextualDescriptionOfOID();
-                Element mndt = moasession.getMandate();
+                Element mndt = authData.getMandate();
 
                 iterate(mndt.getAttributes());
                 Logger.debug("mandate encoded: " + new String(org.bouncycastle.util.encoders.Base64.encode(mand)));
@@ -158,14 +160,14 @@ public class AuthenticationRequest implements IAction {
 
     }
 
-    public PersonalAttributeList populateAttributes() {
+    public PersonalAttributeList populateAttributes(OAAuthParameter oaParam) {
 
         IPersonalAttributeList attrLst = moaStorkRequest.getStorkAuthnRequest().getPersonalAttributeList();
         Logger.info("Found " + attrLst.size() + " personal attributes in the request.");
 
         // Define attribute list to be populated
         PersonalAttributeList attributeList = new PersonalAttributeList();
-        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(moaSession.getIdentityLink(), moaStorkRequest);
+        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(authData.getIdentityLink(), moaStorkRequest);
 
         try {
             for (PersonalAttribute personalAttribute : attrLst) {
@@ -176,10 +178,8 @@ public class AuthenticationRequest implements IAction {
             Logger.error("Exception, attributes: " + e.getMessage());
         }
 
-        Logger.debug("AUTHBLOCK " + moaSession.getAuthBlock());
-        Logger.debug("TARGET " + moaSession.getTarget() + " " + moaSession.getTargetFriendlyName());
-        Logger.debug("SESSION IDENTIFIER " + moaSession.getCcc() + " " + moaSession.getDomainIdentifier());
-        Logger.debug("AUTHBLOCKTOKKEN" + moaSession.getAuthBlockTokken());
+        Logger.debug("AUTHBLOCK " + authData.getAuthBlock());
+        Logger.debug("SESSION IDENTIFIER " + authData.getCcc() + " " + oaParam.getIdentityLinkDomainIdentifier());
 
         return attributeList;
     }