1 files changed, 35 insertions, 46 deletions
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 bfe1151c4..21b4e2b65 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
@@ -22,64 +22,53 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.moduls;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.storage.AssertionStorage;
 import at.gv.egovernment.moa.logging.Logger;
 
 public class RequestStorage {
 
-	private static final String PENDING_REQUEST = "PENDING_REQUEST";
-
-	public static Map<String,IRequest> getPendingRequest(HttpSession session) {
+	public static IRequest getPendingRequest(String pendingReqID) {
 		
-				
-			Object obj = session.getAttribute(PENDING_REQUEST);
-			if (obj != null) {
-				synchronized (obj) {
-					if (obj instanceof Map<?,?>) {
-						if (((Map<?,?>) obj).size() > 0) {
-							if ( ((Map<?,?>) obj).keySet().toArray()[0] instanceof String) {
-								if (((Map<?,?>) obj).get(((Map<?,?>) obj).keySet().toArray()[0]) 
-										instanceof IRequest) {
-									return (Map<String, IRequest>) obj;
-							
-							
-							
-								}
-							}
-						}
-					}
-				}
-				session.setAttribute(PENDING_REQUEST, null);
-			}
+		try {
+			AssertionStorage storage = AssertionStorage.getInstance();
+			IRequest pendingRequest = storage.get(pendingReqID, IRequest.class);
+			return pendingRequest;
+		
+		} catch (MOADatabaseException e) {
+			Logger.info("No PendingRequst found with pendingRequestID " + pendingReqID);			
 			return null;
+			
+		}
 	}
 
-	public static void setPendingRequest(HttpSession session, Map<String, IRequest> request) {
-		session.setAttribute(PENDING_REQUEST, request);
-	}
-
-	public static void removeAllPendingRequests(HttpSession session) {
-		
-		Logger.debug(RequestStorage.class.getName()+": Remove all PendingRequests");
+	public static void setPendingRequest(Object pendingRequest) throws MOAIDException {
+		try {
+			AssertionStorage storage = AssertionStorage.getInstance();
+			
+			if (pendingRequest instanceof IRequest) {
+				storage.put(((IRequest)pendingRequest).getRequestID(), pendingRequest);
+				
+			} else {
+				throw new MOAIDException("auth.20", null);
+				
+			}
+			
+		} catch (MOADatabaseException e) {
+			Logger.warn("Pending Request with ID=" + ((IRequest)pendingRequest).getRequestID() +
+					" can not stored.", e);
+			throw new MOAIDException("auth.20", null);
+		}
 		
-		session.setAttribute(PENDING_REQUEST, null);
 	}
 	
-	public static void removePendingRequest(Map<String, IRequest> requestmap, String requestID) {
-		
-		if (requestmap != null && requestID != null) {
+	public static void removePendingRequest(String requestID) {
 		
-			synchronized (requestmap) {
-						
-				if (requestmap.containsKey(requestID)) {
-					requestmap.remove(requestID);
-					Logger.debug(RequestStorage.class.getName()+": Remove PendingRequest with ID " + requestID);
-				
-				}
-			}
+		if (requestID != null) {
+			AssertionStorage storage = AssertionStorage.getInstance();
+			storage.remove(requestID);
+			
 		}
 	}
 }