upgrading session materials

fupelaqu · fupelaqu · commit 49292fdf66ab · 2023-12-01T17:49:04.000+01:00
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerApi.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerApi.scala
@@ -8,7 +8,7 @@ import app.softnetwork.scheduler.handlers.SchedulerHandler
 import app.softnetwork.scheduler.launch.SchedulerApplication
 import app.softnetwork.scheduler.persistence.query.Entity2SchedulerProcessorStream
 import app.softnetwork.session.config.Settings
-import app.softnetwork.session.model.SessionManagers
+import app.softnetwork.session.model.{SessionDataCompanion, SessionManagers}
 import com.softwaremill.session.{SessionConfig, SessionManager}
 import com.typesafe.config.Config
 import org.softnetwork.session.model.Session
@@ -36,7 +36,10 @@ trait SchedulerApi extends SchedulerApplication { _: SchemaProvider =>
   override protected def sessionType: Session.SessionType =
     Settings.Session.SessionContinuityAndTransport
 
-  override protected def manager(implicit sessionConfig: SessionConfig): SessionManager[Session] =
+  override protected def manager(implicit
+    sessionConfig: SessionConfig,
+    companion: SessionDataCompanion[Session]
+  ): SessionManager[Session] =
     SessionManagers.basic
 
 }
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "scheduler"
 
-ThisBuild / version := "0.5.1"
+ThisBuild / version := "0.6.0"
 
 ThisBuild / scalaVersion := "2.12.15"
 
diff --git a/core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerEndpoints.scala b/core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerEndpoints.scala
@@ -4,8 +4,10 @@ import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.{ApiEndpoints, Endpoint}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.service.SchedulerServiceEndpoints
+import app.softnetwork.session.handlers.SessionRefreshTokenDao
+import app.softnetwork.session.model.SessionDataCompanion
 import app.softnetwork.session.service.SessionMaterials
