refactor authentication process to use service-provider configuration from pending-request

3 files changed, 14 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index b6df5e5c6..4131e49fc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -496,6 +496,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		AuthenticationSession moasession;
 		try {
 			moasession = authenticatedSessionStore.createSession(pendingReq);
+			pendingReq.setMOASessionIdentifier(moasession.getSessionID());
 			
 		} catch (MOADatabaseException e1) {
 			Logger.error("Database Error! MOASession can not be created!");
@@ -514,7 +515,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 			
 			boolean leagacyMode = (legacyallowed && legacyparamavail);			
 			executionContext.put("isLegacyRequest", leagacyMode);
-			executionContext.put("performBKUSelection", leagacyMode 
+			executionContext.put("performBKUSelection", !leagacyMode 
 					&& MiscUtil.isEmpty(pendingReq.getGenericData(RequestImpl.DATAID_INTERFEDERATIOIDP_URL, String.class)));
 							
 			//add leagcy parameters to context
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequestStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequestStorage.java
index 6f46edce3..d26af89a2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequestStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/IRequestStorage.java
@@ -23,6 +23,7 @@
 package at.gv.egovernment.moa.id.moduls;
 
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 
 /**
  * @author tlenz
@@ -36,6 +37,6 @@ public interface IRequestStorage {
 	
 	public void removePendingRequest(String requestID);
 	
-	public String changePendingRequestID(IRequest pendingRequest) throws MOAIDException;
+	public String changePendingRequestID(IRequest pendingRequest) throws MOAIDException, MOADatabaseException;
 	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
index 66ca42398..c49df43fa 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
@@ -44,14 +44,19 @@ public class RequestStorage implements IRequestStorage{
 		
 		try {
 			IRequest pendingRequest = transactionStorage.get(pendingReqID, IRequest.class);
-			
+			if (pendingRequest == null) {
+				Logger.info("No PendingRequst found with pendingRequestID " + pendingReqID);			
+				return null;
+				
+			}
+					
 			//set transactionID and sessionID to Logger
 			TransactionIDUtils.setTransactionId(pendingRequest.getUniqueTransactionIdentifier());
 			TransactionIDUtils.setSessionId(pendingRequest.getUniqueSessionIdentifier());
 			
 			return pendingRequest;
 		
-		} catch (MOADatabaseException e) {
+		} catch (MOADatabaseException | NullPointerException e) {
 			Logger.info("No PendingRequst found with pendingRequestID " + pendingReqID);			
 			return null;
 			
@@ -106,16 +111,17 @@ public class RequestStorage implements IRequestStorage{
 	 * @see at.gv.egovernment.moa.id.storage.IRequestStorage#changePendingRequestID(at.gv.egovernment.moa.id.moduls.IRequest)
 	 */
 	@Override
-	public String changePendingRequestID(IRequest pendingRequest) throws MOAIDException {
+	public String changePendingRequestID(IRequest pendingRequest) throws MOAIDException, MOADatabaseException {
 
 		if (pendingRequest instanceof RequestImpl) {
 			String newRequestID = Random.nextRandom();
+			String oldRequestID = pendingRequest.getRequestID();
 			
 			Logger.debug("Change pendingRequestID from " + pendingRequest.getRequestID() 
 				+ " to " + newRequestID);
 			
 			((RequestImpl)pendingRequest).setRequestID(newRequestID);			
-			storePendingRequest(pendingRequest);
+			transactionStorage.changeKey(oldRequestID, newRequestID, pendingRequest);
 			
 			return newRequestID;