1 files changed, 10 insertions, 17 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index be307ae14..d42cd85dc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -24,6 +24,7 @@
 
 package at.gv.egovernment.moa.id.auth.servlet;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.security.cert.CertificateException;
 import java.util.Map;
@@ -47,14 +48,14 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;
 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
-import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateIdentityLinkResponse;
-import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException;
+import at.gv.egovernment.moa.id.client.SZRGWClientException;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.moduls.ModulUtils;
 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
 
 /**
  * Servlet requested for getting the foreign eID
@@ -165,20 +166,12 @@ public class GetForeignIDServlet extends AuthServlet {
 	    	CreateIdentityLinkResponse response = AuthenticationServer.getInstance().getIdentityLink(signature);
 	    	
 	   	    	
-	    	if (response.isError()) {	    		
-	    		throw new SZRGWClientException(response.getError());
+	    	if (null != response.getErrorResponse()){
+	    		// TODO fix exception parameter
+	    		throw new SZRGWClientException(response.getErrorResponse().getErrorCode().toString(), null);
 	    	}
 	    	else {
-	    		
-	    		Element samlAssertion = response.getAssertion();
-	    		
-	    		try {
-					System.out.println("PB: " + DOMUtils.serializeNode(samlAssertion));
-				} catch (TransformerException e) {
-					e.printStackTrace();
-				}
-		    	
-		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(samlAssertion);
+		    	IdentityLinkAssertionParser ilParser = new IdentityLinkAssertionParser(new ByteArrayInputStream(response.getIdentityLink()));
 		    	IdentityLink identitylink = ilParser.parseIdentityLink();
 		    	session.setIdentityLink(identitylink);
 	  	   	
@@ -225,9 +218,9 @@ public class GetForeignIDServlet extends AuthServlet {
 	    }
 	    catch (MOAIDException ex) {
 	      handleError(null, ex, req, resp, pendingRequestID);
-	    } 
-	    catch (SZRGWClientException ex) {
-	       handleError(null, ex, req, resp, pendingRequestID);
+		} catch (Exception e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
 		}
   }