Modified SingleLogOutAction to work with REDIS

3 files changed, 51 insertions, 1 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
index 89df47615..fa8ca8547 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/DBTransactionStorage.java
@@ -104,7 +104,11 @@ public class DBTransactionStorage implements ITransactionStorage {
 			Logger.error("This exeption should not occur!!!!", e);
 			return null;
 			
-		}
+		}	
+	}
+	
+	public Object getAssertionStore(String key) throws MOADatabaseException{
+		return searchInDatabase(key);
 	}
 	
 	public Object get(String key) throws MOADatabaseException {
@@ -260,4 +264,11 @@ public class DBTransactionStorage implements ITransactionStorage {
 		
 	}
 
+	@Override
+	public void putAssertionStore(Object element) throws MOADatabaseException{
+		// TODO Auto-generated method stub
+		entityManager.merge(element);
+		
+	}
+
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java
index 4651566fc..53a7f4f5e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/ITransactionStorage.java
@@ -111,4 +111,21 @@ public interface ITransactionStorage {
 	 */
 	public List<String> clean(Date now, long dataTimeOut);
 	
+	
+	/**
+	 * Get whole AssertionStoreObject, required for SLO
+	 * 
+	 * @param key key Id which identifiers the data object
+	 * @return The transaction-data object, or null
+	 * @throws MOADatabaseException In case of load operation failed
+	 */
+	public Object getAssertionStore(String key) throws MOADatabaseException;
+	
+	/**
+	 * Put whole AssertionStoreObject to db, required for SLO
+	 * 
+	 * @param element assertion store object
+	 */
+	public void putAssertionStore(Object element) throws MOADatabaseException;
+	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
index cae73fafd..c17bff358 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/RedisTransactionStorage.java
@@ -352,4 +352,26 @@ private AssertionStore prepareAssertion(AssertionStore element, String key, Obje
 		
 	}
 
+@Override
+public Object getAssertionStore(String key) throws MOADatabaseException {
+	return searchInDatabase(key);
+}
+
+@Override
+public void putAssertionStore(Object element) throws MOADatabaseException {
+	// TODO Auto-generated method stub
+	AssertionStore as = (AssertionStore)element;
+	final int expTime = redisTemplate.getExpire(as.getArtifact(), TimeUnit.MILLISECONDS).intValue();
+	//AssertionStore element = searchInDatabase(oldKey);		
+	if (expTime < 0) {
+		Logger.info("No transaction-data with oldKey:" + as.getArtifact()
+				+ " found. Process gets stopped.");
+		throw new MOADatabaseException("No transaction-data with oldKey:" + as.getArtifact()
+				+ " found. Process gets stopped.");
+		
+	}
+	redisTemplate.opsForValue().set(as.getArtifact(), new String(assertionStoreSerializer.serialize(element)),expTime,TimeUnit.MILLISECONDS);
+	
+}
+
 }