1 files changed, 33 insertions, 64 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
index 1cf6929e6..9e4e36fec 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
@@ -46,13 +46,6 @@
 
 package at.gv.egovernment.moa.id.auth.builder;
 
-import at.gv.egovernment.moa.id.auth.data.IdentityLink;
-import at.gv.egovernment.moa.id.auth.exception.BuildException;
-import at.gv.egovernment.moa.logging.Logger;
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.util.MiscUtil;
-
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -66,6 +59,13 @@ import javax.crypto.Cipher;
 import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 
+import at.gv.egovernment.moa.id.auth.exception.BuildException;
+import at.gv.egovernment.moa.id.data.Pair;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.Base64Utils;
+import at.gv.egovernment.moa.util.Constants;
+import at.gv.egovernment.moa.util.MiscUtil;
+
 /**
  * Builder for the bPK, as defined in
  * <code>&quot;Ableitung f&uml;r die bereichsspezifische Personenkennzeichnung&quot;</code>
@@ -203,73 +203,42 @@ public class BPKBuilder {
     /**
      * Builds the storkeid from the given parameters.
      *
-     * @param identityLink identity link
-     * @param destinationCountry  destination country code (2 chars)
-     * @return storkid in a BASE64 encoding
-     * @throws BuildException if an error occurs on building the wbPK
-     */
-    public String buildStorkeIdentifier(IdentityLink identityLink, String destinationCountry)
-            throws BuildException {
-        return buildStorkbPK(identityLink.getIdentificationValue(),
-        		identityLink.getIdentificationType(), "AT", destinationCountry);
-    }
-
-    /**
-     * Builds the storkeid from the given parameters.
-     *
-     * @param identityLink identity link
-     * @param destinationCountry  destination country code (2 chars)
-     * @return storkid in a BASE64 encoding
-     * @throws BuildException if an error occurs on building the wbPK
-     */
-    public String buildStorkeIdentifier(String identificationType, String identificationValue, String destinationCountry)
-            throws BuildException {
-        return buildStorkbPK(identificationValue, identificationType, "AT", destinationCountry);
-    }
-
-    /**
-     * Builds the storkeid from the given parameters.
-     *
-     * @param identityLink identity link
-     * @param sourceCountry       source country code (2 chars)
-     * @param destinationCountry  destination country code (2 chars)
-     * @return storkid in a BASE64 encoding
+     * @param baseID baseID of the citizen
+     * @param baseIDType Type of the baseID
+     * @param sourceCountry CountryCode of that country, which build the eIDAs ID
+     * @param destinationCountry CountryCode of that country, which receives the eIDAs ID
+     * 
+     * @return Pair<eIDAs, bPKType> in a BASE64 encoding
      * @throws BuildException if an error occurs on building the wbPK
      */
-    public String buildStorkbPK(String baseID, String baseIDType, String sourceCountry, String destinationCountry)
-            throws BuildException {
-        String identificationValue = null;
-
+    public Pair<String, String> buildeIDASIdentifer(String baseID, String baseIDType, String sourceCountry, String destinationCountry)
+            throws BuildException {        
+        String bPK = null;
+        String bPKType = null;
+        
         // check if we have been called by public sector application
-        if (baseIDType.startsWith(Constants.URN_PREFIX_BASEID)) {        	
-            identificationValue = calculateStorkeIdentifierBase(baseID, sourceCountry, destinationCountry);
+        if (baseIDType.startsWith(Constants.URN_PREFIX_BASEID)) {
+        	bPKType = Constants.URN_PREFIX_EIDAS + "+" + sourceCountry + "+" + destinationCountry;
+            Logger.debug("Building eIDAS identification from: [identValue]+" + bPKType);         
+            bPK = calculatebPKwbPK(baseID + "+"  + bPKType);
             
         } else { // if not, sector identification value is already calculated by BKU
-            Logger.debug("STORK eIdentifier already provided by BKU");
-            identificationValue = baseID;
+            Logger.debug("eIDAS eIdentifier already provided by BKU");
+            bPK = baseID;
         }
 
-        if ((identificationValue == null ||
-                identificationValue.length() == 0 ||
-                destinationCountry == null ||
-                destinationCountry.length() == 0 ||
-                sourceCountry == null ||
-                sourceCountry.length() == 0)) {
+        if ((MiscUtil.isEmpty(bPK) ||
+                MiscUtil.isEmpty(sourceCountry) ||
+                	MiscUtil.isEmpty(destinationCountry))) {
             throw new BuildException("builder.00",
-                    new Object[]{"storkid", "Unvollständige Parameterangaben: identificationValue=" +
-                            identificationValue + ", Zielland=" + destinationCountry + ", Ursprungsland=" + sourceCountry});
+                    new Object[]{"eIDAS-ID", "Unvollständige Parameterangaben: identificationValue=" +
+                            bPK + ", Zielland=" + destinationCountry + ", Ursprungsland=" + sourceCountry});
         }
-        Logger.info("Building STORK identification from: " + sourceCountry+"/"+destinationCountry+"/" + "[identValue]");
-        String eIdentifier = sourceCountry+"/"+destinationCountry+"/"+identificationValue;
-
-        return eIdentifier;
-    }
-    
-    private String calculateStorkeIdentifierBase(String baseID, String sourceCountry, String destinationCountry) throws BuildException {
-        String basisbegriff = baseID + "+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry;
-        Logger.debug("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry);        
-        return calculatebPKwbPK(basisbegriff);
         
+        Logger.debug("Building eIDAS identification from: " + sourceCountry+"/"+destinationCountry+"/" + "[identValue]");
+        String eIdentifier = sourceCountry + "/" + destinationCountry + "/" + bPK;
+        
+        return Pair.newInstance(eIdentifier, baseIDType);
     }
     
     private String calculatebPKwbPK(String basisbegriff) throws BuildException {