upgrade session dependencies

fupelaqu · fupelaqu · commit 624aa45526ce · 2023-10-14T09:38:21.000+02:00
diff --git a/api/build.sbt b/api/build.sbt
@@ -1,6 +1,6 @@
 import com.typesafe.sbt.packager.docker._
 
-Compile / mainClass := Some("app.softnetwork.scheduler.api.SchedulerWithRefreshableCookiePostgresLauncher")
+Compile / mainClass := Some("app.softnetwork.scheduler.api.SchedulerEndpointsPostgresLauncher")
 
 dockerBaseImage := "openjdk:8"
 
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsApi.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsApi.scala
@@ -1,9 +1,14 @@
 package app.softnetwork.scheduler.api
 
+import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.Endpoint
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.launch.SchedulerEndpoints
 import app.softnetwork.session.CsrfCheck
 
 trait SchedulerEndpointsApi extends SchedulerApi with SchedulerEndpoints {
   _: SchemaProvider with CsrfCheck =>
+
+  override def endpoints: ActorSystem[_] => List[Endpoint] =
+    system => super.endpoints(system) :+ schedulerSwagger(system)
 }
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsPostgresLauncher.scala
@@ -1,18 +1,12 @@
 package app.softnetwork.scheduler.api
 
-import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
 import app.softnetwork.persistence.schema.SchemaType
-import app.softnetwork.session.service.SessionService
 import org.slf4j.{Logger, LoggerFactory}
 
