summaryrefslogtreecommitdiff
path: root/eaaf_core_api
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-03 11:00:52 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2020-12-03 11:00:52 +0100
commit1f332c4d81d2ba2c883a94ed5b0810d6fc7356dd (patch)
tree8d9968ab0588f9b8349b718770228662634aae99 /eaaf_core_api
parentfe8337c891820daf6d16b3fb5ded6106544a8f75 (diff)
parent9e74c91aad92cfc5f08b9a6bfacfbdc77a150442 (diff)
downloadEAAF-Components-1f332c4d81d2ba2c883a94ed5b0810d6fc7356dd.tar.gz
EAAF-Components-1f332c4d81d2ba2c883a94ed5b0810d6fc7356dd.tar.bz2
EAAF-Components-1f332c4d81d2ba2c883a94ed5b0810d6fc7356dd.zip
Merge branch 'nightlyBuild' into 'master'1.1.10
Nightly build See merge request egiz/eaaf_components!4
Diffstat (limited to 'eaaf_core_api')
-rw-r--r--eaaf_core_api/pom.xml2
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java13
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java2
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java12
4 files changed, 19 insertions, 10 deletions
diff --git a/eaaf_core_api/pom.xml b/eaaf_core_api/pom.xml
index 9f2030a4..1d0efc07 100644
--- a/eaaf_core_api/pom.xml
+++ b/eaaf_core_api/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>at.gv.egiz</groupId>
<artifactId>eaaf</artifactId>
- <version>1.1.9.1</version>
+ <version>1.1.10</version>
</parent>
<groupId>at.gv.egiz.eaaf</groupId>
<artifactId>eaaf_core_api</artifactId>
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
index cf411af8..37db2fa4 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
@@ -21,6 +21,9 @@ package at.gv.egiz.eaaf.core.api.data;
public interface ExtendedPvpAttributeDefinitions extends PvpAttributeDefinitions {
+ String EIDAS_CONNECTOR_UNIQUEID_NAME = "urn:eidgvat:attributes.eidas.uniqueId";
+ String EIDAS_CONNECTOR_UNIQUEID_FRIENDLY_NAME = "EidasNode-UniqueId";
+
String SP_UNIQUEID_NAME = "urn:eidgvat:attributes.ServiceProviderUniqueId";
String SP_UNIQUEID_FRIENDLY_NAME = "ServiceProvider-UniqueId";
@@ -30,8 +33,8 @@ public interface ExtendedPvpAttributeDefinitions extends PvpAttributeDefinitions
String SP_COUNTRYCODE_NAME = "urn:eidgvat:attributes.ServiceProviderCountryCode";
String SP_COUNTRYCODE_FRIENDLY_NAME = "ServiceProvider-CountryCode";
- String SP_USESMANDATES_NAME = "urn:eidgvat:attributes.ServiceProviderMandateProfiles";
- String SP_USESMANDATES_FRIENDLY_NAME = "ServiceProvider-MandateProfiles";
+ String SP_USED_MANDATE_PROFILES_NAME = "urn:eidgvat:attributes.ServiceProviderMandateProfiles";
+ String SP_USED_MANDATE_PROFILES_FRIENDLY_NAME = "ServiceProvider-MandateProfiles";
/* Attributes for E-ID */
String EID_ENCRYPTED_SOURCEID_NAME = "urn:eidgvat:attributes.vsz.value";
@@ -46,6 +49,12 @@ public interface ExtendedPvpAttributeDefinitions extends PvpAttributeDefinitions
String EID_AUTHBLOCK_SIGNED_NAME = "urn:eidgvat:attributes.authblock.signed";
String EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME = "userAuthBlock";
+ String EID_TRANSACTION_ID_NAME = "urn:eidgvat:attributes.transactionId";
+ String EID_TRANSACTION_ID_FRIENDLY_NAME = "transactionId";
+
+ String EID_PII_TRANSACTION_ID_NAME = "urn:eidgvat:attributes.piiTransactionId";
+ String EID_PII_TRANSACTION_ID_FRIENDLY_NAME = "piiTransactionId";
+
String EID_MIS_MANDATE_NAME = "urn:eidgvat:attributes.mis.mandate";
String EID_MIS_MANDATE_FRIENDLY_NAME = "mandate";
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
index 62aa8852..6626d24d 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
@@ -30,7 +30,7 @@ import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
*
*/
public interface IAuthData {
-
+
/**
* BaseId transfer policy.
*
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java
index ddc051b0..e7c968b5 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java
@@ -15,10 +15,10 @@ public class PendingReqIdValidationException extends EaafException {
* Pending-Request Id validation error.
*
* @param internalPendingReqId Internal Pending-Request Id
- * @param reason error-message
+ * @param errorId Detailed Id of the error
*/
- public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String reason) {
- super("process.99", new Object[] { internalPendingReqId, reason });
+ public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String errorId) {
+ super(errorId, new Object[] { internalPendingReqId});
this.invalidInternalPendingReqId = internalPendingReqId;
}
@@ -27,12 +27,12 @@ public class PendingReqIdValidationException extends EaafException {
* Pending-Request Id validation error.
*
* @param internalPendingReqId Internal Pending-Request Id
- * @param reason error-message
+ * @param errorId Detailed Id of the error
* @param e error
*/
- public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String reason,
+ public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String errorId,
final Throwable e) {
- super("process.99", new Object[] { internalPendingReqId, reason }, e);
+ super(errorId, new Object[] { internalPendingReqId, errorId }, e);
this.invalidInternalPendingReqId = internalPendingReqId;
}