resolving errors related to attrrequest generation and ehvd handling

5 files changed, 15 insertions, 4 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 8e66db384..a5690a883 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
@@ -75,7 +75,7 @@ public class AuthenticationRequest implements IAction {
 
         this.authData = authData;
 
-        if ((req instanceof MOASTORKRequest) && ((MOASTORKRequest) req).getCitizenCountryCode().equals("AT")) {
+        if ((req instanceof MOASTORKRequest) && ( ((MOASTORKRequest) req).getCitizenCountryCode() == null || ((MOASTORKRequest) req).getCitizenCountryCode().equals("AT") )) {
 
             this.moaStorkRequest = (MOASTORKRequest) req;
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
index 2cd2af121..fb62e43e5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
@@ -51,6 +51,7 @@ import at.gv.egovernment.moa.logging.Logger;
 import eu.stork.peps.auth.commons.IPersonalAttributeList;
 import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.peps.auth.commons.PersonalAttributeList;
+import eu.stork.peps.complex.attributes.IsHealthCareProfessionalDeprecatedType;
 import eu.stork.peps.complex.attributes.IsHealthCareProfessionalType;
 import eu.stork.peps.complex.attributes.ObjectFactory;
 
@@ -185,7 +186,7 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), "NotAvailable");
 			} else {
 				// go on and parse the data
-				IsHealthCareProfessionalType result = new IsHealthCareProfessionalType();
+                IsHealthCareProfessionalDeprecatedType result = new IsHealthCareProfessionalDeprecatedType();
 				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
 
 				if (collection.get("Type").equals("Medical doctor"))
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/StorkAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/StorkAttributeRequestProvider.java
index 7a50024f1..d7e2cdf58 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/StorkAttributeRequestProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/StorkAttributeRequestProvider.java
@@ -157,7 +157,7 @@ public class StorkAttributeRequestProvider extends AttributeProvider {
 			Logger.error("Could not sign STORK SAML AttrRequest.", e);
 			throw new MOAIDException("stork.00", null);
 		}
-
+        Logger.info("Using citizen country code: " + attributeRequest.getCitizenCountryCode());
 		Logger.info("STORK AttrRequest successfully signed!");
 		
 		try {
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java
index e57769254..b9798537c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHealthCareProfessionalDeprecatedType.java
@@ -6,7 +6,7 @@
 //
 
 
-package eu.stork.names.tc.stork._1_0.assertion;
+package eu.stork.peps.complex.attributes;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java
index eca4ca3de..f80a4321c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/ObjectFactory.java
@@ -403,6 +403,16 @@ public class ObjectFactory {
         return new JAXBElement<IsHealthCareProfessionalType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value);

     }

 

+

+    /**

+     * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}}

+     *

+     */

+    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional")

+    public JAXBElement<IsHealthCareProfessionalDeprecatedType> createIsHealthCareProfessional(IsHealthCareProfessionalDeprecatedType value) {

+        return new JAXBElement<IsHealthCareProfessionalDeprecatedType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value);

+    }

+

     /**

      * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}}

      *