update apis

Author: fupelaqu

api/src/main/scala/app/softnetwork/resource/api/JwtResourceToLocalFileSystemEndpointsPostgresLauncher.scala

@@ -12,13 +12,8 @@ import app.softnetwork.resource.model.Resource
 import app.softnetwork.resource.persistence.typed.ResourceBehavior
 import app.softnetwork.resource.service.LocalFileSystemResourceServiceEndpoints
 import app.softnetwork.session.CsrfCheck
-import app.softnetwork.session.config.Settings
-import app.softnetwork.session.model.{
-  SessionData,
-  SessionDataCompanion,
-  SessionDataDecorator,
-  SessionManagers
-}
+import app.softnetwork.session.api.SessionDataApi
+import app.softnetwork.session.model.{SessionData, SessionDataCompanion, SessionDataDecorator}
 import app.softnetwork.session.service.SessionMaterials
 import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.slf4j.{Logger, LoggerFactory}
@@ -27,23 +22,13 @@ import org.softnetwork.session.model.Session
 import scala.concurrent.ExecutionContext
 
 trait ResourceApi[SD <: SessionData with SessionDataDecorator[SD]]
-    extends ResourceApplication[Resource] { self: SchemaProvider with CsrfCheck =>
+    extends ResourceApplication[Resource]
+    with SessionDataApi[SD] { self: SchemaProvider with CsrfCheck =>
 
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =
     _ => ResourceBehavior
 
-  implicit def sessionConfig: SessionConfig = Settings.Session.DefaultSessionConfig
-
-  implicit def companion: SessionDataCompanion[SD]
-
-  protected def manager: SessionManager[SD]
-
-  protected def refreshTokenStorage: ActorSystem[_] => RefreshTokenStorage[SD]
-
-  override protected def sessionType: Session.SessionType =
-    Settings.Session.SessionContinuityAndTransport
-
   def resourceSwagger: ActorSystem[_] => SwaggerEndpoint =
     sys =>
       new LocalFileSystemResourceServiceEndpoints[SD]

api/src/main/scala/app/softnetwork/resource/api/JwtResourceToLocalFileSystemRoutesPostgresLauncher.scala

@@ -0,0 +1,19 @@
+package app.softnetwork.resource.api
+
+import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
+import app.softnetwork.persistence.schema.SchemaType
+import app.softnetwork.session.CsrfCheckHeader
+import app.softnetwork.session.api.JwtClaimsApi
+import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.JwtClaims
+
+object ResourceToLocalFileSystemEndpointsJwtPostgresLauncher
+    extends ResourceToLocalFileSystemEndpointsApi[JwtClaims]
+    with JwtClaimsApi
+    with CsrfCheckHeader
+    with JdbcSchemaProvider {
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
+  def schemaType: SchemaType = JdbcSchemaTypes.Postgres
+
+}

api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala

@@ -1,27 +1,19 @@
 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.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.model.{SessionDataCompanion, SessionManagers}
-import com.softwaremill.session.{RefreshTokenStorage, SessionManager}
+import app.softnetwork.session.api.SessionApi
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
 object ResourceToLocalFileSystemEndpointsPostgresLauncher
     extends ResourceToLocalFileSystemEndpointsApi[Session]
+    with SessionApi
     with CsrfCheckHeader
     with JdbcSchemaProvider {
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
   def schemaType: SchemaType = JdbcSchemaTypes.Postgres
 
-  override protected def manager: SessionManager[Session] = SessionManagers.basic
-
-  override implicit def companion: SessionDataCompanion[Session] = Session
-
-  override protected def refreshTokenStorage: ActorSystem[_] => RefreshTokenStorage[Session] =
-    system => SessionRefreshTokenDao(system)
 }

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsJwtPostgresLauncher.scala

@@ -0,0 +1,17 @@
+package app.softnetwork.resource.api
+
+import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
+import app.softnetwork.persistence.schema.SchemaType
+import app.softnetwork.session.api.JwtClaimsApi
+import org.slf4j.{Logger, LoggerFactory}
+import org.softnetwork.session.model.JwtClaims
+
+object ResourceToLocalFileSystemRoutesJwtPostgresLauncher
+    extends ResourceToLocalFileSystemRoutesApi[JwtClaims]
+    with JwtClaimsApi
+    with JdbcSchemaProvider {
+  lazy val log: Logger = LoggerFactory getLogger getClass.getName
+
+  def schemaType: SchemaType = JdbcSchemaTypes.Postgres
+
+}

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemEndpointsPostgresLauncher.scala

@@ -1,25 +1,17 @@
 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.handlers.SessionRefreshTokenDao
-import app.softnetwork.session.model.{SessionDataCompanion, SessionManagers}
-import com.softwaremill.session.{RefreshTokenStorage, SessionManager}
+import app.softnetwork.session.api.SessionApi
 import org.slf4j.{Logger, LoggerFactory}
 import org.softnetwork.session.model.Session
 
 object ResourceToLocalFileSystemRoutesPostgresLauncher
     extends ResourceToLocalFileSystemRoutesApi[Session]
+    with SessionApi
     with JdbcSchemaProvider {
   lazy val log: Logger = LoggerFactory getLogger getClass.getName
 
   def schemaType: SchemaType = JdbcSchemaTypes.Postgres
 
-  override protected def manager: SessionManager[Session] = SessionManagers.basic
-
-  override implicit def companion: SessionDataCompanion[Session] = Session
-
-  override protected def refreshTokenStorage: ActorSystem[_] => RefreshTokenStorage[Session] =
-    system => SessionRefreshTokenDao(system)
 }

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesJwtPostgresLauncher.scala

@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.5.0"
+ThisBuild / version := "0.5.1"
 
 ThisBuild / scalaVersion := "2.12.18"
 

api/src/main/scala/app/softnetwork/resource/api/ResourceToLocalFileSystemRoutesPostgresLauncher.scala

@@ -1,6 +1,6 @@
 object Versions {
 
-  val genericPersistence = "0.6.2"
+  val genericPersistence = "0.6.2.1"
 
   val scalatest = "3.2.16"
 }