#4: moving csrf/session options to a separate object

Author: adamw

core/src/main/scala/com/softwaremill/session/CsrfDirectives.scala

@@ -52,10 +52,6 @@ trait CsrfDirectives {
 
   def setNewCsrfToken[T](checkMode: CsrfCheckMode[T]): Directive0 =
     setCookie(checkMode.csrfManager.createCookie())
-
-  def checkHeader[T](implicit manager: SessionManager[T]): CheckHeader[T] = new CheckHeader[T]()
-  def checkHeaderAndForm[T](implicit manager: SessionManager[T], materializer: Materializer): CheckHeaderAndForm[T] =
-    new CheckHeaderAndForm[T]()
 }
 
 object CsrfDirectives extends CsrfDirectives
@@ -67,4 +63,10 @@ sealed trait CsrfCheckMode[T] {
 class CheckHeader[T] private[session] (implicit val manager: SessionManager[T]) extends CsrfCheckMode[T]
 class CheckHeaderAndForm[T] private[session] (implicit
   val manager: SessionManager[T],
-  val materializer: Materializer) extends CsrfCheckMode[T]
+  val materializer: Materializer) extends CsrfCheckMode[T]
+
+object CsrfOptions {
+  def checkHeader[T](implicit manager: SessionManager[T]): CheckHeader[T] = new CheckHeader[T]()
+  def checkHeaderAndForm[T](implicit manager: SessionManager[T], materializer: Materializer): CheckHeaderAndForm[T] =
+    new CheckHeaderAndForm[T]()
+}

core/src/main/scala/com/softwaremill/session/SessionDirectives.scala

@@ -80,7 +80,11 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
   def touchRequiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport): Directive1[T] = {
     requiredSession(sc, st).flatMap { d => setOneOffSessionSameTransport(sc, st, d) & provide(d) }
   }
+}
+
+object SessionDirectives extends SessionDirectives
 
+object SessionOptions {
   def oneOff[T](implicit manager: SessionManager[T]): OneOff[T] = new OneOff[T]()(manager)
 
   def refreshable[T](implicit
@@ -94,8 +98,6 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
   def usingCookiesOrHeaders = CookieOrHeaderST
 }
 
-object SessionDirectives extends SessionDirectives
-
 trait OneOffSessionDirectives {
   private[session] def setOneOffSession[T](sc: SessionContinuity[T], st: SetSessionTransport, v: T): Directive0 =
     st match {

core/src/test/scala/com/softwaremill/session/CsrfDirectivesTest.scala

@@ -6,6 +6,7 @@ import akka.http.scaladsl.server.AuthorizationFailedRejection
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.CsrfDirectives._
+import com.softwaremill.session.CsrfOptions._
 import org.scalatest.{ShouldMatchers, FlatSpec}
 
 class CsrfDirectivesTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers {

core/src/test/scala/com/softwaremill/session/MultipleTransportTest.scala

@@ -3,7 +3,7 @@ package com.softwaremill.session
 import akka.http.scaladsl.model.{DateTime, HttpHeader}
 import akka.http.scaladsl.model.headers.{RawHeader, HttpCookie, Cookie, `Set-Cookie`}
 import akka.http.scaladsl.testkit.ScalatestRouteTest
-import com.softwaremill.session.SessionDirectives._
+import com.softwaremill.session.SessionOptions._
 import com.softwaremill.session.TestData._
 
 trait MultipleTransportTest { this: ScalatestRouteTest =>

core/src/test/scala/com/softwaremill/session/OneOffSetRefreshableGetTest.scala

@@ -3,6 +3,7 @@ package com.softwaremill.session
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.SessionDirectives._
+import com.softwaremill.session.SessionOptions._
 import org.scalatest.{FlatSpec, ShouldMatchers}
 
 class OneOffSetRefreshableGetTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers with MultipleTransportTest {

core/src/test/scala/com/softwaremill/session/OneOffTest.scala

@@ -5,6 +5,7 @@ import akka.http.scaladsl.server.AuthorizationFailedRejection
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.SessionDirectives._
+import com.softwaremill.session.SessionOptions._
 import org.scalatest.{FlatSpec, ShouldMatchers}
 
 class OneOffTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers with MultipleTransportTest {

core/src/test/scala/com/softwaremill/session/RefreshableTest.scala

@@ -4,6 +4,7 @@ import akka.http.scaladsl.server.AuthorizationFailedRejection
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.SessionDirectives._
+import com.softwaremill.session.SessionOptions._
 import org.scalatest.{FlatSpec, ShouldMatchers}
 
 class RefreshableTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers with MultipleTransportTest {

example/src/main/scala/com/softwaremill/example/Example.scala

@@ -7,7 +7,9 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.model.StatusCodes._
 import com.softwaremill.session._
 import com.softwaremill.session.CsrfDirectives._
+import com.softwaremill.session.CsrfOptions._
 import com.softwaremill.session.SessionDirectives._
+import com.softwaremill.session.SessionOptions._
 import com.typesafe.scalalogging.slf4j.StrictLogging
 
 import scala.io.StdIn