Skip to content

Commit 9824865

Browse files
committed
add method type parameter ERROR_OUTPUT for csrf
1 parent 5e6fa52 commit 9824865

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

example/src/main/scala/com/softwaremill/example/session/SetSessionTapir.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import com.softwaremill.session._
1010
import com.typesafe.scalalogging.StrictLogging
1111
import sttp.model.headers.WWWAuthenticateChallenge
1212
import sttp.tapir.EndpointInput.AuthType
13-
import sttp.tapir.{EndpointInput, auth, endpoint, stringBody}
13+
import sttp.tapir.{EndpointInput, auth, stringBody}
1414
import sttp.tapir.model.UsernamePassword
15-
import sttp.tapir.server.{PartialServerEndpointWithSecurityOutput, ServerEndpoint}
15+
import sttp.tapir.server.ServerEndpoint
1616
import sttp.tapir.server.akkahttp.AkkaHttpServerInterpreter
1717
import sttp.tapir.swagger.bundle.SwaggerInterpreter
1818

tapir/src/main/scala/com/softwaremill/session/CsrfEndpoints.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import scala.concurrent.{ExecutionContext, Future}
99

1010
trait CsrfEndpoints {
1111

12-
def hmacTokenCsrfProtection[T, SECURITY_INPUT, PRINCIPAL, SECURITY_OUTPUT](
12+
def hmacTokenCsrfProtection[T, SECURITY_INPUT, PRINCIPAL, ERROR_OUTPUT, SECURITY_OUTPUT](
1313
checkMode: TapirCsrfCheckMode[T]
1414
)(
1515
body: => PartialServerEndpointWithSecurityOutput[
1616
SECURITY_INPUT,
1717
PRINCIPAL,
1818
Unit,
19-
Unit,
19+
ERROR_OUTPUT,
2020
SECURITY_OUTPUT,
2121
Unit,
2222
Any,
@@ -26,7 +26,7 @@ trait CsrfEndpoints {
2626
(SECURITY_INPUT, Option[String], Method, Option[String]),
2727
PRINCIPAL,
2828
Unit,
29-
Unit,
29+
_,
3030
(SECURITY_OUTPUT, Option[CookieValueWithMeta]),
3131
Unit,
3232
Any,

tapir/src/main/scala/com/softwaremill/session/TapirCsrf.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,14 @@ private[session] trait TapirCsrf[T] { _: CsrfCheck =>
113113
def hmacTokenCsrfProtection[
114114
SECURITY_INPUT,
115115
PRINCIPAL,
116+
ERROR_OUTPUT,
116117
SECURITY_OUTPUT
117118
](
118119
body: => PartialServerEndpointWithSecurityOutput[
119120
SECURITY_INPUT,
120121
PRINCIPAL,
121122
Unit,
122-
Unit,
123+
ERROR_OUTPUT,
123124
SECURITY_OUTPUT,
124125
Unit,
125126
Any,
@@ -129,7 +130,7 @@ private[session] trait TapirCsrf[T] { _: CsrfCheck =>
129130
(SECURITY_INPUT, Option[String], Method, Option[String]),
130131
PRINCIPAL,
131132
Unit,
132-
Unit,
133+
_,
133134
(SECURITY_OUTPUT, Option[CookieValueWithMeta]),
134135
Unit,
135136
Any,

tapir/src/main/scala/com/softwaremill/session/TapirEndpoints.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ trait TapirEndpoints extends SessionEndpoints with CsrfEndpoints {
1717
(Seq[Option[String]], Option[String], Method, Option[String]),
1818
T,
1919
Unit,
20-
Unit,
20+
_,
2121
(Seq[Option[String]], Option[CookieValueWithMeta]),
2222
Unit,
2323
Any,
@@ -35,7 +35,7 @@ trait TapirEndpoints extends SessionEndpoints with CsrfEndpoints {
3535
(Seq[Option[String]], Option[String], Method, Option[String]),
3636
Option[T],
3737
Unit,
38-
Unit,
38+
_,
3939
(Seq[Option[String]], Option[CookieValueWithMeta]),
4040
Unit,
4141
Any,

0 commit comments

Comments
 (0)