pass signature to szrg connector and only try to parse it there from SignedDoc if it is missing

1 files changed, 11 insertions, 7 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
index 5d7eefe0a..7113dcf70 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
@@ -124,11 +124,12 @@ public class STORKResponseProcessor {
 	 * @param targetType the target type

 	 * @param targetValue the target value

 	 * @param filters the filters

+	 * @param citizenSignature2 

 	 * @return Identity Link

 	 * @throws STORKException the sTORK exception

 	 * @throws MOAIDException 

 	 */

-	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList, String oaFriendlyName, String targetType, String targetValue, List<String> filters) throws STORKException, MOAIDException {

+	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList, String oaFriendlyName, String targetType, String targetValue, List<String> filters, String citizenSignature) throws STORKException, MOAIDException {

 		Logger.trace("Calling SZR Gateway with the following attributes:");

 

 		CreateIdentityLinkResponse identityLinkResponse = null;

@@ -137,12 +138,15 @@ public class STORKResponseProcessor {
 			Logger.trace("Starting call...");

 

 			// if there is no signedDoc attribute, we cannot go on

-			String signResponseString = getAttributeValue("signedDoc", attributeList);

-			

-			//Extract signature from SIgnResponse

-			Source response1 = new StreamSource(new java.io.StringReader(signResponseString));

-			SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class);

-			String citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse);

+			if(citizenSignature==null || citizenSignature.length()==0)

+			{

+				String signResponseString = getAttributeValue("signedDoc", attributeList);

+				

+				//Extract signature from SIgnResponse

+				Source response1 = new StreamSource(new java.io.StringReader(signResponseString));

+				SignResponse dssSignResponse = ApiUtils.unmarshal(response1, SignResponse.class);

+				citizenSignature = getCitizienSignatureFromSignResponse(dssSignResponse);

+			}

 			

 			String fiscalNumber = getAttributeValue("fiscalNumber", attributeList, false);