1 files changed, 7 insertions, 12 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
index 2c77db94e..def89d0d9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
@@ -31,32 +31,28 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Properties;
 
 import javax.activation.DataSource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.xml.namespace.QName;
 import javax.xml.transform.Source;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.ws.Service;
 import javax.xml.ws.soap.SOAPBinding;
 import javax.xml.ws.BindingProvider;
 
 import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.AttributeStatusType;
-import org.apache.commons.codec.binary.Base64;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.NotImplementedException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
-import org.bouncycastle.util.encoders.UrlBase64;
 
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.IAuthData;
 import at.gv.egovernment.moa.id.protocols.stork2.ExternalAttributeRequestRequiredException;
@@ -64,11 +60,11 @@ import at.gv.egovernment.moa.id.protocols.stork2.MOASTORKRequest;
 import at.gv.egovernment.moa.id.protocols.stork2.UnsupportedAttributeException;
 import at.gv.egovernment.moa.id.util.VelocityProvider;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.Base64Utils;
 import eu.stork.oasisdss.api.ApiUtils;
 import eu.stork.oasisdss.api.LightweightSourceResolver;
 import eu.stork.oasisdss.api.ResultMajor;
 import eu.stork.oasisdss.api.exceptions.ApiUtilsException;
-import eu.stork.oasisdss.api.exceptions.UtilsException;
 import eu.stork.oasisdss.profile.AnyType;
 import eu.stork.oasisdss.profile.Base64Data;
 import eu.stork.oasisdss.profile.DocumentType;
@@ -84,7 +80,6 @@ import eu.stork.peps.auth.commons.STORKAttrQueryRequest;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 import eu.stork.documentservice.DocumentService;
-import eu.stork.documentservice.data.DatabaseConnectorMySQLImpl;
 /**
  * Forwards a signedDoc attribute request to the oasis-dss service instance
  */
@@ -110,7 +105,7 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 		this.oasisDssWebFormURL = oasisDssWebFormURL;
 
 		try {
-			AuthConfigurationProvider authConfigurationProvider = AuthConfigurationProvider.getInstance();
+			AuthConfiguration authConfigurationProvider = AuthConfigurationProviderFactory.getInstance();
 			dtlUrl = authConfigurationProvider.getDocumentServiceUrl();
 			Logger.info ("SignedDocAttributeRequestProvider, using dtlUrl:"+dtlUrl);
 		} catch (Exception e) {
@@ -174,7 +169,7 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 			Logger.debug("signresponse method: " + httpReq.getMethod());
 			Logger.debug("signresponse content type: " + httpReq.getContentType());
 			Logger.debug("signresponse parameter:"+base64);
-			String signResponseString = new String(Base64.decodeBase64(base64), "UTF8");
+			String signResponseString = new String(Base64Utils.decode(base64, false), "UTF8");
 			Logger.debug("RECEIVED signresponse:"+signResponseString);
 			//create SignResponse object
 			Source response = new StreamSource(new java.io.StringReader(signResponseString));
@@ -444,7 +439,7 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 				e.printStackTrace();
 			}
 			
-			context.put("signrequest", Base64.encodeBase64String(signRequestString.getBytes("UTF8")));
+			context.put("signrequest", Base64Utils.encode(signRequestString.getBytes("UTF8")));
 			context.put("clienturl", url);
 			context.put("action", oasisDssWebFormURL);