1 files changed, 20 insertions, 39 deletions
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpEndPointCredentialProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpEndPointCredentialProvider.java
index 92373328..0ae5f76d 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpEndPointCredentialProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/provider/PvpEndPointCredentialProvider.java
@@ -23,9 +23,6 @@
 
 package at.asitplus.eidas.specific.connector.provider;
 
-import java.net.MalformedURLException;
-
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,8 +30,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
+import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration;
+import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration.KeyStoreType;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
 public class PvpEndPointCredentialProvider extends AbstractCredentialProvider {
@@ -44,41 +41,25 @@ public class PvpEndPointCredentialProvider extends AbstractCredentialProvider {
   IConfiguration basicConfiguration;
 
   @Override
-  public String getFriendlyName() {
-    return "PVP2 S-Profile EndPoint";
-  }
-
-  @Override
-  public String getKeyStoreFilePath() throws EaafException {
-    try {
-      final String path = basicConfiguration.getBasicConfiguration(
-          MsEidasNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PATH);
-      if (StringUtils.isEmpty(path)) {
-        log.error(getFriendlyName() + " | Path to keyStore is NULL or EMPTY");
-        throw new EaafConfigurationException("config.27",
-            new Object[] { getFriendlyName() + " | Path to keyStore is NULL or EMPTY" });
-
-      }
-
-      return FileUtils.makeAbsoluteUrl(
-          path,
-          basicConfiguration.getConfigurationRootDirectory());
-
-    } catch (final MalformedURLException e) {
-      log.error(getFriendlyName() + " | Path to keyStore NOT valid.", e);
-      throw new EaafConfigurationException("config.27",
-          new Object[] { getFriendlyName() + " | Path to keyStore NOT valid." }, e);
-
-    }
-
-  }
-
-  @Override
-  public String getKeyStorePassword() {
-    return basicConfiguration.getBasicConfiguration(MsEidasNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PASSWORD);
-
+  public KeyStoreConfiguration getBasicKeyStoreConfig() throws EaafConfigurationException {
+    final KeyStoreConfiguration keyStoreConfig = new KeyStoreConfiguration();
+    keyStoreConfig.setFriendlyName("PVP2 S-Profile EndPoint");
+    keyStoreConfig.setKeyStoreType(
+        basicConfiguration.getBasicConfiguration(MsEidasNodeConstants.CONFIG_PROPS_KEYSTORE_TYPE,
+            KeyStoreType.PKCS12.getKeyStoreType()));
+    keyStoreConfig.setKeyStoreName(
+        basicConfiguration.getBasicConfiguration(MsEidasNodeConstants.CONFIG_PROPS_KEYSTORE_NAME));
+    keyStoreConfig.setSoftKeyStoreFilePath(basicConfiguration.getBasicConfiguration(
+        MsEidasNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PATH));
+    keyStoreConfig.setSoftKeyStorePassword(
+        basicConfiguration.getBasicConfiguration(MsEidasNodeConstants.PROP_CONFIG_PVP2_KEYSTORE_PASSWORD));
+
+    keyStoreConfig.validate();
+    
+    return keyStoreConfig;
   }
-
+  
+ 
   @Override
   public String getMetadataKeyAlias() {
     return basicConfiguration.getBasicConfiguration(MsEidasNodeConstants.PROP_CONFIG_PVP2_KEY_METADATA_ALIAS);