summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/session/Session.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session/Session.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/session/Session.java20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java
index f91a3ae..ed36274 100644
--- a/src/main/java/org/openslx/imagemaster/session/Session.java
+++ b/src/main/java/org/openslx/imagemaster/session/Session.java
@@ -1,5 +1,6 @@
package org.openslx.imagemaster.session;
+import org.openslx.bwlp.thrift.iface.UserInfo;
import org.openslx.imagemaster.Globals;
/**
@@ -12,9 +13,9 @@ public class Session
private static final long TIMEOUT = Long.valueOf( Globals.getSessionTimeoutUser() ) * 1000L;
private long timeOut = 0;
- private final User user;
+ private final UserInfo user;
- public Session(final User dbuser)
+ public Session( final UserInfo dbuser )
{
this.user = dbuser;
this.timeOut = System.currentTimeMillis() + TIMEOUT;
@@ -29,17 +30,17 @@ public class Session
public synchronized boolean timedOut()
{
- return System.currentTimeMillis() > this.timeOut;
+ return this.timeOut == 0 || System.currentTimeMillis() > this.timeOut;
}
- public String getSatelliteAddress()
+ public synchronized void invalidate()
{
- return user.satelliteAddress;
+ this.timeOut = 0;
}
public String getLogin()
{
- return user.login;
+ return user.userId;
}
public String getFirstName()
@@ -56,10 +57,15 @@ public class Session
{
return user.eMail;
}
-
+
public String getOrgenizationId()
{
return user.organizationId;
}
+ public UserInfo getUserInfo()
+ {
+ return user;
+ }
+
}