SSO and Configuration updated

TODO:
  --PVP2 from configuration
  --UseIFrame for OAs
  --SSO with mandates
  --Resign IdentityLink
  --Encrypted MOASession in Database

1 files changed, 19 insertions, 14 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index ffe938d89..94a41a21f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
@@ -145,8 +145,6 @@ public class AuthenticationSession implements Serializable {
 	 */
 	private String misSessionID;
 	
-	private String mandateData;
-	
 	//store Identitylink
 	/**
 	 * identity link read from smartcard
@@ -231,6 +229,7 @@ public class AuthenticationSession implements Serializable {
 	private boolean authenticated;
 	private boolean authenticatedUsed = false;
 	
+	private boolean ssoRequested = false;
 	
 //	/**
 //	 * Indicates if target from configuration is used or not
@@ -294,15 +293,6 @@ public class AuthenticationSession implements Serializable {
 	public void setAction(String action) {
 		this.action = action;
 	}
-	
-	public String getMandateData() {
-		return mandateData;
-	}
-
-	public void setMandateData(String mandateData) {
-		this.mandateData = mandateData;
-	}
-
 
 //	public AuthenticationData getAuthData() {
 //		return authData;
@@ -1106,8 +1096,23 @@ public class AuthenticationSession implements Serializable {
 		}catch (Throwable e) {
 			Logger.warn("Mandate content could not be generated from MISMandate.");
 			return null;
-		}
-		
-		
+		}		
 	}
+
+	/**
+	 * @return the ssoRequested
+	 */
+	
+	//TODO: SSO only allowed without mandates, actually  
+	public boolean isSsoRequested() {
+		return ssoRequested && !useMandate;
+	}
+
+	/**
+	 * @param ssoRequested the ssoRequested to set
+	 */
+	public void setSsoRequested(boolean ssoRequested) {
+		this.ssoRequested = ssoRequested;
+	}
+	
 }