1 files changed, 8 insertions, 32 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index f1ee4c181..f05180932 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -78,9 +78,6 @@ public class PEPSConnectorServlet extends AuthServlet {
 				//No authentication session has been started before
 				Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started");
 				throw new AuthenticationException("auth.02", new Object[] { moaSessionID });
-			} else {
-				//We know user and MOA takes over session handling, invalidate HttpSession
-				httpSession.invalidate();
 			}
 			
 			pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID);
@@ -192,49 +189,28 @@ public class PEPSConnectorServlet extends AuthServlet {
 			Logger.info("Received Identity Link from SZR Gateway");
 			moaSession.setIdentityLink(identityLink);
 			
-			Logger.debug("Adding addtional STORK attributes to MOA assertion");
-			//add other stork attributes to MOA assertion
-			List<ExtendedSAMLAttribute> moaExtendedSAMLAttibutes = STORKResponseProcessor.addAdditionalSTORKAttributes(storkAssertion.getAttributeStatements().get(0).getAttributes());
-			moaSession.setExtendedSAMLAttributesOA(moaExtendedSAMLAttibutes);
+			Logger.debug("Adding addtional STORK attributes to MOA session");
+			moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList());
 			
 			//We don't have BKUURL, setting from null to "Not applicable"
 			moaSession.setBkuURL("Not applicable (STORK Authentication)");
-						
-			Logger.debug("Starting to assemble MOA assertion");
-			//produce MOA-Assertion and artifact			
-			String samlArtifactBase64 = 
-	    		AuthenticationServer.getInstance().getForeignAuthenticationData(moaSession);
-			Logger.info("MOA assertion assembled and SAML Artifact generated.");
+
+			// free for single use
+			moaSession.setAuthenticatedUsed(false);
+			
+			// stork did the authentication step
+			moaSession.setAuthenticated(true);
 			
     		//session is implicit stored in changeSessionID!!!!
     		String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(moaSession);
     		
     		Logger.info("Changed MOASession " + moaSessionID + " to Session " + newMOASessionID);
-    		Logger.info("Daten angelegt zu MOASession " + newMOASessionID);
 			
 			//redirect
 			String redirectURL = null;
-	    	if (!samlArtifactBase64.equals("Redirect to Input Processor")) {
-	    		/*redirectURL = moaSession.getOAURLRequested();
-	    		if (!moaSession.getBusinessService()) {
-	    			redirectURL = addURLParameter(redirectURL, PARAM_TARGET, URLEncoder.encode(moaSession.getTarget(), "UTF-8"));
-	    		}
-	    		redirectURL = addURLParameter(redirectURL, PARAM_SAMLARTIFACT, URLEncoder.encode(samlArtifactBase64, "UTF-8"));
-	    		redirectURL = response.encodeRedirectURL(redirectURL);*/
-	    			    		
 	    		redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), 
 						ModulUtils.buildAuthURL(moaSession.getModul(), moaSession.getAction(), pendingRequestID), newMOASessionID);
 	    		redirectURL = response.encodeRedirectURL(redirectURL);
-	    	} else {
-	    		
-	    		redirectURL = new DataURLBuilder().buildDataURL(moaSession.getAuthURL(), AuthenticationServer.REQ_PROCESS_VALIDATOR_INPUT, newMOASessionID);
-	    	}
-	    	
-	        try {
-				AuthenticationSessionStoreage.storeSession(moaSession);
-			} catch (MOADatabaseException e) {
-				throw new MOAIDException("Session store error", null);
-			}
 	    	
 	    	response.setContentType("text/html");
 	    	response.setStatus(302);