aboutsummaryrefslogtreecommitdiff
path: root/eidas_modules
diff options
context:
space:
mode:
authorThomas <>2021-04-29 15:16:18 +0200
committerThomas <>2022-03-03 16:31:56 +0100
commit4d33e943238ba29eca894a23e27ba3bedc85632c (patch)
treefcd78f9da204f169654d7f16640a05502881720f /eidas_modules
parent47c011420675af6e53f8d9019b28558076ff21ef (diff)
downloadNational_eIDAS_Gateway-4d33e943238ba29eca894a23e27ba3bedc85632c.tar.gz
National_eIDAS_Gateway-4d33e943238ba29eca894a23e27ba3bedc85632c.tar.bz2
National_eIDAS_Gateway-4d33e943238ba29eca894a23e27ba3bedc85632c.zip
fix some problemes with new eaaf-components API
Diffstat (limited to 'eidas_modules')
-rw-r--r--eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java8
-rw-r--r--eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java19
2 files changed, 16 insertions, 11 deletions
diff --git a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
index 9de2eb79..5d184cc8 100644
--- a/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
+++ b/eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
@@ -214,7 +214,9 @@ public class ProxyServiceAuthenticationAction implements IAction {
eidAuthData.getGenericData(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class));
attributeMap.put(attrDefFamilyName, eidAuthData.getFamilyName());
attributeMap.put(attrDefGivenName, eidAuthData.getGivenName());
- attributeMap.put(attrDefDateOfBirth, eidAuthData.getFormatedDateOfBirth());
+
+ //TODO: throw an error in case of SZR Date with month or day = "00"
+ attributeMap.put(attrDefDateOfBirth, eidAuthData.getDateOfBirth());
}
@@ -234,7 +236,9 @@ public class ProxyServiceAuthenticationAction implements IAction {
eidAuthData.getGenericData(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER, String.class))
.put(attrDefFamilyName, eidAuthData.getFamilyName())
.put(attrDefGivenName, eidAuthData.getGivenName())
- .put(attrDefDateOfBirth, eidAuthData.getFormatedDateOfBirth());
+
+ //TODO: throw an error in case of SZR Date with month or day = "00"
+ .put(attrDefDateOfBirth, eidAuthData.getDateOfBirth());
return attributeMap.build();
diff --git a/eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java b/eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
index 3236bbf0..a42b30d4 100644
--- a/eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
+++ b/eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
@@ -172,7 +172,7 @@ public class ProxyServiceAuthenticationActionTest {
checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTFAMILYNAME, authData.getFamilyName());
checkAttrValue(respAttr, Constants.eIDAS_ATTR_CURRENTGIVENNAME, authData.getGivenName());
checkAttrValue(respAttr, Constants.eIDAS_ATTR_DATEOFBIRTH,
- authData.getFormatedDateOfBirth());
+ authData.getDateOfBirth());
}
@@ -207,7 +207,7 @@ public class ProxyServiceAuthenticationActionTest {
(String) attr.get(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
- checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getFormatedDateOfBirth());
+ checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
checkAttrValue(respAttr, Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
(String) attr.get(MsProxyServiceConstants.ATTR_EIDAS_NAT_MANDATOR_PERSONAL_IDENTIFIER));
@@ -245,7 +245,7 @@ public class ProxyServiceAuthenticationActionTest {
(String) attr.get(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER));
checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTFAMILYNAME, authData.getFamilyName());
checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_CURRENTGIVENNAME, authData.getGivenName());
- checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getFormatedDateOfBirth());
+ checkAttrValue(respAttr, Constants.eIDAS_ATTR_REPRESENTATIVE_DATEOFBIRTH, authData.getDateOfBirth());
checkAttrValue(respAttr, Constants.eIDAS_ATTR_LEGALPERSONIDENTIFIER,
(String) attr.get(MsProxyServiceConstants.ATTR_EIDAS_JUR_MANDATOR_PERSONAL_IDENTIFIER));
@@ -389,7 +389,7 @@ public class ProxyServiceAuthenticationActionTest {
}
@Override
- public String getFormatedDateOfBirth() {
+ public String getDateOfBirth() {
return dateOfBirth;
}
@@ -416,11 +416,6 @@ public class ProxyServiceAuthenticationActionTest {
}
- @Override
- public Date getDateOfBirth() {
- // TODO Auto-generated method stub
- return null;
- }
@Override
public String getCiticenCountryCode() {
@@ -487,6 +482,12 @@ public class ProxyServiceAuthenticationActionTest {
return useMandates;
}
+
+ @Override
+ public String getDateOfBirthFormated(String pattern) {
+ // TODO Auto-generated method stub
+ return null;
+ }
};
}