aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-03-24 10:43:55 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-03-24 10:43:55 +0100
commit859d7b200e1efa6caa1c72e32f22e61660b1b2ef (patch)
treecd43cac1a47d782e5bd0f32691cd95eddd51d793 /id/server
parent2360a1be1c26b360af0ef66e0c2d0b126b26719b (diff)
downloadmoa-id-spss-859d7b200e1efa6caa1c72e32f22e61660b1b2ef.tar.gz
moa-id-spss-859d7b200e1efa6caa1c72e32f22e61660b1b2ef.tar.bz2
moa-id-spss-859d7b200e1efa6caa1c72e32f22e61660b1b2ef.zip
update ELGA Mandate-Service client modul
Diffstat (limited to 'id/server')
-rw-r--r--id/server/doc/handbook/additional/additional.html250
-rw-r--r--id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/config/ELGAMandatesRequestBuilderConfiguration.java19
-rw-r--r--id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/tasks/ReceiveElgaMandateResponseTask.java4
3 files changed, 136 insertions, 137 deletions
diff --git a/id/server/doc/handbook/additional/additional.html b/id/server/doc/handbook/additional/additional.html
index 58990567c..00b36c4cd 100644
--- a/id/server/doc/handbook/additional/additional.html
+++ b/id/server/doc/handbook/additional/additional.html
@@ -311,104 +311,104 @@
<p>&nbsp;</p>
<table border="1" cellpadding="0" cellspacing="0" class="configtable">
<tr>
- <td width="131" valign="top"><p align="left"><strong>EventCode</strong></p></td>
- <td width="208" valign="top"><p align="left"><strong>Wert</strong></p></td>
- <td width="946" valign="top"><p align="left"><strong>Beschreibung</strong></p></td>
+ <td width="165" valign="top"><p align="left"><strong>EventCode</strong></p></td>
+ <td width="312" valign="top"><p align="left"><strong>Wert</strong></p></td>
+ <td width="1127" valign="top"><p align="left"><strong>Beschreibung</strong></p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3000</p></td>
- <td width="208" valign="top"><p align="left">Protokolltype</p></td>
- <td width="946" valign="top"><p>Type des verwendeten Authentifizierungsprotokolls (OpenID Connect, PVP2, STORK, SAML1)</p></td>
+ <td width="165" valign="top"><p align="center">3000</p></td>
+ <td width="312" valign="top"><p align="left">Protokolltype</p></td>
+ <td width="1127" valign="top"><p>Type des verwendeten Authentifizierungsprotokolls (OpenID Connect, PVP2, STORK, SAML1)</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3100</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>PVP 2.x Metadaten Request</p></td>
+ <td width="165" valign="top"><p align="center">3100</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>PVP 2.x Metadaten Request</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3101</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>PVP 2.x Authentifizierungsrequest</p></td>
+ <td width="165" valign="top"><p align="center">3101</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>PVP 2.x Authentifizierungsrequest</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3102</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>PVP 2.x Authentifizierungsresponse</p></td>
+ <td width="165" valign="top"><p align="center">3102</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>PVP 2.x Authentifizierungsresponse</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3103</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>PVP 2.x Single LogOut Request</p></td>
+ <td width="165" valign="top"><p align="center">3103</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>PVP 2.x Single LogOut Request</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3104</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>PVP 2.x Attribute Query (im Fall IDP Interfederation mit zwischen MOA-IDs)</p></td>
+ <td width="165" valign="top"><p align="center">3104</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>PVP 2.x Attribute Query (im Fall IDP Interfederation mit zwischen MOA-IDs)</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3200</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>OpenID Connect Auth Requsst</p></td>
+ <td width="165" valign="top"><p align="center">3200</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>OpenID Connect Auth Requsst</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3201</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>OpenID Connect Tokken Request</p></td>
+ <td width="165" valign="top"><p align="center">3201</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>OpenID Connect Tokken Request</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">3300</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>SAML1 StartAuthentication Request</p></td>
+ <td width="165" valign="top"><p align="center">3300</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>SAML1 StartAuthentication Request</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4000</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Identifizierungs- und Authentifizierungsprozess wurde gestartet</p></td>
+ <td width="165" valign="top"><p align="center">4000</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Identifizierungs- und Authentifizierungsprozess wurde gestartet</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4001</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Identifizierungs- und Authentifizierungsprozess wurde beendet</p></td>
+ <td width="165" valign="top"><p align="center">4001</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Identifizierungs- und Authentifizierungsprozess wurde beendet</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4002</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Anmeldeprozess mit Online Vollmachten</p></td>
+ <td width="165" valign="top"><p align="center">4002</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Anmeldeprozess mit Online Vollmachten</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4003</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Anmeldeprozess mit STORK</p></td>
+ <td width="165" valign="top"><p align="center">4003</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Anmeldeprozess mit STORK</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4004</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Anmeldeprozess mit Single Sign-On</p></td>
+ <td width="165" valign="top"><p align="center">4004</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Anmeldeprozess mit Single Sign-On</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4005</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Ung&uuml;ltige Single Sign-On Session</p></td>
+ <td width="165" valign="top"><p align="center">4005</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Ung&uuml;ltige Single Sign-On Session</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4006</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Benutzeranfrage f&uuml;r Single Sign-On Verwendung gestellt</p></td>
+ <td width="165" valign="top"><p align="center">4006</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Benutzeranfrage f&uuml;r Single Sign-On Verwendung gestellt</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4007</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Benutzerantwort f&uuml;r Single Sign-On Verwendung empfangen</p></td>
+ <td width="165" valign="top"><p align="center">4007</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Benutzerantwort f&uuml;r Single Sign-On Verwendung empfangen</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4008</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Anmeldeprozess &uuml;ber IDP F&ouml;deration</p></td>
+ <td width="165" valign="top"><p align="center">4008</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Anmeldeprozess &uuml;ber IDP F&ouml;deration</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4009</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>G&uuml;ltige Response von f&ouml;deriertem IDP erhalten</p></td>
+ <td width="165" valign="top"><p align="center">4009</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>G&uuml;ltige Response von f&ouml;deriertem IDP erhalten</p></td>
</tr>
<tr>
<td height="30" valign="top">4010</td>
@@ -416,74 +416,74 @@
<td valign="top">Verwendeter IDP f&uuml;r f&ouml;derierte Anmeldung</td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4011</p></td>
- <td width="208" valign="top"><p align="left">Service Identifikator</p></td>
- <td width="946" valign="top"><p>Eindeutiger Identifikator der/des Online-Applikation/Service an der/dem die Anmeldung erfolgt</p></td>
+ <td width="165" valign="top"><p align="center">4011</p></td>
+ <td width="312" valign="top"><p align="left">Service Identifikator</p></td>
+ <td width="1127" valign="top"><p>Eindeutiger Identifikator der/des Online-Applikation/Service an der/dem die Anmeldung erfolgt</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4110</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>BKU Auswahl gestartet</p></td>
+ <td width="165" valign="top"><p align="center">4110</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>BKU Auswahl gestartet</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4111</p></td>
- <td width="208" valign="top"><p align="left">Bkutype (z.b. online, handy, local)</p></td>
- <td width="946" valign="top"><p>Ausgew&auml;hlter BKU Type</p></td>
+ <td width="165" valign="top"><p align="center">4111</p></td>
+ <td width="312" valign="top"><p align="left">Bkutype (z.b. online, handy, local)</p></td>
+ <td width="1127" valign="top"><p>Ausgew&auml;hlter BKU Type</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4112</p></td>
- <td width="208" valign="top"><p align="left">URL</p></td>
- <td width="946" valign="top"><p>Verwendete BKU URL</p></td>
+ <td width="165" valign="top"><p align="center">4112</p></td>
+ <td width="312" valign="top"><p align="left">URL</p></td>
+ <td width="1127" valign="top"><p>Verwendete BKU URL</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4113</p></td>
- <td width="208" valign="top"><p align="left">IP Adresse</p></td>
- <td width="946" valign="top"><p>IP Adresse mit der die BKU Daten an MOA-ID liefert</p></td>
+ <td width="165" valign="top"><p align="center">4113</p></td>
+ <td width="312" valign="top"><p align="left">IP Adresse</p></td>
+ <td width="1127" valign="top"><p>IP Adresse mit der die BKU Daten an MOA-ID liefert</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4220</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Personenbindung ausgelesen und g&uuml;ltig validiert</p></td>
+ <td width="165" valign="top"><p align="center">4220</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Personenbindung ausgelesen und g&uuml;ltig validiert</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4221</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Signaturzertifikat ausgelesen und validiert</p></td>
+ <td width="165" valign="top"><p align="center">4221</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Signaturzertifikat ausgelesen und validiert</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4222</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>AuthBlock signiert und g&uuml;ltig validiert</p></td>
+ <td width="165" valign="top"><p align="center">4222</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>AuthBlock signiert und g&uuml;ltig validiert</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4223</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Wechsel in den Modus f&uuml;r ausl&auml;ndische Signaturkarten</p></td>
+ <td width="165" valign="top"><p align="center">4223</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Wechsel in den Modus f&uuml;r ausl&auml;ndische Signaturkarten</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4224</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>SZR-Gateway wird kontaktiert</p></td>
+ <td width="165" valign="top"><p align="center">4224</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>SZR-Gateway wird kontaktiert</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4225</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Personenbindung von SZR-Gateway erhalten</p></td>
+ <td width="165" valign="top"><p align="center">4225</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Personenbindung von SZR-Gateway erhalten</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4300</p></td>
- <td width="208" valign="top"><p align="left">ReferenceID des Vollmachtensystems</p></td>
- <td width="946" valign="top"><p>Online-Vollmachten Service wird kontaktiert</p></td>
+ <td width="165" valign="top"><p align="center">4300</p></td>
+ <td width="312" valign="top"><p align="left">ReferenceID des Vollmachtensystems</p></td>
+ <td width="1127" valign="top"><p>Online-Vollmachten Service wird kontaktiert</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4301</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Redirekt zum Online-Vollmachten Service</p></td>
+ <td width="165" valign="top"><p align="center">4301</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Redirekt zum Online-Vollmachten Service</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">4302</p></td>
- <td width="208" valign="top"><p align="left">&nbsp;</p></td>
- <td width="946" valign="top"><p>Vollmacht vom Online-Vollmachten Service erhalten</p></td>
+ <td width="165" valign="top"><p align="center">4302</p></td>
+ <td width="312" valign="top"><p align="left">&nbsp;</p></td>
+ <td width="1127" valign="top"><p>Vollmacht vom Online-Vollmachten Service erhalten</p></td>
</tr>
<tr>
<td valign="top">4400</td>
@@ -506,39 +506,39 @@
<td valign="top">Unvollst&auml;ndiger Single LogOut Prozess</td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5000</p></td>
- <td width="208" valign="top"><p align="left">bPK</p></td>
- <td width="946" valign="top"><p>bPK bei Vollmacht mit berufsm&auml;&szlig;igem Parteienvertreter oder Organwalter</p></td>
+ <td width="165" valign="top"><p align="center">5000</p></td>
+ <td width="312" valign="top"><p align="left">bPK</p></td>
+ <td width="1127" valign="top"><p>bPK bei Vollmacht mit berufsm&auml;&szlig;igem Parteienvertreter oder Organwalter</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5001</p></td>
- <td width="208" valign="top"><p align="left">OID</p></td>
- <td width="946" valign="top"><p>OID bei Vollmacht mit berufsm&auml;&szlig;igem Parteienvertreter oder Organwalter</p></td>
+ <td width="165" valign="top"><p align="center">5001</p></td>
+ <td width="312" valign="top"><p align="left">OID</p></td>
+ <td width="1127" valign="top"><p>OID bei Vollmacht mit berufsm&auml;&szlig;igem Parteienvertreter oder Organwalter</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5002</p></td>
- <td width="208" valign="top"><p align="left">JSON String</p></td>
- <td width="946" valign="top"><p>Pseudoanonymisierte Personendaten der sich anmeldeten nat&uuml;rlichen Person.</p></td>
+ <td width="165" valign="top"><p align="center">5002</p></td>
+ <td width="312" valign="top"><p align="left">JSON String</p></td>
+ <td width="1127" valign="top"><p>Pseudoanonymisierte Personendaten der sich anmeldeten nat&uuml;rlichen Person.</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5100</p></td>
- <td width="208" valign="top"><p align="left">Vollmachtstype</p></td>
- <td width="946" valign="top"><p>Type der ausgew&auml;hlten Vollmacht</p></td>
+ <td width="165" valign="top"><p align="center">5100</p></td>
+ <td width="312" valign="top"><p align="left">Vollmachtstype</p></td>
+ <td width="1127" valign="top"><p>Type der ausgew&auml;hlten Vollmacht</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5101</p></td>
- <td width="208" valign="top"><p align="left">jur / nat</p></td>
- <td width="946" valign="top"><p>Vollmacht - Type der vertretenen Person (Juristische / nat&uuml;rliche Person)</p></td>
+ <td width="165" valign="top"><p align="center">5101</p></td>
+ <td width="312" valign="top"><p align="left">jur / nat</p></td>
+ <td width="1127" valign="top"><p>Vollmacht - Type der vertretenen Person (Juristische / nat&uuml;rliche Person)</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5102</p></td>
- <td width="208" valign="top"><p align="left">JSON String</p></td>
- <td width="946" valign="top"><p>Pseudoanonymisierte Personendaten der vertretenen nat&uuml;rlichen Person.</p></td>
+ <td width="165" valign="top"><p align="center">5102</p></td>
+ <td width="312" valign="top"><p align="left">JSON String</p></td>
+ <td width="1127" valign="top"><p>Pseudoanonymisierte Personendaten der vertretenen nat&uuml;rlichen Person.</p></td>
</tr>
<tr>
- <td width="131" valign="top"><p align="center">5103</p></td>
- <td width="208" valign="top"><p align="left">baseID</p></td>
- <td width="946" valign="top"><p>Stammzahl der vertretenen juristischen Person </p></td>
+ <td width="165" valign="top"><p align="center">5103</p></td>
+ <td width="312" valign="top"><p align="left">baseID</p></td>
+ <td width="1127" valign="top"><p>Stammzahl der vertretenen juristischen Person </p></td>
</tr>
<tr>
<td valign="top">&nbsp;</td>
@@ -547,12 +547,12 @@
</tr>
<tr>
<td valign="top">6000</td>
- <td valign="top">ReferenceID des Vollmachtensystems</td>
+ <td valign="top">ReferenceID zum Auth. Prozess</td>
<td valign="top">externes Vollmachten Service kontaktiert</td>
</tr>
<tr>
<td valign="top">6001</td>
- <td valign="top">&nbsp;</td>
+ <td valign="top">ReferenceID des Vollmachhtenservice</td>
<td valign="top">g&uuml;ltige Vollmacht vom externen Vollmachten Service verarbeitet</td>
</tr>
<tr>
diff --git a/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/config/ELGAMandatesRequestBuilderConfiguration.java b/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/config/ELGAMandatesRequestBuilderConfiguration.java
index 60025075f..b67d263fc 100644
--- a/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/config/ELGAMandatesRequestBuilderConfiguration.java
+++ b/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/config/ELGAMandatesRequestBuilderConfiguration.java
@@ -252,8 +252,9 @@ public class ELGAMandatesRequestBuilderConfiguration implements IPVPAuthnRequest
*/
public void setSubjectConformationDate(String givenName, String familyName, String dateOfBirth) {
try {
- SubjectConfirmationData subjectConformDate = SAML2Utils.createSAMLObject(SubjectConfirmationData.class);
-
+ Logger.trace("Build 'SubjectConfirmationData' for ELGA Mandate-Service request ...");
+ //build empty 'SubjectConfirmationData' element
+ SubjectConfirmationData subjectConformDate = SAML2Utils.createSAMLObject(SubjectConfirmationData.class);
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
DocumentBuilder builder = dbf.newDocumentBuilder();
@@ -263,7 +264,7 @@ public class ELGAMandatesRequestBuilderConfiguration implements IPVPAuthnRequest
.getMarshaller(subjectConformDate);
out.marshall(subjectConformDate, doc);
- //build root element
+ //build root element for personal information
Element rootDom = doc.createElementNS(
ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_NAMESPACE_URI,
ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_ROOT);
@@ -274,24 +275,20 @@ public class ELGAMandatesRequestBuilderConfiguration implements IPVPAuthnRequest
//build personal information
Element familyNameDom = doc.createElement(ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_FAMILYNAME);
- //familyNameDom.setPrefix(ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_NAMESPACE);
- familyNameDom.setTextContent(familyName);
-
Element givenNameDom = doc.createElement(ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_GIVENNAME);
- //givenNameDom.setPrefix(ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_NAMESPACE);
- givenNameDom.setTextContent(givenName);
-
Element dateOfBirthDom = doc.createElement(ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_DATEOFBIRTH);
- //dateOfBirthDom.setPrefix(ELGAMandatesAuthConstants.SUBJECTCONFORMATIONDATE_ELEMENT_NAMESPACE);
+ familyNameDom.setTextContent(familyName);
+ givenNameDom.setTextContent(givenName);
dateOfBirthDom.setTextContent(dateOfBirth);
- //add information to root element
+ //add personal information to 'SubjectConfirmationData' element
doc.getFirstChild().appendChild(rootDom);
rootDom.appendChild(givenNameDom);
rootDom.appendChild(familyNameDom);
rootDom.appendChild(dateOfBirthDom);
this.subjectConformationDate = doc.getDocumentElement();
+ Logger.trace("'SubjectConfirmationData' for ELGA Mandate-Service is complete");
} catch (ParserConfigurationException | MarshallingException e) {
Logger.error("Can not generate 'SubjectConformationDate' for "
diff --git a/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/tasks/ReceiveElgaMandateResponseTask.java b/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/tasks/ReceiveElgaMandateResponseTask.java
index 8960041f5..5604b7640 100644
--- a/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/tasks/ReceiveElgaMandateResponseTask.java
+++ b/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/tasks/ReceiveElgaMandateResponseTask.java
@@ -150,6 +150,7 @@ public class ReceiveElgaMandateResponseTask extends AbstractAuthServletTask {
defaultTaskInitialization(request, executionContext);
//validate receive mandate reference-value
+ //TODO: update if ReferenceValue Discussion is finished
String responseRefValue = extractor.getSingleAttributeValue(PVPConstants.MANDATE_REFERENCE_VALUE_NAME);
if (!moasession.getMandateReferenceValue().equals(responseRefValue)) {
Logger.warn("PVP Response from ELGA mandate-service contains a not valid MandateReferenceValue.");
@@ -172,7 +173,8 @@ public class ReceiveElgaMandateResponseTask extends AbstractAuthServletTask {
authenticatedSessionStorage.storeSession(moasession);
//write revisions log entry
- revisionsLogger.logEvent(pendingReq, MOAIDEventConstants.AUTHPROCESS_ELGA_MANDATE_RECEIVED);
+ revisionsLogger.logEvent(pendingReq, MOAIDEventConstants.AUTHPROCESS_ELGA_MANDATE_RECEIVED,
+ extractor.getSingleAttributeValue(PVPConstants.MANDATE_REFERENCE_VALUE_NAME));
//write mandate info's to revisions log
revisionsLogger.logEvent(pendingReq, MOAIDEventConstants.PERSONAL_INFORMATION_MANDATE_TYPE,