Session: make sure MemorySessionStore save the sid when asking for newSession

jknack · jknack · commit bb66286275f5 · 2019-11-14T00:07:30.000-03:00
diff --git a/jooby/src/main/java/io/jooby/internal/MemorySessionStore.java b/jooby/src/main/java/io/jooby/internal/MemorySessionStore.java
@@ -38,11 +38,13 @@ public MemorySessionStore(SessionToken token) {
 
   @Override public Session newSession(Context ctx) {
     String sessionId = token.newToken();
-    Instant now = Instant.now();
-    Session session = Session.create(ctx, sessionId)
-        .setCreationTime(now)
-        .setLastAccessedTime(now)
-        .setNew(true);
+    SessionData data = sessions.computeIfAbsent(sessionId, sid -> {
+      Instant now = Instant.now();
+      return new SessionData(now, now, new ConcurrentHashMap());
+    });
+
+    Session session = restore(ctx, sessionId, data);
+
     token.saveToken(ctx, sessionId);
     return session;
   }
@@ -54,9 +56,7 @@ public MemorySessionStore(SessionToken token) {
     }
     SessionData data = sessions.get(sessionId);
     if (data != null) {
-      Session session = Session.create(ctx, sessionId, data.hash);
-      session.setLastAccessedTime(data.lastAccessedTime);
-      session.setCreationTime(data.creationTime);
+      Session session = restore(ctx, sessionId, data);
       token.saveToken(ctx, sessionId);
       return session;
     }
@@ -79,4 +79,10 @@ public MemorySessionStore(SessionToken token) {
         new SessionData(session.getCreationTime(), Instant.now(), session.toMap()));
     token.saveToken(ctx, sessionId);
   }
+
+  private Session restore(Context ctx, String sessionId, SessionData data) {
+    return Session.create(ctx, sessionId, data.hash)
+        .setLastAccessedTime(data.lastAccessedTime)
+        .setCreationTime(data.creationTime);
+  }
 }
diff --git a/tests/src/test/java/io/jooby/SessionTest.java b/tests/src/test/java/io/jooby/SessionTest.java
@@ -1,9 +1,6 @@
 package io.jooby;
 
-import io.jooby.jetty.Jetty;
 import io.jooby.jwt.JwtSessionStore;
-import io.jooby.netty.Netty;
-import io.jooby.utow.Utow;
 import okhttp3.Response;
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
