update session test kit, jwt claims encoder and decorator

Author: fupelaqu

build.sbt

@@ -8,7 +8,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "generic-persistence-api"
 
-ThisBuild / version := "0.6.0"
+ThisBuild / version := "0.6.1"
 
 ThisBuild / scalaVersion := "2.12.18"
 

session/common/src/main/scala/app/softnetwork/session/model/JwtClaimsDecorator.scala

@@ -31,4 +31,8 @@ trait JwtClaimsDecorator extends SessionDataDecorator[JwtClaims] with JwtClaimsK
       SessionConfig.default(clientSecret)
     )
   }
+
+  lazy val issuer: Option[String] = iss.orElse(clientId)
+
+  lazy val subject: Option[String] = sub.orElse(get(idKey))
 }

session/common/src/main/scala/app/softnetwork/session/model/JwtClaimsEncoder.scala

@@ -19,23 +19,28 @@ trait JwtClaimsEncoder extends SessionEncoder[JwtClaims] with Completion {
   def sessionEncoder = new JwtSessionEncoder[JwtClaims]
 
   override def encode(t: JwtClaims, nowMillis: Long, config: SessionConfig): String = {
+    val updatedJwtClaims = t.copy(
+      iss = t.issuer.orElse(config.jwt.issuer),
+      sub = t.subject.orElse(config.jwt.subject),
+      aud = t.aud.orElse(config.jwt.audience)
+    )
     val jwt = config.jwt.copy(
-      issuer = t.iss.orElse(config.jwt.issuer),
-      subject = t.sub.orElse(config.jwt.subject),
-      audience = t.aud.orElse(config.jwt.audience)
+      issuer = updatedJwtClaims.iss,
+      subject = updatedJwtClaims.sub,
+      audience = updatedJwtClaims.aud
     )
-    (t.iss match {
+    (updatedJwtClaims.iss match {
       case Some(iss) =>
         (loadApiKey(iss) complete ()).toOption.flatten
       case _ => None
     }) match {
       case Some(apiKey) if apiKey.clientSecret.isDefined =>
         sessionEncoder.encode(
-          t,
+          updatedJwtClaims,
           nowMillis,
           config.copy(jwt = jwt, serverSecret = apiKey.clientSecret.get)
         )
-      case _ => sessionEncoder.encode(t, nowMillis, config.copy(jwt = jwt))
+      case _ => sessionEncoder.encode(updatedJwtClaims, nowMillis, config.copy(jwt = jwt))
     }
   }
 

session/core/src/main/scala/app/softnetwork/session/service/ServiceWithSessionDirectives.scala

@@ -4,9 +4,12 @@ import app.softnetwork.api.server.ApiRoute
 import app.softnetwork.persistence.message.{Command, CommandResult}
 import app.softnetwork.persistence.service.Service
 import app.softnetwork.persistence.typed.scaladsl.Patterns
-import app.softnetwork.session.model.SessionData
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 
-trait ServiceWithSessionDirectives[C <: Command, R <: CommandResult, T <: SessionData]
-    extends Service[C, R]
+trait ServiceWithSessionDirectives[
+  C <: Command,
+  R <: CommandResult,
+  T <: SessionData with SessionDataDecorator[T]
+] extends Service[C, R]
     with ApiRoute
     with SessionService[T] { _: Patterns[C, R] with SessionMaterials[T] => }

session/core/src/main/scala/app/softnetwork/session/service/ServiceWithSessionEndpoints.scala

@@ -3,8 +3,11 @@ package app.softnetwork.session.service
 import app.softnetwork.api.server.ServiceEndpoints
 import app.softnetwork.persistence.message.{Command, CommandResult}
 import app.softnetwork.persistence.typed.scaladsl.Patterns
-import app.softnetwork.session.model.SessionData
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 
-trait ServiceWithSessionEndpoints[C <: Command, R <: CommandResult, T <: SessionData]
-    extends ServiceEndpoints[C, R]
+trait ServiceWithSessionEndpoints[
+  C <: Command,
+  R <: CommandResult,
+  T <: SessionData with SessionDataDecorator[T]
+] extends ServiceEndpoints[C, R]
     with SessionEndpoints[T] { _: Patterns[C, R] with SessionMaterials[T] => }

session/core/src/main/scala/app/softnetwork/session/service/SessionEndpoints.scala

@@ -1,6 +1,6 @@
 package app.softnetwork.session.service
 
-import app.softnetwork.session.model.SessionData
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 import app.softnetwork.session.{
   TapirCsrfCheckMode,
   TapirCsrfOptions,
@@ -12,7 +12,8 @@ import org.softnetwork.session.model.Session
 
 import scala.language.implicitConversions
 
-trait SessionEndpoints[T <: SessionData] extends TapirEndpoints { _: SessionMaterials[T] =>
+trait SessionEndpoints[T <: SessionData with SessionDataDecorator[T]] extends TapirEndpoints {
+  _: SessionMaterials[T] =>
 
   import app.softnetwork.session.TapirSessionOptions._
 

session/core/src/main/scala/app/softnetwork/session/service/SessionMaterials.scala

@@ -1,14 +1,19 @@
 package app.softnetwork.session.service
 
 import akka.actor.typed.ActorSystem
-import app.softnetwork.session.model.{SessionData, SessionDataCompanion, SessionManagers}
+import app.softnetwork.session.model.{
+  SessionData,
+  SessionDataCompanion,
+  SessionDataDecorator,
+  SessionManagers
+}
 import com.softwaremill.session.{RefreshTokenStorage, SessionConfig, SessionManager}
 import org.softnetwork.session.model.Session
 
 import scala.concurrent.ExecutionContext
 import scala.language.reflectiveCalls
 
-trait SessionMaterials[T <: SessionData] {
+trait SessionMaterials[T <: SessionData with SessionDataDecorator[T]] {
 
   implicit def manager(implicit
     sessionConfig: SessionConfig,
@@ -27,7 +32,8 @@ trait SessionMaterials[T <: SessionData] {
 
 }
 
-trait BasicSessionMaterials[T <: SessionData] extends SessionMaterials[T] {
+trait BasicSessionMaterials[T <: SessionData with SessionDataDecorator[T]]
+    extends SessionMaterials[T] {
 
   override implicit def manager(implicit
     sessionConfig: SessionConfig,
@@ -36,7 +42,8 @@ trait BasicSessionMaterials[T <: SessionData] extends SessionMaterials[T] {
     SessionManagers.basic
 }
 
-trait JwtSessionMaterials[T <: SessionData] extends SessionMaterials[T] {
+trait JwtSessionMaterials[T <: SessionData with SessionDataDecorator[T]]
+    extends SessionMaterials[T] {
 
   override implicit def manager(implicit
     sessionConfig: SessionConfig,

session/core/src/main/scala/app/softnetwork/session/service/SessionService.scala

@@ -1,6 +1,6 @@
 package app.softnetwork.session.service
 
-import app.softnetwork.session.model.SessionData
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 import com.softwaremill.session.{
   CsrfCheckMode,
   CsrfOptions,
@@ -14,7 +14,8 @@ import org.softnetwork.session.model.Session
 
 /** Created by smanciot on 05/07/2018.
   */
-trait SessionService[T <: SessionData] extends SessionDirectives { _: SessionMaterials[T] =>
+trait SessionService[T <: SessionData with SessionDataDecorator[T]] extends SessionDirectives {
+  _: SessionMaterials[T] =>
 
   import com.softwaremill.session.SessionOptions._
 

session/testkit/src/main/scala/app/softnetwork/session/scalatest/CookieSessionTestKit.scala

@@ -1,12 +1,13 @@
 package app.softnetwork.session.scalatest
 
 import app.softnetwork.api.server.ApiRoutes
-import app.softnetwork.session.model.SessionData
+import app.softnetwork.session.model.{SessionData, SessionDataDecorator}
 import app.softnetwork.session.service.SessionMaterials
 import com.softwaremill.session.CookieConfig
 import org.scalatest.Suite
 
-trait CookieSessionTestKit[T <: SessionData] extends SessionTestKit[T] {
+trait CookieSessionTestKit[T <: SessionData with SessionDataDecorator[T]]
+    extends SessionTestKit[T] {
   _: Suite with ApiRoutes with SessionMaterials[T] =>
 
   def cookieConfig: CookieConfig

session/testkit/src/main/scala/app/softnetwork/session/scalatest/CreateSession.scala

@@ -1,3 +1,3 @@
 package app.softnetwork.session.scalatest
 
-case class CreateSession(id: String, profile: Option[String] = None, admin: Option[Boolean] = None)
+case class CreateSession(data: Map[String, String] = Map.empty)