Skip to content

Commit b2b6112

Browse files
committed
update session dependencies
1 parent 3700075 commit b2b6112

22 files changed

+305
-179
lines changed

api/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import app.softnetwork.sbt.build.Versions
22
import com.typesafe.sbt.packager.docker._
33

4-
Compile / mainClass := Some("app.softnetwork.scheduler.api.SwaggerSchedulerPostgresLauncher")
4+
Compile / mainClass := Some("app.softnetwork.scheduler.api.SchedulerWithRefreshableCookiePostgresLauncher")
55

66
dockerBaseImage := "openjdk:8"
77

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import app.softnetwork.persistence.schema.SchemaProvider
4+
import app.softnetwork.scheduler.launch.SchedulerEndpoints
5+
import com.softwaremill.session.CsrfCheck
6+
7+
trait SchedulerEndpointsApi extends SchedulerApi with SchedulerEndpoints {
8+
_: SchemaProvider with CsrfCheck =>
9+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionEndpoints
7+
import com.softwaremill.session.CsrfCheckHeaderAndForm
8+
import org.slf4j.{Logger, LoggerFactory}
9+
10+
object SchedulerWithOneOffCookiePostgresLauncher
11+
extends SchedulerEndpointsApi
12+
with JdbcSchemaProvider
13+
with CsrfCheckHeaderAndForm {
14+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
15+
16+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
17+
18+
override def sessionEndpoints: ActorSystem[_] => SessionEndpoints = system =>
19+
SessionEndpoints.oneOffCookie(system, checkHeaderAndForm)
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionEndpoints
7+
import com.softwaremill.session.CsrfCheckHeaderAndForm
8+
import org.slf4j.{Logger, LoggerFactory}
9+
10+
object SchedulerWithOneOffHeaderPostgresLauncher
11+
extends SchedulerEndpointsApi
12+
with JdbcSchemaProvider
13+
with CsrfCheckHeaderAndForm {
14+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
15+
16+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
17+
18+
override def sessionEndpoints: ActorSystem[_] => SessionEndpoints = system =>
19+
SessionEndpoints.oneOffHeader(system, checkHeaderAndForm)
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionEndpoints
7+
import com.softwaremill.session.CsrfCheckHeaderAndForm
8+
import org.slf4j.{Logger, LoggerFactory}
9+
10+
object SchedulerWithRefreshableCookiePostgresLauncher
11+
extends SchedulerEndpointsApi
12+
with JdbcSchemaProvider
13+
with CsrfCheckHeaderAndForm {
14+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
15+
16+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
17+
18+
override def sessionEndpoints: ActorSystem[_] => SessionEndpoints = system =>
19+
SessionEndpoints.refreshableCookie(system, checkHeaderAndForm)
20+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package app.softnetwork.scheduler.api
2+
3+
import akka.actor.typed.ActorSystem
4+
import app.softnetwork.persistence.jdbc.schema.{JdbcSchemaProvider, JdbcSchemaTypes}
5+
import app.softnetwork.persistence.schema.SchemaType
6+
import app.softnetwork.session.service.SessionEndpoints
7+
import com.softwaremill.session.CsrfCheckHeaderAndForm
8+
import org.slf4j.{Logger, LoggerFactory}
9+
10+
object SchedulerWithRefreshableHeaderPostgresLauncher
11+
extends SchedulerEndpointsApi
12+
with JdbcSchemaProvider
13+
with CsrfCheckHeaderAndForm {
14+
lazy val log: Logger = LoggerFactory getLogger getClass.getName
15+
16+
def schemaType: SchemaType = JdbcSchemaTypes.Postgres
17+
18+
override def sessionEndpoints: ActorSystem[_] => SessionEndpoints = system =>
19+
SessionEndpoints.refreshableHeader(system, checkHeaderAndForm)
20+
}

api/src/main/scala/app/softnetwork/scheduler/api/SwaggerSchedulerApi.scala

Lines changed: 0 additions & 6 deletions
This file was deleted.

api/src/main/scala/app/softnetwork/scheduler/api/SwaggerSchedulerPostgresLauncher.scala

Lines changed: 0 additions & 11 deletions
This file was deleted.

common/src/main/scala/app/softnetwork/scheduler/message/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ package object message {
116116
extends ErrorMessage(message)
117117
with SchedulerCommandResult
118118

119-
case object AuthenticationError extends SchedulerErrorMessage("AuthenticationError")
119+
case object UnauthorizedError extends SchedulerErrorMessage("Unauthorized")
120120

121121
case object SchedulerNotFound extends SchedulerErrorMessage("SchedulerNotFound")
122122

core/src/main/scala/app/softnetwork/scheduler/launch/SchedulerEndpoints.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ package app.softnetwork.scheduler.launch
33
import akka.actor.typed.ActorSystem
44
import app.softnetwork.api.server.ApiEndpoints
55
import app.softnetwork.persistence.schema.SchemaProvider
6-
import app.softnetwork.scheduler.service.{
7-
OneOffCookieSchedulerServiceEndpoints,
8-
SchedulerServiceEndpoints
9-
}
6+
import app.softnetwork.scheduler.service.SchedulerServiceEndpoints
7+
import app.softnetwork.session.service.SessionEndpoints
108
import sttp.tapir.server.ServerEndpoint
119

1210
import scala.concurrent.Future
1311

1412
trait SchedulerEndpoints extends ApiEndpoints with SchedulerGuardian { _: SchemaProvider =>
1513

14+
def sessionEndpoints: ActorSystem[_] => SessionEndpoints
15+
1616
def schedulerEndpoints: ActorSystem[_] => SchedulerServiceEndpoints = system =>
17-
OneOffCookieSchedulerServiceEndpoints(system)
17+
SchedulerServiceEndpoints.apply(system, sessionEndpoints(system))
1818

1919
override def endpoints: ActorSystem[_] => List[ServerEndpoint[Any, Future]] = system =>
2020
schedulerEndpoints(system).endpoints

0 commit comments

Comments
 (0)