-import com.softwaremill.session.{SessionConfig, SessionManager}
+import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
@@ -14,14 +16,17 @@ import scala.concurrent.ExecutionContext
 trait SchedulerEndpoints extends ApiEndpoints { self: SchedulerGuardian with SchemaProvider =>
 
   def schedulerEndpoints: ActorSystem[_] => SchedulerServiceEndpoints = sys =>
-    new SchedulerServiceEndpoints with SessionMaterials {
+    new SchedulerServiceEndpoints with SessionMaterials[Session] {
       override implicit def system: ActorSystem[_] = sys
       override lazy val ec: ExecutionContext = sys.executionContext
       lazy val log: Logger = LoggerFactory getLogger getClass.getName
       override protected def sessionType: Session.SessionType = self.sessionType
       override implicit def manager(implicit
-        sessionConfig: SessionConfig
+        sessionConfig: SessionConfig,
+        companion: SessionDataCompanion[Session]
       ): SessionManager[Session] = self.manager
+      override implicit def refreshTokenStorage: RefreshTokenStorage[Session] =
+        SessionRefreshTokenDao(system)
     }
 
   override def endpoints: ActorSystem[_] => List[Endpoint] = system =>
diff --git a/core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerGuardian.scala b/core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerGuardian.scala
@@ -16,9 +16,11 @@ import app.softnetwork.scheduler.persistence.query.{
 import app.softnetwork.scheduler.persistence.typed.SchedulerBehavior
 import app.softnetwork.scheduler.service.SchedulerServiceEndpoints
 import app.softnetwork.session.CsrfCheckHeader
+import app.softnetwork.session.handlers.SessionRefreshTokenDao
 import app.softnetwork.session.launch.SessionGuardian
+import app.softnetwork.session.model.SessionDataCompanion
 import app.softnetwork.session.service.SessionMaterials
-import com.softwaremill.session.{SessionConfig, SessionManager}
+import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
@@ -70,15 +72,23 @@ trait SchedulerGuardian extends SessionGuardian with CsrfCheckHeader { self: Sch
   override def systemVersion(): String =
     sys.env.getOrElse("VERSION", SchedulerCoreBuildInfo.version)
 
+  protected def manager(implicit
+    sessionConfig: SessionConfig,
+    companion: SessionDataCompanion[Session]
+  ): SessionManager[Session]
+
   def schedulerSwagger: ActorSystem[_] => SwaggerEndpoint = sys =>
-    new SchedulerServiceEndpoints with SwaggerEndpoint with SessionMaterials {
+    new SchedulerServiceEndpoints with SwaggerEndpoint with SessionMaterials[Session] {
       override implicit def system: ActorSystem[_] = sys
       override lazy val ec: ExecutionContext = sys.executionContext
       lazy val log: Logger = LoggerFactory getLogger getClass.getName
       override protected def sessionType: Session.SessionType = self.sessionType
       override implicit def manager(implicit
-        sessionConfig: SessionConfig
+        sessionConfig: SessionConfig,
+        companion: SessionDataCompanion[Session]
       ): SessionManager[Session] = self.manager
+      override implicit def refreshTokenStorage: RefreshTokenStorage[Session] =
+        SessionRefreshTokenDao(system)
       override val applicationVersion: String = systemVersion()
     }
 }
diff --git a/core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerRoutes.scala b/core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerRoutes.scala
@@ -4,8 +4,10 @@ import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.service.SchedulerService
+import app.softnetwork.session.handlers.SessionRefreshTokenDao
+import app.softnetwork.session.model.SessionDataCompanion
 import app.softnetwork.session.service.SessionMaterials
-import com.softwaremill.session.{SessionConfig, SessionManager}
+import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
@@ -14,14 +16,17 @@ import scala.concurrent.ExecutionContext
 trait SchedulerRoutes extends ApiRoutes { self: SchedulerGuardian with SchemaProvider =>
 
   def schedulerService: ActorSystem[_] => SchedulerService = sys =>
-    new SchedulerService with SessionMaterials {
+    new SchedulerService with SessionMaterials[Session] {
       override implicit def system: ActorSystem[_] = sys
       override lazy val ec: ExecutionContext = sys.executionContext
       lazy val log: Logger = LoggerFactory getLogger getClass.getName
       override protected def sessionType: Session.SessionType = self.sessionType
       override implicit def manager(implicit
-        sessionConfig: SessionConfig
+        sessionConfig: SessionConfig,
+        companion: SessionDataCompanion[Session]
       ): SessionManager[Session] = self.manager
+      override implicit def refreshTokenStorage: RefreshTokenStorage[Session] =
+        SessionRefreshTokenDao(system)
     }
 
   override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
diff --git a/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerService.scala b/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerService.scala
@@ -18,15 +18,16 @@ import com.typesafe.scalalogging.StrictLogging
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport
 import org.json4s.jackson.Serialization
 import org.json4s.{jackson, Formats}
+import org.softnetwork.session.model.Session
 
 trait SchedulerService
     extends Directives
     with DefaultComplete
     with Json4sSupport
     with StrictLogging
-    with ServiceWithSessionDirectives[SchedulerCommand, SchedulerCommandResult]
+    with ServiceWithSessionDirectives[SchedulerCommand, SchedulerCommandResult, Session]
     with SchedulerDao
-    with SchedulerHandler { _: SessionMaterials =>
+    with SchedulerHandler { _: SessionMaterials[Session] =>
 
   implicit def sessionConfig: SessionConfig = Settings.Session.DefaultSessionConfig
 
diff --git a/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerServiceEndpoints.scala b/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerServiceEndpoints.scala
@@ -21,9 +21,9 @@ import scala.concurrent.Future
 import scala.language.implicitConversions
 
 trait SchedulerServiceEndpoints
-    extends ServiceWithSessionEndpoints[SchedulerCommand, SchedulerCommandResult]
+    extends ServiceWithSessionEndpoints[SchedulerCommand, SchedulerCommandResult, Session]
     with SchedulerDao
-    with SchedulerHandler { _: SessionMaterials =>
+    with SchedulerHandler { _: SessionMaterials[Session] =>
 
   import app.softnetwork.serialization._
 
diff --git a/project/Versions.scala b/project/Versions.scala
@@ -1,6 +1,6 @@
 object Versions {
 
-  val genericPersistence = "0.5.1"
+  val genericPersistence = "0.6.0"
 
   val scalatest = "3.2.16"
 }
diff --git a/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerEndpointsTestKit.scala b/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerEndpointsTestKit.scala
@@ -7,12 +7,13 @@ import app.softnetwork.scheduler.launch.SchedulerEndpoints
 import app.softnetwork.session.CsrfCheck
 import app.softnetwork.session.scalatest.{SessionEndpointsRoutes, SessionTestKit}
 import app.softnetwork.session.service.SessionMaterials
+import org.softnetwork.session.model.Session
 
-trait SchedulerEndpointsTestKit extends SchedulerEndpoints with SessionEndpointsRoutes {
-  _: SessionTestKit
+trait SchedulerEndpointsTestKit extends SchedulerEndpoints with SessionEndpointsRoutes[Session] {
+  _: SessionTestKit[Session]
     with SchedulerTestKit
     with SchemaProvider
-    with SessionMaterials
+    with SessionMaterials[Session]
     with CsrfCheck =>
 
   override def endpoints: ActorSystem[_] => List[Endpoint] =
diff --git a/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRouteTestKit.scala b/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRouteTestKit.scala
@@ -11,12 +11,13 @@ import app.softnetwork.serialization._
 import app.softnetwork.session.scalatest.SessionTestKit
 import app.softnetwork.session.service.SessionMaterials
 import org.scalatest.Suite
+import org.softnetwork.session.model.Session
 
 trait SchedulerRouteTestKit
-    extends SessionTestKit
+    extends SessionTestKit[Session]
     with SchedulerTestKit
     with SchedulerGrpcServices {
-  _: Suite with ApiRoutes with SessionMaterials =>
+  _: Suite with ApiRoutes with SessionMaterials[Session] =>
 
   override def beforeAll(): Unit = {
     super.beforeAll()
diff --git a/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRoutesTestKit.scala b/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRoutesTestKit.scala
@@ -6,9 +6,13 @@ import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.launch.SchedulerRoutes
 import app.softnetwork.session.scalatest.{SessionServiceRoutes, SessionTestKit}
 import app.softnetwork.session.service.SessionMaterials
+import org.softnetwork.session.model.Session
 
-trait SchedulerRoutesTestKit extends SchedulerRoutes with SessionServiceRoutes {
-  _: SessionTestKit with SchedulerTestKit with SchemaProvider with SessionMaterials =>
+trait SchedulerRoutesTestKit extends SchedulerRoutes with SessionServiceRoutes[Session] {
+  _: SessionTestKit[Session]
+    with SchedulerTestKit
+    with SchemaProvider
+    with SessionMaterials[Session] =>
 
   override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
     system =>
diff --git a/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerTestKit.scala b/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerTestKit.scala
@@ -17,9 +17,10 @@ import app.softnetwork.scheduler.persistence.query.Entity2SchedulerProcessorStre
 import app.softnetwork.session.service.SessionMaterials
 import org.scalatest.Suite
 import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.Session
 
 trait SchedulerTestKit extends SchedulerGuardian with InMemoryPersistenceTestKit {
-  _: Suite with SessionMaterials =>
+  _: Suite with SessionMaterials[Session] =>
 
   /** @return
     *   roles associated with this node
diff --git a/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerWithSampleTestKit.scala b/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerWithSampleTestKit.scala
@@ -14,8 +14,10 @@ import app.softnetwork.scheduler.persistence.query.{
 import app.softnetwork.scheduler.persistence.typed.{SampleBehavior, SchedulerBehavior}
 import app.softnetwork.session.service.SessionMaterials
 import org.scalatest.Suite
+import org.softnetwork.session.model.Session
 
-trait SchedulerWithSampleTestKit extends SchedulerTestKit { _: Suite with SessionMaterials =>
+trait SchedulerWithSampleTestKit extends SchedulerTestKit {
+  _: Suite with SessionMaterials[Session] =>
   override def schedulerEntities: ActorSystem[_] => Seq[launch.PersistentEntity[_, _, _, _]] =
     _ => Seq(SchedulerBehavior, SampleBehavior)
 
diff --git a/testkit/src/test/scala/app/softnetwork/scheduler/api/SchedulerClientSpec.scala b/testkit/src/test/scala/app/softnetwork/scheduler/api/SchedulerClientSpec.scala
@@ -5,7 +5,9 @@ import app.softnetwork.scheduler.scalatest.SchedulerTestKit
 import org.scalatest.wordspec.AnyWordSpecLike
 import app.softnetwork.scheduler.model.{CronTab, Schedule, Scheduler}
 import app.softnetwork.session.config.Settings
+import app.softnetwork.session.handlers.SessionRefreshTokenDao
 import app.softnetwork.session.service.BasicSessionMaterials
+import com.softwaremill.session.RefreshTokenStorage
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
@@ -15,7 +17,11 @@ class SchedulerClientSpec
     extends AnyWordSpecLike
     with SchedulerTestKit
     with SchedulerGrpcServer
-    with BasicSessionMaterials {
+    with BasicSessionMaterials[Session] {
+
+  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
+    ts
+  )
 
   override implicit def ts: ActorSystem[_] = typedSystem()
 
diff --git a/testkit/src/test/scala/app/softnetwork/scheduler/handlers/SchedulerHandlerSpec.scala b/testkit/src/test/scala/app/softnetwork/scheduler/handlers/SchedulerHandlerSpec.scala
@@ -14,7 +14,9 @@ import app.softnetwork.scheduler.message._
 import app.softnetwork.scheduler.persistence.typed.SampleBehavior
 import app.softnetwork.scheduler.model.{CronTab, Schedule}
 import app.softnetwork.session.config.Settings
+import app.softnetwork.session.handlers.SessionRefreshTokenDao
 import app.softnetwork.session.service.BasicSessionMaterials
+import com.softwaremill.session.RefreshTokenStorage
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
@@ -26,10 +28,14 @@ class SchedulerHandlerSpec
     extends SchedulerHandler
     with AnyWordSpecLike
     with SchedulerWithSampleTestKit
-    with BasicSessionMaterials {
+    with BasicSessionMaterials[Session] {
 
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
+  override implicit def refreshTokenStorage: RefreshTokenStorage[Session] = SessionRefreshTokenDao(
+    ts
+  )
+
   override implicit def ts: ActorSystem[_] = typedSystem()
 
   override implicit lazy val ec: ExecutionContextExecutor = ts.executionContext
diff --git a/testkit/src/test/scala/app/softnetwork/scheduler/service/Directives.scala b/testkit/src/test/scala/app/softnetwork/scheduler/service/Directives.scala
@@ -3,6 +3,7 @@ package app.softnetwork.scheduler.service
 import app.softnetwork.scheduler.scalatest.SchedulerRoutesTestKit
 import app.softnetwork.session.scalatest._
 import app.softnetwork.session.service._
+import org.softnetwork.session.model.Session
 
 package Directives {
   package OneOff {
@@ -11,28 +12,29 @@ package Directives {
       class SchedulerRoutesWithOneOffCookieBasicSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with OneOffCookieSessionServiceTestKit
-          with BasicSessionMaterials
+          with OneOffCookieSessionServiceTestKit[Session]
+          with BasicSessionMaterials[Session]
 
       class SchedulerRoutesWithOneOffCookieJwtSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with OneOffCookieSessionServiceTestKit
-          with JwtSessionMaterials
+          with OneOffCookieSessionServiceTestKit[Session]
+          with JwtSessionMaterials[Session]
 
     }
     package Header {
+
       class SchedulerRoutesWithOneOffHeaderBasicSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with OneOffHeaderSessionServiceTestKit
-          with BasicSessionMaterials
+          with OneOffHeaderSessionServiceTestKit[Session]
+          with BasicSessionMaterials[Session]
 
       class SchedulerRoutesWithOneOffHeaderJwtSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with OneOffHeaderSessionServiceTestKit
-          with JwtSessionMaterials
+          with OneOffHeaderSessionServiceTestKit[Session]
+          with JwtSessionMaterials[Session]
 
     }
   }
@@ -43,29 +45,29 @@ package Directives {
       class SchedulerRoutesWithRefreshableCookieBasicSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with RefreshableCookieSessionServiceTestKit
-          with BasicSessionMaterials
+          with RefreshableCookieSessionServiceTestKit[Session]
+          with BasicSessionMaterials[Session]
 
       class SchedulerRoutesWithRefreshableCookieJwtSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with RefreshableCookieSessionServiceTestKit
-          with JwtSessionMaterials
+          with RefreshableCookieSessionServiceTestKit[Session]
+          with JwtSessionMaterials[Session]
 
     }
 
     package Header {
       class SchedulerRoutesWithRefreshableHeaderBasicSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with RefreshableHeaderSessionServiceTestKit
-          with BasicSessionMaterials
+          with RefreshableHeaderSessionServiceTestKit[Session]
+          with BasicSessionMaterials[Session]
 
       class SchedulerRoutesWithRefreshableHeaderJwtSessionSpec
           extends SchedulerServiceSpec
           with SchedulerRoutesTestKit
-          with RefreshableHeaderSessionServiceTestKit
-          with JwtSessionMaterials
+          with RefreshableHeaderSessionServiceTestKit[Session]
+          with JwtSessionMaterials[Session]
 
     }
 
diff --git a/testkit/src/test/scala/app/softnetwork/scheduler/service/Endpoints.scala b/testkit/src/test/scala/app/softnetwork/scheduler/service/Endpoints.scala
diff --git a/testkit/src/test/scala/app/softnetwork/scheduler/service/SchedulerServiceSpec.scala b/testkit/src/test/scala/app/softnetwork/scheduler/service/SchedulerServiceSpec.scala

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`object Versions {`
`2`	`2`
`3`		`- val genericPersistence = "0.5.1"`
	`3`	`+ val genericPersistence = "0.6.0"`
`4`	`4`
`5`	`5`	`val scalatest = "3.2.16"`
`6`	`6`	`}`