upgrade session dependencies

fupelaqu · fupelaqu · commit 150177ba0b79 · 2023-10-14T10:39: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.resource.api.ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher")
+Compile / mainClass := Some("app.softnetwork.resource.api.ResourceToLocalFileSystemEndpointsPostgresLauncher")
 
 dockerBaseImage := "openjdk:8"
 
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala
@@ -1,6 +1,7 @@
 package app.softnetwork.resource.api
 
 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.schema.SchemaProvider
@@ -9,10 +10,13 @@ import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
+import app.softnetwork.session.CsrfCheck
 
-trait ResourceApi extends ResourceApplication[Resource] { _: SchemaProvider =>
+trait ResourceApi extends ResourceApplication[Resource] { _: SchemaProvider with CsrfCheck =>
 
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =
     _ => ResourceBehavior
+
+  def resourceSwagger: ActorSystem[_] => SwaggerEndpoint
 }
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemApi.scala
@@ -1,17 +1,21 @@
 package app.softnetwork.resource.api
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.SwaggerEndpoint
 import app.softnetwork.persistence.jdbc.query.{JdbcJournalProvider, JdbcOffsetProvider}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.query.{
   GenericResourceToExternalProcessorStream,
   ResourceToLocalFileSystemProcessorStream
 }
-import app.softnetwork.resource.service.{LocalFileSystemResourceService, ResourceService}
+import app.softnetwork.resource.service.LocalFileSystemResourceServiceEndpoints
+import app.softnetwork.session.CsrfCheck
+import app.softnetwork.session.service.SessionEndpoints
 import com.typesafe.config.Config
+import org.slf4j.{Logger, LoggerFactory}
 
-trait ResourceToLocalFileSystemApi extends ResourceApi { _: SchemaProvider =>
+trait ResourceToLocalFileSystemApi extends ResourceApi { self: SchemaProvider with CsrfCheck =>
   override def resourceToExternalProcessorStream
     : ActorSystem[_] => GenericResourceToExternalProcessorStream[Resource] =
     sys =>
@@ -21,4 +25,13 @@ trait ResourceToLocalFileSystemApi extends ResourceApi { _: SchemaProvider =>
         override implicit def system: ActorSystem[_] = sys
         override def config: Config = ResourceToLocalFileSystemApi.this.config
       }
+
+  def resourceSwagger: ActorSystem[_] => SwaggerEndpoint = sys =>
+    new LocalFileSystemResourceServiceEndpoints 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/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsApi.scala
@@ -1,6 +1,7 @@
 package app.softnetwork.resource.api
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.Endpoint
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.launch.ResourceEndpoints
 import app.softnetwork.resource.model.Resource
@@ -16,4 +17,7 @@ trait ResourceToLocalFileSystemEndpointsApi
 
   override def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints = system =>
     LocalFileSystemResourceServiceEndpoints(system, sessionEndpoints(system))
+
+  override def endpoints: ActorSystem[_] => List[Endpoint] = system =>
+    super.endpoints(system) :+ resourceSwagger(system)
 }
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsPostgresLauncher.scala
@@ -1,20 +1,16 @@
 package app.softnetwork.resource.api
 
-import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
 import app.softnetwork.persistence.schema.SchemaType
 import app.softnetwork.session.CsrfCheckHeader
-import app.softnetwork.session.service.SessionEndpoints
 import org.slf4j.{Logger, LoggerFactory}
 
-object ResourceToLocalFileSystemEndpointsWithOneOffCookiePostgresLauncher
+object ResourceToLocalFileSystemEndpointsPostgresLauncher
     extends ResourceToLocalFileSystemEndpointsApi
     with CsrfCheckHeader
     with JdbcSchemaProvider {
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
   def schemaType: SchemaType = JdbcSchemaTypes.Postgres
 
-  override def sessionEndpoints: ActorSystem[_] => SessionEndpoints = system =>
-    SessionEndpoints.oneOffCookie(system, checkHeaderAndForm)
 }
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesApi.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesApi.scala
@@ -1,15 +1,21 @@
 package app.softnetwork.resource.api
 
 import akka.actor.typed.ActorSystem
+import app.softnetwork.api.server.ApiRoute
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.launch.ResourceRoutes
 import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.service.{LocalFileSystemResourceService, ResourceService}
+import app.softnetwork.session.CsrfCheckHeader
 
 trait ResourceToLocalFileSystemRoutesApi
     extends ResourceToLocalFileSystemApi
-    with ResourceRoutes[Resource] { _: SchemaProvider =>
+    with ResourceRoutes[Resource]
+    with CsrfCheckHeader { _: SchemaProvider =>
 
   override def resourceService: ActorSystem[_] => ResourceService = system =>
     LocalFileSystemResourceService(system, sessionService(system))
+
+  override def apiRoutes: ActorSystem[_] => List[ApiRoute] = system =>
+    super.apiRoutes(system) :+ resourceSwagger(system)
 }
diff --git a/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesPostgresLauncher.scala b/api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesPostgresLauncher.scala
@@ -1,18 +1,14 @@
 package app.softnetwork.resource.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 ResourceToLocalFileSystemRoutesWithOneOffCookiePostgresLauncher
+object ResourceToLocalFileSystemRoutesPostgresLauncher
     extends ResourceToLocalFileSystemRoutesApi
     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/core/src/main/scala/app/softnetwork/resource/launch/ResourceApplication.scala b/core/src/main/scala/app/softnetwork/resource/launch/ResourceApplication.scala
@@ -4,8 +4,9 @@ import app.softnetwork.api.server.ApiRoutes
 import app.softnetwork.api.server.launch.Application
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
+import app.softnetwork.session.CsrfCheck
 
 trait ResourceApplication[Resource <: GenericResource]
     extends Application
     with ApiRoutes
-    with ResourceGuardian[Resource] { _: SchemaProvider => }
+    with ResourceGuardian[Resource] { _: SchemaProvider with CsrfCheck => }
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/ResourceEndpoints.scala b/core/src/main/scala/app/softnetwork/resource/launch/ResourceEndpoints.scala
@@ -6,13 +6,9 @@ import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.service.ResourceServiceEndpoints
 import app.softnetwork.session.CsrfCheck
-import app.softnetwork.session.service.SessionEndpoints
 
-trait ResourceEndpoints[Resource <: GenericResource]
-    extends ApiEndpoints
-    with ResourceGuardian[Resource] { _: SchemaProvider with CsrfCheck =>
-
-  def sessionEndpoints: ActorSystem[_] => SessionEndpoints
+trait ResourceEndpoints[Resource <: GenericResource] extends ApiEndpoints {
+  _: ResourceGuardian[Resource] with SchemaProvider with CsrfCheck =>
 
   def resourceEndpoints: ActorSystem[_] => ResourceServiceEndpoints
 
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/ResourceGuardian.scala b/core/src/main/scala/app/softnetwork/resource/launch/ResourceGuardian.scala
@@ -1,7 +1,7 @@
 package app.softnetwork.resource.launch
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.persistence.launch.{PersistenceGuardian, PersistentEntity}
+import app.softnetwork.persistence.launch.PersistentEntity
 import app.softnetwork.persistence.query.EventProcessorStream
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.persistence.typed.Singleton
@@ -10,10 +10,12 @@ import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.persistence.query.GenericResourceToExternalProcessorStream
+import app.softnetwork.session.CsrfCheck
+import app.softnetwork.session.launch.SessionGuardian
 import com.typesafe.scalalogging.StrictLogging
 
-trait ResourceGuardian[Resource <: GenericResource] extends PersistenceGuardian with StrictLogging {
-  _: SchemaProvider =>
+trait ResourceGuardian[Resource <: GenericResource] extends SessionGuardian with StrictLogging {
+  _: SchemaProvider with CsrfCheck =>
 
   def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult]
diff --git a/core/src/main/scala/app/softnetwork/resource/launch/ResourceRoutes.scala b/core/src/main/scala/app/softnetwork/resource/launch/ResourceRoutes.scala
@@ -5,13 +5,9 @@ import app.softnetwork.api.server.{ApiRoute, ApiRoutes}
 import app.softnetwork.persistence.schema.SchemaProvider
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.service.ResourceService
-import app.softnetwork.session.service.SessionService
 
-trait ResourceRoutes[Resource <: GenericResource]
-    extends ApiRoutes
-    with ResourceGuardian[Resource] { _: SchemaProvider =>
-
-  def sessionService: ActorSystem[_] => SessionService
+trait ResourceRoutes[Resource <: GenericResource] extends ApiRoutes {
+  _: ResourceGuardian[Resource] with SchemaProvider =>
 
   def resourceService: ActorSystem[_] => ResourceService
 
diff --git a/core/src/main/scala/app/softnetwork/resource/service/ResourceServiceEndpoints.scala b/core/src/main/scala/app/softnetwork/resource/service/ResourceServiceEndpoints.scala
@@ -21,8 +21,7 @@ import scala.concurrent.Future
 
 trait ResourceServiceEndpoints
     extends LoadResourceService
-    with ServiceWithSessionEndpoints[ResourceCommand, ResourceResult]
-    with SwaggerApiEndpoint {
+    with ServiceWithSessionEndpoints[ResourceCommand, ResourceResult] {
   _: GenericResourceHandler with ResourceProvider =>
 
   import app.softnetwork.serialization._
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/resource/scalatest/ResourceEndpointsTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceEndpointsTestKit.scala
@@ -3,14 +3,15 @@ package app.softnetwork.resource.scalatest
 import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.ApiEndpoint
 import app.softnetwork.persistence.schema.SchemaProvider
-import app.softnetwork.resource.launch.ResourceEndpoints
+import app.softnetwork.resource.launch.{ResourceEndpoints, ResourceGuardian}
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.session.CsrfCheck
 import app.softnetwork.session.scalatest.SessionEndpointsRoutes
 
 trait ResourceEndpointsTestKit[Resource <: GenericResource]
     extends ResourceEndpoints[Resource]
-    with SessionEndpointsRoutes { _: SchemaProvider with CsrfCheck =>
+    with SessionEndpointsRoutes {
+  _: ResourceGuardian[Resource] with SchemaProvider with CsrfCheck =>
 
   override def endpoints: ActorSystem[_] => List[ApiEndpoint] =
     system =>
diff --git a/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceRoutesTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceRoutesTestKit.scala
@@ -3,14 +3,14 @@ package app.softnetwork.resource.scalatest
 import akka.actor.typed.ActorSystem
 import app.softnetwork.api.server.ApiRoute
 import app.softnetwork.persistence.schema.SchemaProvider
-import app.softnetwork.resource.launch.ResourceRoutes
+import app.softnetwork.resource.launch.{ResourceGuardian, ResourceRoutes}
 import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.session.scalatest.SessionServiceRoutes
 import org.scalatest.Suite
 
 trait ResourceRoutesTestKit[Resource <: GenericResource]
     extends ResourceRoutes[Resource]
-    with SessionServiceRoutes { _: Suite with SchemaProvider =>
+    with SessionServiceRoutes { _: Suite with ResourceGuardian[Resource] with SchemaProvider =>
 
   override def apiRoutes: ActorSystem[_] => List[ApiRoute] =
     system =>
diff --git a/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceTestKit.scala
@@ -4,11 +4,12 @@ import app.softnetwork.persistence.scalatest.InMemoryPersistenceTestKit
 import app.softnetwork.resource.config.ResourceSettings
 import app.softnetwork.resource.launch.ResourceGuardian
 import app.softnetwork.resource.model.GenericResource
+import app.softnetwork.session.CsrfCheck
 import org.scalatest.Suite
 
 trait ResourceTestKit[Resource <: GenericResource]
     extends ResourceGuardian[Resource]
-    with InMemoryPersistenceTestKit { _: Suite =>
+    with InMemoryPersistenceTestKit { _: Suite with CsrfCheck =>
 
   /** @return
     *   roles associated with this node
diff --git a/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemTestKit.scala b/testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemTestKit.scala
@@ -12,10 +12,12 @@ import app.softnetwork.resource.persistence.query.{
   ResourceToLocalFileSystemProcessorStream
 }
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
+import app.softnetwork.session.{CsrfCheck, CsrfCheckHeader}
 import org.scalatest.Suite
 import org.slf4j.{Logger, LoggerFactory}
 
-trait ResourceToLocalFileSystemTestKit extends ResourceTestKit[Resource] { _: Suite =>
+trait ResourceToLocalFileSystemTestKit extends ResourceTestKit[Resource] with CsrfCheckHeader {
+  _: Suite =>
 
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =
