aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
Diffstat (limited to 'id/server')
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css43
-rw-r--r--id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html4
-rw-r--r--id/server/doc/handbook/additional/additional.html25
-rw-r--r--id/server/doc/handbook/protocol/protocol.html45
-rw-r--r--id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties1
-rw-r--r--id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties45
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css43
-rw-r--r--id/server/moa-id-frontend-resources/src/main/resources/templates/mandate-service-selection.html76
8 files changed, 222 insertions, 60 deletions
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
index a8735be60..32b9dee12 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/css_template.css
@@ -59,7 +59,7 @@
/* clear:both; */
position:relative;
margin: 0 auto;
- width: 250px;
+ /*width: 250px;*/
text-align: center;
}
@@ -85,7 +85,8 @@
#leftcontent {
width: 300px;
- margin-top: 30px;
+ /*margin-top: 30px;*/
+ margin: auto;
}
#bku_header {
@@ -622,4 +623,42 @@
#alert_area {
width: 500px;
padding-left: 80px;
+ }
+
+ #processInfoArea {
+ margin-bottom: 15px;
+ margin-top: 15px;
+ }
+ #processSelectionArea {
+ width: 550px;
+ margin-left: 25px;
+ margin-top: 35px;
+ }
+ .processSelectionButtonArea {
+ float: none;
+ margin-bottom: 20px;
+ height: 35px;
+ }
+ .processSelectionButton {
+ background: #ababab;
+ cursor: pointer;
+ height: 30px;
+ width: 200px;
+ float: right;
+ border-style: solid;
+ border-bottom-width: 2px;
+ border-right-width: 2px;
+ border-left-width: 1px;
+ border-top-width: 1px;
+ border-color: #000000;
+ }
+ .buttonDescription {
+ float: left;
+ margin-left: 10px;
+ padding-top: 4px;
+ text-align: left;
+ width: 330px;
+ }
+ #processContent {
+ margin-top: 25px;
} \ No newline at end of file
diff --git a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
index 02b86472b..983e8b544 100644
--- a/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
+++ b/id/server/data/deploy/conf/moa-id/htmlTemplates/loginFormFull.html
@@ -63,9 +63,9 @@
</div>
<!-- Single Sign-On Session transfer functionality -->
- <!--div id="ssoSessionTransferBlock">
+ <div id="ssoSessionTransferBlock">
<a href="$contextPath$submitEndpoint?pendingid=$pendingReqID&restoreSSOSession=true">>Restore SSO Session from Smartphone</a>
- </div-->
+ </div>
<div id="stork" align="center" style="$STORKVISIBLE">
<h2 id="tabheader" class="dunkel">Home Country Selection</h2>
diff --git a/id/server/doc/handbook/additional/additional.html b/id/server/doc/handbook/additional/additional.html
index fb9735990..cbf4a50c9 100644
--- a/id/server/doc/handbook/additional/additional.html
+++ b/id/server/doc/handbook/additional/additional.html
@@ -520,6 +520,31 @@
<td width="208" valign="top"><p align="left">baseID</p></td>
<td width="946" valign="top"><p>Stammzahl der vertretenen juristischen Person </p></td>
</tr>
+ <tr>
+ <td valign="top">&nbsp;</td>
+ <td valign="top">&nbsp;</td>
+ <td valign="top">&nbsp;</td>
+ </tr>
+ <tr>
+ <td valign="top">6000</td>
+ <td valign="top">ReferenceID des Vollmachtensystems</td>
+ <td valign="top">externes Vollmachten Service kontaktiert</td>
+ </tr>
+ <tr>
+ <td valign="top">6001</td>
+ <td valign="top">&nbsp;</td>
+ <td valign="top">g&uuml;ltige Vollmacht vom externen Vollmachten Service verarbeitet</td>
+ </tr>
+ <tr>
+ <td valign="top">6002</td>
+ <td valign="top">&nbsp;</td>
+ <td valign="top">Fehler vom externen Vollmachten Service verarbeitet</td>
+ </tr>
+ <tr>
+ <td valign="top">6003</td>
+ <td valign="top">IP Adresse</td>
+ <td valign="top">IP Adresse mit der das externe Vollmachten Service die Vollmacht ausgeliefert hat</td>
+ </tr>
</table>
<p>&nbsp;</p>
<p>Einzelne Events werden um einen Transaktionsparameter erg&auml;nzt, welcher in der Spalte Wert beschrieben ist. <br>
diff --git a/id/server/doc/handbook/protocol/protocol.html b/id/server/doc/handbook/protocol/protocol.html
index a3a06bc6d..3b31dbfc0 100644
--- a/id/server/doc/handbook/protocol/protocol.html
+++ b/id/server/doc/handbook/protocol/protocol.html
@@ -559,6 +559,10 @@ Redirect Binding</td>
<td>1007</td>
<td>Vollmachtsmodus f&uuml;r ausl&auml;ndische Personen wird nicht unterst&uuml;tzt.</td>
</tr>
+ <tr>
+ <td>1008</td>
+ <td>Es konnten nicht alle minimal erforderlichen Identifikations- oder Authentifikationsmerkmale ermittelt werden.</td>
+ </tr>
</table>
<h5><a name="statuscodes_11xxx" id="allgemeines_zugangspunkte12"></a>1.3.1.2 Validierung (11xxx)</h5>
<table class="configtable">
@@ -691,24 +695,51 @@ Redirect Binding</td>
<h5><a name="statuscodes_43xxx" id="allgemeines_zugangspunkte22"></a>1.3.2.4 MOA SP/SS(43xxx)</h5>
<table class="configtable">
<tr>
- <th>Statuscode</th>
- <th>Beschreibung</th>
+ <th width="23%">Statuscode</th>
+ <th width="77%">Beschreibung</th>
</tr>
<tr>
<td>4300</td>
<td>Fehler beim Aufruf von MOA SP/SS</td>
</tr>
</table>
-<h5><a name="statuscodes_44xxx" id="allgemeines_zugangspunkte23"></a>1.3.2.5 Interfederation (44xxx)</h5>
+<h5><a name="statuscodes_44xxx" id="allgemeines_zugangspunkte23"></a>1.3.2.5 Interfederation (44xx)</h5>
<table class="configtable">
<tr>
- <th>Statuscode</th>
- <th>Beschreibung</th>
+ <th width="23%">Statuscode</th>
+ <th width="77%">Beschreibung</th>
</tr>
<tr>
<td>4400</td>
<td>Fehler beim Generieren der Anmeldedaten</td>
</tr>
+ <tr>
+ <td>4401</td>
+ <td>Die Verwendung des angeforderten federated IDP ist nicht erlaubt</td>
+ </tr>
+</table>
+<h5>1.3.2.6 Attributprovider (45xx)</h5>
+<table class="configtable">
+ <tr>
+ <th width="12%">Statuscode</th>
+ <th width="88%">Beschreibung</th>
+ </tr>
+ <tr>
+ <td>4500</td>
+ <td>Der Zugriff auf einen Attributprovider ist nicht erlaubt</td>
+ </tr>
+ <tr>
+ <td>4501</td>
+ <td>Die Requestgenerierung f&uuml;r den Zugriff auf den Attributprovider schlug fehl</td>
+ </tr>
+ <tr>
+ <td>4502</td>
+ <td>Die Response vom Attributeprovider ist ung&uuml;ltig oder nicht errlaubt</td>
+ </tr>
+ <tr>
+ <td>4503</td>
+ <td>Die Response vom Attributeprovider beinhaltet einen Fehlercode</td>
+ </tr>
</table>
<h4><a name="statuscodes_6xxxx" id="allgemeines_zugangspunkte9"></a>1.3.3 Statuscodes 6xxxx</h4>
<p>Alles Statuscodes beginnend mit der Zahl sechs beschreiben protokollspezifische Fehler die nicht durch das jeweilige Authentifizierungsprotokoll abgebildet werden.</p>
@@ -844,6 +875,10 @@ Redirect Binding</td>
<td>Fehler bei der Verarbeitung eines Templates</td>
</tr>
<tr>
+ <td>9104</td>
+ <td>Fehler bei der Auswahl oder Initialisierung des gew&uuml;nschten Anmeldeprozesses</td>
+ </tr>
+ <tr>
<td>9199</td>
<td>Allgemeiner interner Fehler</td>
</tr>
diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
index 86aa13fb8..c47ec2477 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
@@ -118,7 +118,6 @@ service.06=Allgemeiner Fehler beim Anfragen des Online-Vollmachten Service
service.07=Der SZR-Gateway ist unter {0} nicht erreichbar.
service.08=Die Eintragung der ausländischen Person am SZR-Gateway ist fehlgeschlagen.
service.09=Der SZR-Gateway Client konnte nicht initialisiert werden.
-
service.10=Die Verwendung des Service {0} ist nicht m\u00f6glich. Ursache: {1}
cleaner.00=AuthenticationSessionCleaner wurde gestartet
diff --git a/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties
index 27070cc84..581037a29 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/protocol_response_statuscodes_de.properties
@@ -28,10 +28,10 @@ auth.27=4401
auth.28=1100
auth.29=4401
auth.30=1110
-auth.31=TODO
-auth.32=TODO
-auth.33=TODO
-auth.34=TODO
+auth.31=4400
+auth.32=4401
+auth.33=4401
+auth.34=4401
init.00=9199
init.01=9199
@@ -85,7 +85,8 @@ builder.04=Die Personenbindung konnte nicht neu signiert werden und wird aus die
builder.05=Beim resignieren der Personenbindung ist ein allgemeiner Fehler aufgetreten und wird aus diesem Grund nicht ausgeliefert.
builder.06=4400
builder.07=9002
-builder.08=TODO
+builder.08=1008
+builder.09=9103
service.00=4300
service.03=4300
@@ -96,23 +97,23 @@ service.07=4200
service.08=4201
service.09=9007
-service.10=TODO
+service.10=4500
-process.01=TODO
-process.02=TODO
+process.01=9104
+process.02=9104
-sp.pvp2.00=TODO
-sp.pvp2.01=TODO
-sp.pvp2.02=TODO
-sp.pvp2.03=TODO
-sp.pvp2.04=TODO
-sp.pvp2.05=TODO
-sp.pvp2.06=TODO
-sp.pvp2.07=TODO
-sp.pvp2.08=TODO
-sp.pvp2.09=TODO
-sp.pvp2.10=TODO
-sp.pvp2.11=TODO
+sp.pvp2.00=4501
+sp.pvp2.01=4501
+sp.pvp2.02=4501
+sp.pvp2.03=4502
+sp.pvp2.04=4502
+sp.pvp2.05=4503
+sp.pvp2.06=4502
+sp.pvp2.07=4502
+sp.pvp2.08=4502
+sp.pvp2.09=4503
+sp.pvp2.10=4502
+sp.pvp2.11=4502
validator.00=1102
validator.01=1102
@@ -182,8 +183,8 @@ validator.69=1106
validator.70=1106
validator.71=1105
-validator.72=TODO
-validator.73=TODO
+validator.72=1105
+validator.73=4500
ssl.01=1107
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css b/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
index a8735be60..32b9dee12 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/css_template.css
@@ -59,7 +59,7 @@
/* clear:both; */
position:relative;
margin: 0 auto;
- width: 250px;
+ /*width: 250px;*/
text-align: center;
}
@@ -85,7 +85,8 @@
#leftcontent {
width: 300px;
- margin-top: 30px;
+ /*margin-top: 30px;*/
+ margin: auto;
}
#bku_header {
@@ -622,4 +623,42 @@
#alert_area {
width: 500px;
padding-left: 80px;
+ }
+
+ #processInfoArea {
+ margin-bottom: 15px;
+ margin-top: 15px;
+ }
+ #processSelectionArea {
+ width: 550px;
+ margin-left: 25px;
+ margin-top: 35px;
+ }
+ .processSelectionButtonArea {
+ float: none;
+ margin-bottom: 20px;
+ height: 35px;
+ }
+ .processSelectionButton {
+ background: #ababab;
+ cursor: pointer;
+ height: 30px;
+ width: 200px;
+ float: right;
+ border-style: solid;
+ border-bottom-width: 2px;
+ border-right-width: 2px;
+ border-left-width: 1px;
+ border-top-width: 1px;
+ border-color: #000000;
+ }
+ .buttonDescription {
+ float: left;
+ margin-left: 10px;
+ padding-top: 4px;
+ text-align: left;
+ width: 330px;
+ }
+ #processContent {
+ margin-top: 25px;
} \ No newline at end of file
diff --git a/id/server/moa-id-frontend-resources/src/main/resources/templates/mandate-service-selection.html b/id/server/moa-id-frontend-resources/src/main/resources/templates/mandate-service-selection.html
index a9f0c4238..b0be4a475 100644
--- a/id/server/moa-id-frontend-resources/src/main/resources/templates/mandate-service-selection.html
+++ b/id/server/moa-id-frontend-resources/src/main/resources/templates/mandate-service-selection.html
@@ -17,36 +17,60 @@
<!-- <h2 class="OA_header">Anmeldung an: #OAName#</h2> -->
<div id="main">
- <div id="leftcontent" class="hell">
- <div id="bku_header" class="dunkel">
- <h2 id="tabheader" class="dunkel" role="heading">
- Anmeldeinformationen:
- </h2>
- </div>
+ <!--div id="leftcontent" class="hell"-->
+ <div id=processContent>
+ <div id="bku_header" class="dunkel">
+ <h2 id="tabheader" class="dunkel" role="heading">
+ Anmeldeinformationen:
+ </h2>
+ </div>
- <div id="selectArea" class="hell" role="application">
- <h3>Anmeldung an: $OAName</h3>
-
-<!-- <div class="hell"> -->
- <div id="leftbutton">
- <form method="post" id="moaidform_yes" action="$contextPath$submitEndpoint">
- <input type="hidden" name="value" value="true">
- <input type="hidden" name="pendingid" value="$pendingReqID">
- <input type="submit" value="Ja" class="setAssertionButton_full" role="button">
- </form>
- </div>
- <div id="rightbutton">
+ <div id="selectArea" class="hell" role="application">
+ <h3>Anmeldung an: $OAName</h3>
+
+
+ <div id="processInfoArea">
+ <p>Für die Anmeldung 'in Vertretung' stehen Ihnen zwei Systeme zur Vollmachtenauswahl zur Verfügung. Bitte wählen Sie das gewünschte Service.</p>
+ </div>
+
+ <div id="processSelectionArea">
+ <div id="elgaMandateButton" class="processSelectionButtonArea">
+ <form method="post" id="moaidform_yes" action="$contextPath$submitEndpoint">
+ <input type="hidden" name="useELGAMandate" value="true">
+ <input type="hidden" name="pendingid" value="$pendingReqID">
+ <input type="submit" value="Eltern-Kind Vertretung" class="processSelectionButton" role="button">
+ </form>
+ <div class="buttonDescription">
+ <p>Eltern-Kind Vertretung</p>
+ </div>
+ </div>
+ <div id="misMandateButton" class="processSelectionButtonArea">
+ <form method="post" id="moaidform_no" action="$contextPath$submitEndpoint">
+ <input type="hidden" name="useMISMandate" value="true">
+ <input type="hidden" name="pendingid" value="$pendingReqID">
+ <input type="submit" value="allgemeine Vertretung" class="processSelectionButton" role="button">
+ </form>
+ <div class="buttonDescription">
+ <p>Vollmachtenservice der Österreichischen Datenschutzbehörde <a href="https://mms.stammzahlenregister.gv.at/mms/moaid.do">(MMS Service)</a></p>
+ </div>
+ </div>
+ <div id="abortButton" class="processSelectionButtonArea">
<form method="post" id="moaidform_no" action="$contextPath$submitEndpoint">
- <input type="hidden" name="value" value="false">
- <input type="hidden" name="pendingid" value="$pendingReqID">
- <input type="submit" value="Nein" class="setAssertionButton_full" role="button">
- </form>
- </div>
-
- </div>
+ <input type="hidden" name="pendingid" value="$pendingReqID">
+ <input type="submit" value="Abbrechen" class="processSelectionButton" role="button">
+ </form>
+ <div class="buttonDescription">
+ <p>Den Anmeldevorgang abbrechen</p>
+ </div>
+ </div>
+ </div>
+
+ </div>
+ </div>
+
+ <!--/div-->
</div>
</div>
</div>
- </div>
</body>
</html>