1 files changed, 10 insertions, 14 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 c3b45f165..2c8b44404 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
@@ -53,6 +53,7 @@ import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttribute;

 import at.gv.egovernment.moa.id.auth.data.ExtendedSAMLAttributeImpl;

 import at.gv.egovernment.moa.id.auth.data.IdentityLink;

+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

 import at.gv.egovernment.moa.id.auth.exception.ParseException;

 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;

 import at.gv.egovernment.moa.id.client.SZRGWClientException;

@@ -124,8 +125,9 @@ public class STORKResponseProcessor {
 	 * @param filters the filters

 	 * @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 {

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

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

 

 		CreateIdentityLinkResponse identityLinkResponse = null;

@@ -209,8 +211,8 @@ public class STORKResponseProcessor {
 			}

 	    	

 	    	if (null != identityLinkResponse.getErrorResponse()){

-	    		// TODO fix exception parameter

-	    		throw new SZRGWClientException(identityLinkResponse.getErrorResponse().getErrorCode().toString(), null);

+	    		throw new SZRGWClientException("service.08", (String)identityLinkResponse.getErrorResponse().getErrorCode(), 

+	    				(String)identityLinkResponse.getErrorResponse().getInfo());

 	    	}

 	    	else {

 		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream(identityLinkResponse.getIdentityLink()));

@@ -223,19 +225,13 @@ public class STORKResponseProcessor {
 //				}

 

 	    	}

-		} catch (SZRGWClientException e) {

-			Logger.error("Error connecting SZR-Gateway: ", e);

-			throw new STORKException("Error connecting SZR-Gateway: ", e);

+			

 		} catch (ParseException e) {

 			Logger.error("Error parsing IdentityLink received from SZR-Gateway: ", e);

-			throw new STORKException("Error parsing IdentityLink received from SZR-Gateway: ", e);

-		} catch(STORKException e) {

-			throw e;

-		} catch (Exception e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-    		    	

+			throw new MOAIDException("auth.25", null, e);

+			

+		} 

+    		    

     	return identityLink;

 		

 	}