From 75ec33df8fc5d90d628f0ed6451d2b2d23519415 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Tue, 13 Jul 2021 17:51:49 +0300
Subject: [PATCH] CB-1121 Session cookie added

---
 .../src/io/cloudbeaver/model/session/WebSession.java         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
index 41041dbbcc..fe6d02e579 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/session/WebSession.java
@@ -435,8 +435,9 @@ public class WebSession implements DBASession, DBAAuthCredentialsProvider, IAdap
             }
         }
         {
-            Cookie sessionCookie = new Cookie(SESSION_TEMP_COOKIE, String.valueOf(System.currentTimeMillis()));
-            sessionCookie.setMaxAge((int) (CBApplication.getInstance().getMaxSessionIdleTime() / 1000));
+            long maxSessionIdleTime = CBApplication.getInstance().getMaxSessionIdleTime();
+            Cookie sessionCookie = new Cookie(SESSION_TEMP_COOKIE, CBConstants.ISO_DATE_FORMAT.format(new Date(System.currentTimeMillis() + maxSessionIdleTime)));
+            sessionCookie.setMaxAge((int) (maxSessionIdleTime / 1000));
             //sessionCookie.setComment("CB session cookie");
             response.addCookie(sessionCookie);
         }