1 files changed, 6 insertions, 2 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 3288e064f..6a2fe3bfc 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
@@ -54,6 +54,7 @@ public class AuthenticationRequest implements IAction {
 
         this.moaSession = moasession;
         this.moaStorkAuthnRequest = (MOASTORKAuthnRequest)req;
+        try{
         MISMandate mandate = moasession.getMISMandate();
         String owbpk = mandate.getOWbPK();
         byte[] mand = mandate.getMandate();
@@ -63,6 +64,7 @@ public class AuthenticationRequest implements IAction {
 
 
         Logger.debug("mandate encoded: " + new String(org.bouncycastle.util.encoders.Base64.encode(mand)));
+} catch (Exception x) {}
 
         Logger.debug("Starting AuthenticationRequest");
         //AuthenticationServer.getInstance().startSTORKAuthentication(httpReq, httpResp, moasession);
@@ -72,7 +74,9 @@ public class AuthenticationRequest implements IAction {
         httpResp.reset();
 
         STORKAuthnResponse authnResponse = new STORKAuthnResponse();
-        authnResponse.setCountry("EU");
+        authnResponse.setCountry(((MOASTORKAuthnRequest)req).getStorkAuthnRequest().getSpCountry());
+
+
 
         OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
         if (oaParam == null)
@@ -137,7 +141,7 @@ public class AuthenticationRequest implements IAction {
 
         // Define attribute list to be populated
         PersonalAttributeList attributeList = new PersonalAttributeList();
-        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(moaSession.getIdentityLink());
+        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(moaSession.getIdentityLink(), moaStorkAuthnRequest);
 
         try {
             for (PersonalAttribute personalAttribute : attrLst) {