diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-08-16 16:41:40 +0200 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2018-08-16 16:41:40 +0200 |
| commit | 882505075b04f20f35f21cbd2e279d73c9eb24db (patch) | |
| tree | cf255166dd6788506a49e01633871f3fb7165eff | |
| parent | b77f20a6e3167339053450c64a8485f8d7f410a8 (diff) | |
| parent | 135088e2ee76f7edae9bf39607d24ca23eb90e35 (diff) | |
| download | National_eIDAS_Gateway-882505075b04f20f35f21cbd2e279d73c9eb24db.tar.gz National_eIDAS_Gateway-882505075b04f20f35f21cbd2e279d73c9eb24db.tar.bz2 National_eIDAS_Gateway-882505075b04f20f35f21cbd2e279d73c9eb24db.zip | |
Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/eidas_at_proxy
# Conflicts:
# eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
2 files changed, 3 insertions, 1 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java index 35e5669d..827e9d5f 100644 --- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java +++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/PVPEndPointConfiguration.java @@ -49,11 +49,13 @@ public class PVPEndPointConfiguration implements IPVP2BasicConfiguration { @Override public List<ContactPerson> getIDPContacts() throws EAAFException { + // Return contact person, if it shall be included in metadata return null; } @Override public Organization getIDPOrganisation() throws EAAFException { + // Return organization, if it shall be included in metadata return null; } diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java index 74c98de1..eefa2b97 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java @@ -168,7 +168,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask { //build request LightRequest lightAuthnReq = authnRequestBuilder.build(); - //put request into cache + //put request into Hazelcast cache BinaryLightToken token = putRequestInCommunicationCache(lightAuthnReq); final String tokenBase64 = BinaryLightTokenHelper.encodeBinaryLightTokenBase64(token); |