From e9bdcfe9ffaf6974ce1fbf404279536b7c6368c2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 15 May 2024 16:51:50 +0200
Subject: RPC: Add option to set session timeout on creation

---
 src/main/java/org/openslx/imagemaster/session/Session.java   | 12 ++++++++++--
 .../java/org/openslx/imagemaster/session/SessionManager.java |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster/session')

diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java
index 3cdcd0f..df6dd5c 100644
--- a/src/main/java/org/openslx/imagemaster/session/Session.java
+++ b/src/main/java/org/openslx/imagemaster/session/Session.java
@@ -14,11 +14,19 @@ public class Session
 
 	private long timeOut = 0;
 	private final UserInfo user;
-
+	
 	public Session( final UserInfo dbuser )
 	{
+		this( dbuser, TIMEOUT );
+	}
+
+	public Session( final UserInfo dbuser, long timeout )
+	{
+		if ( timeout <= 0 ) {
+			timeout = TIMEOUT;
+		}
 		this.user = dbuser;
-		this.timeOut = System.currentTimeMillis() + TIMEOUT;
+		this.timeOut = System.currentTimeMillis() + timeout;
 	}
 
 	public synchronized void refresh()
diff --git a/src/main/java/org/openslx/imagemaster/session/SessionManager.java b/src/main/java/org/openslx/imagemaster/session/SessionManager.java
index a7c7cb9..81b8530 100644
--- a/src/main/java/org/openslx/imagemaster/session/SessionManager.java
+++ b/src/main/java/org/openslx/imagemaster/session/SessionManager.java
@@ -65,6 +65,8 @@ public class SessionManager
 
 	public static void addAuthError( TAuthorizationException ex, String accessToken )
 	{
+		if ( accessToken == null )
+			return;
 		accessCodes.put( accessToken, new AccessCode( null, ex ) );
 	}
 
-- 
cgit v1.2.3-55-g7522