diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-06-18 12:45:56 +0200 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-06-18 12:45:56 +0200 |
| commit | b306e4401b35752f447e0c861d403b6557d7f868 (patch) | |
| tree | 42a581627eb888caeb930e3f950e97c183624c03 /id/server/idserverlib/src/main/java/at/gv/egovernment | |
| parent | 9a8f7a81b57fd31616fe62cef21800b8cfb862c6 (diff) | |
| download | moa-id-spss-b306e4401b35752f447e0c861d403b6557d7f868.tar.gz moa-id-spss-b306e4401b35752f447e0c861d403b6557d7f868.tar.bz2 moa-id-spss-b306e4401b35752f447e0c861d403b6557d7f868.zip | |
resolving errors related to attrrequest generation and ehvd handling
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment')
3 files changed, 4 insertions, 3 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 { |