1 files changed, 15 insertions, 8 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/AuthenticatedUser.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/AuthenticatedUser.java
index 036acf1f6..3bfe409c0 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/AuthenticatedUser.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/auth/AuthenticatedUser.java
@@ -42,6 +42,7 @@ public class AuthenticatedUser {
 	private String institute;
 	private String userName;
 	private Date lastLogin;
+	private Date sessionExpired; 
 	
 	private boolean onlyBusinessService = false;
 	private String businessServiceType;
@@ -54,7 +55,7 @@ public class AuthenticatedUser {
 		
 	}
 	
-	public static AuthenticatedUser generateDefaultUser() {
+	public static AuthenticatedUser generateDefaultUser(Date sessionExpired) {
 		
 		AuthenticatedUser user = new AuthenticatedUser();		
 		user.familyName = "TestUser";
@@ -67,12 +68,13 @@ public class AuthenticatedUser {
 		user.isMandateUser = false;
 		user.isPVP2Login = false;
 		user.lastLogin = new Date();
+		user.sessionExpired = sessionExpired;
 		
 		return user;
 	}
 	
 	public static AuthenticatedUser generateUserRequestUser(UserDatabaseFrom form, 
-			String nameID, String nameIDFormat) {
+			String nameID, String nameIDFormat, Date sessionExpired) {
 		
 		AuthenticatedUser user = new AuthenticatedUser();		
 		user.familyName = form.getFamilyName();
@@ -85,6 +87,7 @@ public class AuthenticatedUser {
 		user.isMandateUser = form.isIsmandateuser();
 		user.isPVP2Login = form.isPVPGenerated();
 		user.lastLogin = new Date();
+		user.sessionExpired = sessionExpired;
 		
 		user.nameID = nameID;
 		user.nameIDFormat = nameIDFormat;
@@ -93,7 +96,7 @@ public class AuthenticatedUser {
 	}
 	
 	public AuthenticatedUser(UserDatabase userdb, boolean isAuthenticated, boolean isMandateUser, 
-			boolean isPVP2Login, String nameID, String nameIDFormat) {
+			boolean isPVP2Login, String nameID, String nameIDFormat, Date sessionExpired) {
 		
 		this.familyName = userdb.getFamilyname();
 		this.givenName = userdb.getGivenname();
@@ -105,6 +108,7 @@ public class AuthenticatedUser {
 		this.isMandateUser = isMandateUser;
 		this.isPVP2Login = isPVP2Login;
 		this.lastLogin = new Date();
+		this.sessionExpired = sessionExpired;
 		
 		this.nameID = nameID;
 		this.nameIDFormat = nameIDFormat;
@@ -250,10 +254,13 @@ public class AuthenticatedUser {
 	public String getNameIDFormat() {
 		return nameIDFormat;
 	}
-	
-	
-	
-	
-	
+
+	/**
+	 * @return the sessionExpired
+	 */
+	public Date getSessionExpired() {
+		return sessionExpired;
+	}
+
 
 }