From dcabab7b6cd0fc763ae4d81eea8283261dd7fede Mon Sep 17 00:00:00 2001 From: Christian Kollmann Date: Fri, 5 Mar 2021 07:46:25 +0100 Subject: Fix checkstyle violations --- .../specific/modules/auth/eidas/v2/Constants.java | 18 ++++----- .../modules/auth/eidas/v2/dao/SimpleEidasData.java | 2 - .../eidas/v2/handler/AbstractEidProcessor.java | 8 ++-- .../eidas/v2/handler/INationalEidProcessor.java | 1 - .../modules/auth/eidas/v2/szr/SzrClient.java | 15 ++++---- .../eidas/v2/tasks/CreateIdentityLinkTask.java | 43 ++++++++++++---------- .../eidas/v2/tasks/CreateNewErnpEntryTask.java | 2 +- .../auth/eidas/v2/tasks/InitialSearchTask.java | 25 ++++++------- .../ReceiveAustrianResidenceGuiResponseTask.java | 1 - .../ReceiveMobilePhoneSignatureResponseTask.java | 13 +++---- .../ReceiveOtherLoginMethodGuiResponseTask.java | 11 +++--- 11 files changed, 67 insertions(+), 72 deletions(-) diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java index 76c026ae..3a267d29 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java @@ -36,22 +36,22 @@ public class Constants { public static final String DATA_FULL_EIDAS_RESPONSE = "resp_fulleIDASResponse"; /** - * Stored when one match from register was found + * Stored when one match from register was found. */ public static final String DATA_RESULT_MATCHING_BPK = "matching_result_bpk"; /** - * Stored before Step 2 from Matching Concept, input from user eIDAS authn + * Stored before Step 2 from Matching Concept, input from user eIDAS authn. */ public static final String DATA_SIMPLE_EIDAS = "matching_simple_eidas_data"; /** - * Stored after Step 2 from Matching Concept, first results from search with Person Identifier + * Stored after Step 2 from Matching Concept, first results from search with Person Identifier. */ public static final String DATA_INITIAL_REGISTER_RESULT = "matching_initial_register_result"; /** - * Stored after Step 8 from Matching Concept, results from search in registers with MDS + * Stored after Step 8 from Matching Concept, results from search in registers with MDS. */ public static final String DATA_FURTHER_REGISTER_RESULT = "matching_further_register_result"; @@ -201,30 +201,30 @@ public class Constants { public static final String COUNTRY_CODE_IT = "IT"; /** - * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateNewErnpEntryTask} + * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateNewErnpEntryTask}. */ public static final String TRANSITION_TO_CREATE_NEW_ERNP_ENTRY_TASK = "TASK_CreateNewErnpEntryTask"; /** - * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask} + * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateOtherLoginMethodGuiTask}. */ public static final String TRANSITION_TO_GENERATE_OTHER_LOGIN_METHOD_GUI_TASK = "TASK_GenerateOtherLoginMethodGuiTask"; /** - * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAustrianResidenceGuiTask} + * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAustrianResidenceGuiTask}. */ public static final String TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK = "TASK_GenerateAustrianResidenceGuiTask"; /** - * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateMobilePhoneSignatureRequestTask} + * {@link at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateMobilePhoneSignatureRequestTask}. */ public static final String TRANSITION_TO_GENERATE_MOBILE_PHONE_SIGNATURE_REQUEST_TASK = "TASK_GenerateMobilePhoneSignatureRequestTask"; /** - * TODO Second eidas login + * TODO Second eidas login. */ public static final String TRANSITION_TO_GENERATE_EIDAS_LOGIN = "TASK_TODO"; diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java index 9409509b..ecf5007a 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java @@ -25,10 +25,8 @@ package at.asitplus.eidas.specific.modules.auth.eidas.v2.dao; import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.WorkflowException; import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; -import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.EqualsBuilder; @Data diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java index 6d067e69..05254fe2 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java @@ -53,8 +53,6 @@ import eu.eidas.auth.commons.attribute.ImmutableAttributeMap; import eu.eidas.auth.commons.light.impl.LightRequest.Builder; import eu.eidas.auth.commons.protocol.eidas.SpType; -import static at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants.eIDAS_ATTR_PERSONALIDENTIFIER; -import static at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants.eIDAS_ATTR_TAXREFERENCE; import static at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils.processCountryCode; import static at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils.processDateOfBirthToString; @@ -80,7 +78,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor { EidasAttributeException { SimpleEidasData.SimpleEidasDataBuilder builder = SimpleEidasData.builder() // MDS attributes - .citizenCountryCode(processCountryCode(eidasAttrMap.get(eIDAS_ATTR_PERSONALIDENTIFIER))) + .citizenCountryCode(processCountryCode(eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER))) .pseudonym(processPseudonym(eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER))) .familyName(processFamilyName(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTFAMILYNAME))) .givenName(processGivenName(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTGIVENNAME))) @@ -89,8 +87,8 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor { .placeOfBirth(processPlaceOfBirth(eidasAttrMap.get(Constants.eIDAS_ATTR_PLACEOFBIRTH))) .birthName(processBirthName(eidasAttrMap.get(Constants.eIDAS_ATTR_BIRTHNAME))) .address(processAddress(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTADDRESS))); - if (eidasAttrMap.containsKey(eIDAS_ATTR_TAXREFERENCE)) { - builder.taxNumber(EidasResponseUtils.processTaxReference(eidasAttrMap.get(eIDAS_ATTR_TAXREFERENCE))); + if (eidasAttrMap.containsKey(Constants.eIDAS_ATTR_TAXREFERENCE)) { + builder.taxNumber(EidasResponseUtils.processTaxReference(eidasAttrMap.get(Constants.eIDAS_ATTR_TAXREFERENCE))); } return builder.build(); } diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java index a40e3b37..79a261fe 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java @@ -67,7 +67,6 @@ public interface INationalEidProcessor { * attribute * @throws EidPostProcessingException In case of a post-processing error * @throws EidasAttributeException In case of an invalid eIDAS attribute - * @return */ SimpleEidasData postProcess(Map eidasAttrMap) throws EidPostProcessingException, EidasAttributeException; diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java index 091fe209..2d612f0c 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java @@ -228,7 +228,6 @@ public class SzrClient { /** * Creates a new ERnP entry. - * * TODO Is this correct? Ask BMI. * * @param eidasData Minimum dataset of person @@ -328,13 +327,6 @@ public class SzrClient { } private PersonInfoType generateSzrRequest(SimpleEidasData eidData) { - String documentType = basicConfig - .getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE, - Constants.SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE); - boolean setBirthName = basicConfig - .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE, true); - boolean setPlaceOfBirth = basicConfig - .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE, true); log.debug("Starting connecting SZR Gateway"); final PersonInfoType personInfo = new PersonInfoType(); final PersonNameType personName = new PersonNameType(); @@ -353,11 +345,16 @@ public class SzrClient { eDocument.setDocumentNumber(eidData.getPseudonym()); // eID document information + String documentType = basicConfig + .getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE, + Constants.SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE); eDocument.setDocumentType(documentType); // set PlaceOfBirth if available if (eidData.getPlaceOfBirth() != null) { log.trace("Find 'PlaceOfBirth' attribute: " + eidData.getPlaceOfBirth()); + boolean setPlaceOfBirth = basicConfig + .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE, true); if (setPlaceOfBirth) { naturalPerson.setPlaceOfBirth(eidData.getPlaceOfBirth()); log.trace("Adding 'PlaceOfBirth' to ERnB request ... "); @@ -367,6 +364,8 @@ public class SzrClient { // set BirthName if available if (eidData.getBirthName() != null) { log.trace("Find 'BirthName' attribute: " + eidData.getBirthName()); + boolean setBirthName = basicConfig + .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE, true); if (setBirthName) { final AlternativeNameType alternativeName = new AlternativeNameType(); naturalPerson.setAlternativeName(alternativeName); diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java index 66e7eb65..97769cc2 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java @@ -79,28 +79,25 @@ import java.util.List; import java.util.Map; /** - * Task that creates the IdentityLink for an eIDAS authenticated person. - * - * @author tlenz - *

- *

+ * Task that creates the IdentityLink for an eIDAS authenticated person. * Input: *

* Output: * * Transitions: * * TODO Take Constants#DATA_SIMPLE_EIDAS and Constants#DATA_RESULT_MATCHING_BPK * TODO Only do VSZ Erstellung and eidasBind -- this is always the end of the whole process * TODO Move Eintragung to separate Task, as it does not happen every time + * @author tlenz */ @Slf4j @Component("CreateIdentityLinkTask") @@ -136,7 +133,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { eidasResponse.getAttributes().getAttributeMap()); final SimpleEidasData eidData = eidPostProcessor.postProcess(eidasAttributes); //final SimpleEidasData eidData = - getAuthProcessDataWrapper().getGenericDataFromSession(Constants.DATA_SIMPLE_EIDAS, SimpleEidasData.class); + // getAuthProcessDataWrapper().getGenericDataFromSession(Constants.DATA_SIMPLE_EIDAS, SimpleEidasData.class); final String personalIdentifier = (String) eidasAttributes.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER); writeMdsLogInformation(eidData); @@ -193,7 +190,8 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { .getAreaSpecificTargetIdentifier()); } - private void executeEidMode(SimpleEidasData eidData, String personalIdentifier) throws JsonProcessingException, EaafException, JoseException { + private void executeEidMode(SimpleEidasData eidData, String personalIdentifier) + throws JsonProcessingException, EaafException, JoseException { // get encrypted baseId String vsz = szrClient.getEncryptedStammzahl(eidData); @@ -217,7 +215,8 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { authProcessDataWrapper.setEidProcess(true); } - private void buildDummyIdentityLink(SimpleEidasData eidData) throws ParserConfigurationException, SAXException, IOException, EaafException { + private void buildDummyIdentityLink(SimpleEidasData eidData) + throws ParserConfigurationException, SAXException, IOException, EaafException { AuthProcessDataWrapper authProcessDataWrapper = getAuthProcessDataWrapper(); SzrResultHolder idlResult = createDummyIdentityLinkForTestDeployment(eidData); //inject personal-data into session @@ -254,9 +253,9 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { boolean debugUseSzrForBpk = basicConfig .getBasicConfigurationBoolean(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USESRZFORBPKGENERATION, true); if (debugUseSzrForBpk) { - String no_vkz_defined = basicConfig + String vkz = basicConfig .getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_VKZ, "no VKZ defined"); - List bpkList = szrClient.getBpk(eidData, targetId, no_vkz_defined); + List bpkList = szrClient.getBpk(eidData, targetId, vkz); if (!bpkList.isEmpty()) { bpk = bpkList.get(0); } @@ -334,7 +333,9 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { return result; } - private void convertString(ImmutableMap, ImmutableSet>> attributeMap, Map result, AttributeDefinition el) { + private void convertString(ImmutableMap, + ImmutableSet>> attributeMap, + Map result, AttributeDefinition el) { final List natPersonIdObj = EidasResponseUtils .translateStringListAttribute(el, attributeMap.get(el)); final String stringAttr = natPersonIdObj.get(0); @@ -346,7 +347,9 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { } } - private void convertPostalAddress(ImmutableMap, ImmutableSet>> attributeMap, Map result, AttributeDefinition el) { + private void convertPostalAddress(ImmutableMap, + ImmutableSet>> attributeMap, + Map result, AttributeDefinition el) { final PostalAddress addressAttribute = EidasResponseUtils .translateAddressAttribute(el, attributeMap.get(el).asList()); if (addressAttribute != null) { @@ -357,7 +360,9 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { } } - private void convertDateTime(ImmutableMap, ImmutableSet>> attributeMap, Map result, AttributeDefinition el) { + private void convertDateTime(ImmutableMap, + ImmutableSet>> attributeMap, + Map result, AttributeDefinition el) { final DateTime attribute = EidasResponseUtils.translateDateAttribute(el, attributeMap.get(el).asList()); if (attribute != null) { result.put(el.getFriendlyName(), attribute); @@ -373,7 +378,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask { } /** - * write MDS into technical log and revision log + * write MDS into technical log and revision log. */ private void writeMdsLogInformation(SimpleEidasData eidData) { boolean writeMdsInTechLog = basicConfig diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java index 15d62a7a..025f3475 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateNewErnpEntryTask.java @@ -39,7 +39,6 @@ import javax.servlet.http.HttpServletResponse; /** * Task that searches ERnP and ZMR before adding person to SZR. * This corresponds to Step 9 in the eIDAS Matching Concept. - * * Input: *
    *
  • {@link Constants#DATA_SIMPLE_EIDAS}
    • @@ -74,6 +73,7 @@ public class CreateNewErnpEntryTask extends AbstractAuthServletTask { // TODO When to do eidPostProcessor.postProcess on the eidas attributes? String vsz = szrClient.createNewErnpEntry(simpleEidasData); // TODO what to do with the VSZ now + log.info("VSZ: {}", vsz); } catch (final Exception e) { log.error("Initial search FAILED.", e); throw new TaskExecutionException(pendingReq, "Initial search FAILED.", e); diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java index b917de21..a6e0bca8 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java @@ -63,26 +63,24 @@ import static at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants.TRANSIT /** * Task that searches registers (ERnP and ZMR) before adding person to SZR. - *

    * Input: *

      - *
    • {@link Constants#DATA_FULL_EIDAS_RESPONSE}
      • + *
    • {@link Constants#DATA_FULL_EIDAS_RESPONSE}
      • *
    * Output: *
      - *
    • {@link Constants#DATA_SIMPLE_EIDAS} converted from Full eIDAS Response
      • - *
    • {@link Constants#DATA_INITIAL_REGISTER_RESULT} results from first search in registers with - * PersonIdentifier
      • - *
    • {@link Constants#DATA_FURTHER_REGISTER_RESULT} results after second search in registers with MDS
      • - *
    • {@link Constants#DATA_RESULT_MATCHING_BPK} if one register result found
      • + *
    • {@link Constants#DATA_SIMPLE_EIDAS} converted from Full eIDAS Response
      • + *
    • {@link Constants#DATA_INITIAL_REGISTER_RESULT} results from first search in registers with + * PersonIdentifier
      • + *
    • {@link Constants#DATA_FURTHER_REGISTER_RESULT} results after second search in registers with MDS
      • + *
    • {@link Constants#DATA_RESULT_MATCHING_BPK} if one register result found
      • *
    - *

    * Transitions: *

      - *
    • {@link CreateNewErnpEntryTask} if no results in registers where found for this user
      • - *
    • {@link GenerateOtherLoginMethodGuiTask} if search with MDS returns more than one match, user may provide - * alternative login methods to get an unique match
      • - *
    • {@link CreateIdentityLinkTask} if search in register returned one match, user is uniquely identified
      • + *
    • {@link CreateNewErnpEntryTask} if no results in registers where found for this user
      • + *
    • {@link GenerateOtherLoginMethodGuiTask} if search with MDS returns more than one match, user may provide + * alternative login methods to get an unique match
      • + *
    • {@link CreateIdentityLinkTask} if search in register returned one match, user is uniquely identified
      • *
    * * @author amarsalek @@ -150,6 +148,7 @@ public class InitialSearchTask extends AbstractAuthServletTask { storeMatchingBpk(initialSearchResult.getBpk()); } else { // TODO Update "initialSearchResult" in register with "eidasData" from login not possible for now + log.info("Update in Register"); storeMatchingBpk(initialSearchResult.getBpk()); } } catch (WorkflowException | EaafStorageException e) { @@ -277,4 +276,4 @@ public class InitialSearchTask extends AbstractAuthServletTask { log.debug("Receive #{} attributes with names: {}", result.size(), result.keySet().toString()); return result; } -} \ No newline at end of file +} diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java index 3a337de2..3b7f361c 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java @@ -51,7 +51,6 @@ import java.util.Enumeration; /** * Task receives the response of {@link GenerateAustrianResidenceGuiTask} and handles it. * This corresponds to Steps 17B, 18, 19 in the eIDAS Matching Concept. - *

    * Input: *

      *
    • {@link Constants#DATA_SIMPLE_EIDAS} initial login data from user
      • diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java index 5e034cb3..a6ff345d 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveMobilePhoneSignatureResponseTask.java @@ -79,21 +79,20 @@ import static at.asitplus.eidas.specific.modules.auth.eidas.v2.idaustriaclient.I /** * Task that receives the SAML2 response from ID Austria system. * This corresponds to Step 15 in the eIDAS Matching Concept. - * * Input: *
        - *
      • {@link Constants#DATA_SIMPLE_EIDAS} initial login data from user
        • - *
      • {@link Constants#DATA_INITIAL_REGISTER_RESULT} results from search in registers with personIdentifier
        • + *
      • {@link Constants#DATA_SIMPLE_EIDAS} initial login data from user
        • + *
      • {@link Constants#DATA_INITIAL_REGISTER_RESULT} results from search in registers with personIdentifier
        • *
      * Output: *
        - *
      • {@link Constants#DATA_RESULT_MATCHING_BPK} if one register result found
        • + *
      • {@link Constants#DATA_RESULT_MATCHING_BPK} if one register result found
        • *
      * Transitions: *
        - *
      • {@link GenerateAustrianResidenceGuiTask} if no results in registers were found
        • - *
      • {@link CreateIdentityLinkTask} if one exact match between initial register search (with MDS) data and - * register search with MPS data exists
        • + *
      • {@link GenerateAustrianResidenceGuiTask} if no results in registers were found
        • + *
      • {@link CreateIdentityLinkTask} if one exact match between initial register search (with MDS) data and + * register search with MPS data exists
        • *
      * * @author tlenz diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java index 33b6fbb2..e139b280 100644 --- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java +++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveOtherLoginMethodGuiResponseTask.java @@ -40,20 +40,19 @@ import java.util.Enumeration; /** * Handles user's selection from {@link GenerateOtherLoginMethodGuiTask}. * This corresponds to Steps 10, 14, 16 in the eIDAS Matching Concept. - * * Input: *
        - *
      • {@link Constants#DATA_SIMPLE_EIDAS} initial login data from user
        • - *
      • {@link Constants#DATA_INITIAL_REGISTER_RESULT} results from search in registers with personIdentifier
        • + *
      • {@link Constants#DATA_SIMPLE_EIDAS} initial login data from user
        • + *
      • {@link Constants#DATA_INITIAL_REGISTER_RESULT} results from search in registers with personIdentifier
        • *
      * Output: *
        - *
      • {@link Constants#DATA_RESULT_MATCHING_BPK} if one register result found
        • + *
      • {@link Constants#DATA_RESULT_MATCHING_BPK} if one register result found
        • *
      * Transitions: *
        - *
      • {@link GenerateMobilePhoneSignatureRequestTask} if selected by user
        • - *
      • {@link GenerateAustrianResidenceGuiTask} if selected by user
        • + *
      • {@link GenerateMobilePhoneSignatureRequestTask} if selected by user
        • + *
      • {@link GenerateAustrianResidenceGuiTask} if selected by user
        • *
      * * @author amarsalek -- cgit v1.2.3