Skip to content

Commit c13179f

Browse files
authored
Merge pull request #27 from softwaremill/duplicated_session
do not set session when it expired
2 parents c9c4ec8 + 0f7f570 commit c13179f

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

Diff for: core/src/main/scala/com/softwaremill/session/SessionDirectives.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ trait RefreshableSessionDirectives { this: OneOffSessionDirectives =>
210210
}
211211
}
212212
}
213-
}
213+
}

Diff for: core/src/test/scala/com/softwaremill/session/RefreshableTest.scala

+17
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,23 @@ class RefreshableTest extends FlatSpec with ScalatestRouteTest with Matchers wit
106106
}
107107
}
108108

109+
p should "set a new session after the session is re-created" in {
110+
Get("/set") ~> routes ~> check {
111+
val Some(token1) = using.getRefreshToken
112+
val session1 = using.getSession
113+
session1 should be('defined)
114+
115+
Get("/getOpt") ~>
116+
addHeader(using.setRefreshTokenHeader(token1)) ~>
117+
routes ~>
118+
check {
119+
val session2 = using.getSession
120+
session2 should be('defined)
121+
session2 should not be (session1)
122+
}
123+
}
124+
}
125+
109126
p should "read an optional session when none is set" in {
110127
Get("/getOpt") ~> routes ~> check {
111128
responseAs[String] should be("None")

0 commit comments

Comments
 (0)