-object SchedulerRoutesWithOneOffCookiePostgresLauncher
-    extends SchedulerRoutesApi
-    with JdbcSchemaProvider {
+object SchedulerEndpointsPostgresLauncher extends SchedulerEndpointsApi with JdbcSchemaProvider {
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
   def schemaType: SchemaType = JdbcSchemaTypes.Postgres
 
-  override def sessionService: ActorSystem[_] => SessionService = system =>
-    SessionService.oneOffCookie(system)
 }
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithOneOffCookiePostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithOneOffCookiePostgresLauncher.scala
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithOneOffHeaderPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithOneOffHeaderPostgresLauncher.scala
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithRefreshableCookiePostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithRefreshableCookiePostgresLauncher.scala
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithRefreshableHeaderPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerEndpointsWithRefreshableHeaderPostgresLauncher.scala
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesApi.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesApi.scala
@@ -1,6 +1,11 @@
 package app.softnetwork.scheduler.api
 
+import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.ApiRoute
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.launch.SchedulerRoutes
 
-trait SchedulerRoutesApi extends SchedulerApi with SchedulerRoutes { _: SchemaProvider => }
+trait SchedulerRoutesApi extends SchedulerApi with SchedulerRoutes { _: SchemaProvider =>
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
+    system => super.apiRoutes(system) :+ schedulerSwagger(system)
+}
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesPostgresLauncher.scala
@@ -1,18 +1,12 @@
 package app.softnetwork.scheduler.api
 
-import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
 import app.softnetwork.persistence.schema.SchemaType
-import app.softnetwork.session.service.SessionService
 import org.slf4j.{Logger, LoggerFactory}
 
-object SchedulerRoutesWithOneOffHeaderPostgresLauncher
-    extends SchedulerRoutesApi
-    with JdbcSchemaProvider {
+object SchedulerRoutesPostgresLauncher extends SchedulerRoutesApi with JdbcSchemaProvider {
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
   def schemaType: SchemaType = JdbcSchemaTypes.Postgres
 
-  override def sessionService: ActorSystem[_] => SessionService = system =>
-    SessionService.oneOffHeader(system)
 }
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesWithRefreshableCookiePostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesWithRefreshableCookiePostgresLauncher.scala
diff --git a/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesWithRefreshableHeaderPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/scheduler/api/SchedulerRoutesWithRefreshableHeaderPostgresLauncher.scala
diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "scheduler"
 
-ThisBuild / version := "0.4.0"
+ThisBuild / version := "0.4.1"
 
 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,11 +4,8 @@ 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.service.SessionEndpoints
 
-trait SchedulerEndpoints extends ApiEndpoints with SchedulerGuardian { _: SchemaProvider =>
-
-  def sessionEndpoints: ActorSystem[_] => SessionEndpoints
+trait SchedulerEndpoints extends ApiEndpoints { _: SchedulerGuardian with SchemaProvider =>
 
   def schedulerEndpoints: ActorSystem[_] => SchedulerServiceEndpoints = system =>
     SchedulerServiceEndpoints.apply(system, sessionEndpoints(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
@@ -1,6 +1,7 @@
 package app.softnetwork.scheduler.launch
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.SwaggerEndpoint
 import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.launch.PersistenceGuardian._
 import app.softnetwork.persistence.query.EventProcessorStream
@@ -13,12 +14,15 @@ import app.softnetwork.scheduler.persistence.query.{
   Scheduler2EntityProcessorStream
 }
 import app.softnetwork.scheduler.persistence.typed.SchedulerBehavior
+import app.softnetwork.scheduler.service.SchedulerServiceEndpoints
+import app.softnetwork.session.CsrfCheckHeader
 import app.softnetwork.session.launch.SessionGuardian
-import org.slf4j.Logger
+import app.softnetwork.session.service.SessionEndpoints
+import org.slf4j.{Logger, LoggerFactory}
 
 import scala.util.{Failure, Success, Try}
 
-trait SchedulerGuardian extends SessionGuardian { _: SchemaProvider =>
+trait SchedulerGuardian extends SessionGuardian with CsrfCheckHeader { self: SchemaProvider =>
 
   def log: Logger
 
@@ -62,4 +66,12 @@ trait SchedulerGuardian extends SessionGuardian { _: SchemaProvider =>
 
   override def systemVersion(): String =
     sys.env.getOrElse("VERSION", SchedulerCoreBuildInfo.version)
+
+  def schedulerSwagger: ActorSystem[_] => SwaggerEndpoint = sys =>
+    new SchedulerServiceEndpoints with SwaggerEndpoint {
+      override implicit def system: ActorSystem[_] = sys
+      lazy val log: Logger = LoggerFactory getLogger getClass.getName
+      override def sessionEndpoints: SessionEndpoints = self.sessionEndpoints(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
@@ -1,15 +1,11 @@
 package app.softnetwork.scheduler.launch
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.Route
 import app.softnetwork.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.scheduler.service.SchedulerService
-import app.softnetwork.session.service.SessionService
 
-trait SchedulerRoutes extends ApiRoutes with SchedulerGuardian { _: SchemaProvider =>
-
-  def sessionService: ActorSystem[_] => SessionService
+trait SchedulerRoutes extends ApiRoutes { _: SchedulerGuardian with SchemaProvider =>
 
   def schedulerService: ActorSystem[_] => SchedulerService = system =>
     SchedulerService(system, sessionService(system))
diff --git a/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerService.scala b/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerService.scala
@@ -157,17 +157,4 @@ object SchedulerService {
       lazy val log: Logger = LoggerFactory getLogger getClass.getName
     }
   }
-
-  def oneOffCookie(system: ActorSystem[_]): SchedulerService =
-    SchedulerService(system, SessionService.oneOffCookie(system))
-
-  def oneOffHeader(system: ActorSystem[_]): SchedulerService =
-    SchedulerService(system, SessionService.oneOffHeader(system))
-
-  def refreshableCookie(system: ActorSystem[_]): SchedulerService =
-    SchedulerService(system, SessionService.refreshableCookie(system))
-
-  def refreshableHeader(system: ActorSystem[_]): SchedulerService =
-    SchedulerService(system, SessionService.refreshableHeader(system))
-
 }
diff --git a/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerServiceEndpoints.scala b/core/src/main/scala/app/softnetwork/scheduler/service/SchedulerServiceEndpoints.scala
@@ -1,8 +1,7 @@
 package app.softnetwork.scheduler.service
 
 import akka.actor.typed.ActorSystem
-import akka.http.scaladsl.server.Route
-import app.softnetwork.api.server.{ApiErrors, SwaggerEndpoint}
+import app.softnetwork.api.server.ApiErrors
 import app.softnetwork.scheduler.config.SchedulerSettings
 import app.softnetwork.scheduler.handlers.{SchedulerDao, SchedulerHandler}
 import app.softnetwork.scheduler.message.{SchedulerNotFound, _}
@@ -23,8 +22,7 @@ import scala.language.implicitConversions
 trait SchedulerServiceEndpoints
     extends ServiceWithSessionEndpoints[SchedulerCommand, SchedulerCommandResult]
     with SchedulerDao
-    with SchedulerHandler
-    with SwaggerEndpoint {
+    with SchedulerHandler {
 
   import app.softnetwork.serialization._
 
@@ -171,7 +169,6 @@ trait SchedulerServiceEndpoints
       loadSchedulerEndpoint
     )
 
-  override def route: Route = apiRoute ~ swaggerRoute
 }
 
 object SchedulerServiceEndpoints {
diff --git a/project/Versions.scala b/project/Versions.scala
@@ -1,6 +1,6 @@
 object Versions {
 
-  val genericPersistence = "0.4.0"
+  val genericPersistence = "0.4.1"
 
   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
@@ -1,20 +1,21 @@
 package app.softnetwork.scheduler.scalatest
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.api.server.ApiEndpoint
+import app.softnetwork.api.server.Endpoint
 import app.softnetwork.persistence.schema.SchemaProvider
-import app.softnetwork.scheduler.launch.SchedulerEndpoints
+import app.softnetwork.scheduler.launch.{SchedulerEndpoints, SchedulerGuardian}
 import app.softnetwork.session.CsrfCheck
 import app.softnetwork.session.scalatest.SessionEndpointsRoutes
 
 trait SchedulerEndpointsTestKit extends SchedulerEndpoints with SessionEndpointsRoutes {
-  _: SchemaProvider with CsrfCheck =>
+  _: SchedulerGuardian with SchemaProvider with CsrfCheck =>
 
-  override def endpoints: ActorSystem[_] => List[ApiEndpoint] =
+  override def endpoints: ActorSystem[_] => List[Endpoint] =
     system =>
       List(
         sessionServiceEndpoints(system),
         schedulerEndpoints(system)
+//        schedulerSwagger(system)
       )
 
 }
diff --git a/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRoutesTestKit.scala b/testkit/src/main/scala/app/softnetwork/scheduler/scalatest/SchedulerRoutesTestKit.scala
@@ -3,17 +3,18 @@ package app.softnetwork.scheduler.scalatest
 import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.ApiRoute
 import app.softnetwork.persistence.schema.SchemaProvider
-import app.softnetwork.scheduler.launch.SchedulerRoutes
+import app.softnetwork.scheduler.launch.{SchedulerGuardian, SchedulerRoutes}
 import app.softnetwork.session.scalatest.SessionServiceRoutes
 
 trait SchedulerRoutesTestKit extends SchedulerRoutes with SessionServiceRoutes {
-  _: SchemaProvider =>
+  _: SchedulerGuardian with SchemaProvider =>
 
   override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
     system =>
       List(
         sessionServiceRoute(system),
         schedulerService(system)
+//        schedulerSwagger(system)
       )
 
 }
