aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-06-17 13:21:04 +0200
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-06-17 13:21:04 +0200
commit01a5b6d2e226f1b6c25fbc71eb90a00adc086f40 (patch)
treee694749a340ae35e4e53c06891cad7feb7e301e9 /id
parentd33435f5b605ebe8962ea3ef2aa795520a3829d0 (diff)
downloadmoa-id-spss-01a5b6d2e226f1b6c25fbc71eb90a00adc086f40.tar.gz
moa-id-spss-01a5b6d2e226f1b6c25fbc71eb90a00adc086f40.tar.bz2
moa-id-spss-01a5b6d2e226f1b6c25fbc71eb90a00adc086f40.zip
harmonizing notavailable attribute
Diffstat (limited to 'id')
-rw-r--r--id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml5
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java3
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java3
3 files changed, 8 insertions, 3 deletions
diff --git a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml
index 911d0e69b..ef5dc23d2 100644
--- a/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml
+++ b/id/server/data/deploy/conf/moa-id/stork/StorkSamlEngine_VIDP.xml
@@ -112,6 +112,9 @@
<entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
<entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
<entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</entry>
- <entry key="mandateContent">http://www.stork.gov.eu/1.0/mandate</entry>
+
+ <entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry>
+ <entry key="representative">http://www.stork.gov.eu/1.0/representative</entry>
+ <entry key="represented">http://www.stork.gov.eu/1.0/represented</entry>
</properties>
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
index fce2a01cf..456baf49f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
@@ -44,6 +44,7 @@ import at.gv.egovernment.moa.id.storage.AssertionStorage;
import at.gv.egovernment.moa.logging.Logger;
import eu.stork.peps.auth.commons.*;
import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.complex.attributes.AttributeStatusType;
import eu.stork.peps.exceptions.STORKSAMLEngineException;
import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
@@ -197,7 +198,7 @@ public class AttributeCollector implements IAction {
* This way, there is no error case in which an attribute is left unanswered.
*/
IPersonalAttributeList aquiredAttributes = new PersonalAttributeList();
- currentAttribute.setStatus("notAvailable");
+ currentAttribute.setStatus(AttributeStatusType.NOT_AVAILABLE.value());
aquiredAttributes.add((PersonalAttribute) currentAttribute.clone());
addOrUpdateAll(container.getResponse().getPersonalAttributeList(), aquiredAttributes);
// - check if we can find a suitable AttributeProvider Plugin
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
index edbe0b58c..2b00f15e2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
@@ -41,6 +41,7 @@ import eu.stork.peps.auth.commons.PEPSUtil;
import eu.stork.peps.auth.commons.PersonalAttribute;
import eu.stork.peps.auth.commons.STORKAuthnResponse;
import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.complex.attributes.AttributeStatusType;
import eu.stork.peps.exceptions.STORKSAMLEngineException;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
@@ -79,7 +80,7 @@ public class ConsentEvaluator implements IAction {
// evaluate response
for(PersonalAttribute current : container.getResponse().getPersonalAttributeList()) {
if(null == httpReq.getParameter(current.getName())) {
- current.setStatus("notAvailable");
+ current.setStatus(AttributeStatusType.NOT_AVAILABLE.value());
current.setValue(new ArrayList<String>());
current.setComplexValue(new HashMap<String, String>());
}