1 files changed, 26 insertions, 0 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
index fed4af32..7b9ffcf0 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
@@ -27,6 +27,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map.Entry;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;
@@ -34,6 +35,7 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.Assert;
 import org.springframework.util.Base64Utils;
 
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
@@ -293,6 +295,30 @@ public class BpkBuilder {
   }
   
   /**
+   * Remove prefixes from bPK target identifier and get only the SP specific part.
+   * 
+   * @param type full qualified bPK target with 'urn:publicid:gv.at:' prefix
+   * @return SP specific part, or full type if reduction is not supported 
+   */
+  @Nonnull
+  public static String removeBpkTypePrefix(@Nonnull final String type) {
+    Assert.isTrue(type != null, "bPKType is 'NULL'");
+    if (type.startsWith(EaafConstants.URN_PREFIX_WBPK)) {
+      return type.substring(EaafConstants.URN_PREFIX_WBPK.length());
+      
+    } else if (type.startsWith(EaafConstants.URN_PREFIX_CDID)) {
+      return type.substring(EaafConstants.URN_PREFIX_CDID.length());
+      
+    } else if (type.startsWith(EaafConstants.URN_PREFIX_EIDAS)) {
+      return type.substring(EaafConstants.URN_PREFIX_EIDAS.length());
+      
+    } else {
+      return type;
+      
+    }
+  }
+  
+  /**
    * Builds the eIDAS from the given parameters.
    *
    * @param baseId             baseID of the citizen