add method type parameter ERROR_OUTPUT to invalidate session

Author: fupelaqu

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

@@ -308,11 +308,11 @@ private[session] trait OneOffTapirSession[T] {
         )
       }
 
-  private[this] def invalidateOneOffSessionLogic[SECURITY_OUTPUT, PRINCIPAL](
+  private[this] def invalidateOneOffSessionLogic[SECURITY_OUTPUT, PRINCIPAL, ERROR_OUTPUT](
       result: (SECURITY_OUTPUT, PRINCIPAL),
       maybeCookie: Option[String],
       maybeHeader: Option[String]
-  ): Either[Unit, (Seq[Option[String]], PRINCIPAL)] = {
+  ): Either[ERROR_OUTPUT, (Seq[Option[String]], PRINCIPAL)] = {
     val principal = result._2
     maybeCookie match {
       case Some(_) =>
@@ -348,13 +348,14 @@ private[session] trait OneOffTapirSession[T] {
 
   def invalidateOneOffSession[
       SECURITY_INPUT,
-      PRINCIPAL
+      PRINCIPAL,
+      ERROR_OUTPUT
   ](st: GetSessionTransport)(
       body: => PartialServerEndpointWithSecurityOutput[
         SECURITY_INPUT,
         PRINCIPAL,
         Unit,
-        Unit,
+        ERROR_OUTPUT,
         _,
         Unit,
         Any,
@@ -364,7 +365,7 @@ private[session] trait OneOffTapirSession[T] {
     (SECURITY_INPUT, Seq[Option[String]]),
     PRINCIPAL,
     Unit,
-    Unit,
+    ERROR_OUTPUT,
     Seq[Option[String]],
     Unit,
     Any,

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

@@ -463,12 +463,12 @@ private[session] trait RefreshableTapirSession[T] extends Completion {
       }
   }
 
-  private[this] def invalidateRefreshableSessionLogic[PRINCIPAL](
+  private[this] def invalidateRefreshableSessionLogic[PRINCIPAL, ERROR_OUTPUT](
       result: (Seq[Option[String]], PRINCIPAL),
       cookie: Option[String],
       header: Option[String]
   ): Either[
-    Nothing,
+    ERROR_OUTPUT,
     (
         Seq[Option[String]],
         PRINCIPAL
@@ -497,13 +497,14 @@ private[session] trait RefreshableTapirSession[T] extends Completion {
 
   def invalidateRefreshableSession[
       SECURITY_INPUT,
-      PRINCIPAL
+      PRINCIPAL,
+      ERROR_OUTPUT
   ](st: GetSessionTransport)(
       body: => PartialServerEndpointWithSecurityOutput[
         SECURITY_INPUT,
         PRINCIPAL,
         Unit,
-        Unit,
+        ERROR_OUTPUT,
         _,
         Unit,
         Any,
@@ -513,7 +514,7 @@ private[session] trait RefreshableTapirSession[T] extends Completion {
     (SECURITY_INPUT, Seq[Option[String]]),
     PRINCIPAL,
     Unit,
-    Unit,
+    ERROR_OUTPUT,
     Seq[Option[String]],
     Unit,
     Any,

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

@@ -108,15 +108,15 @@ trait SessionEndpoints {
     * Note that you should use `refreshable` if you use refreshable systems even only for some
     * users.
     */
-  def invalidateSession[T, SECURITY_INPUT, PRINCIPAL](
+  def invalidateSession[T, SECURITY_INPUT, PRINCIPAL, ERROR_OUTPUT](
       sc: TapirSessionContinuity[T],
       st: GetSessionTransport
   )(
       body: => PartialServerEndpointWithSecurityOutput[
         SECURITY_INPUT,
         PRINCIPAL,
         Unit,
-        Unit,
+        ERROR_OUTPUT,
         _,
         Unit,
         Any,
@@ -126,7 +126,7 @@ trait SessionEndpoints {
     (SECURITY_INPUT, Seq[Option[String]]),
     PRINCIPAL,
     Unit,
-    Unit,
+    ERROR_OUTPUT,
     Seq[Option[String]],
     Unit,
     Any,

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

@@ -100,13 +100,14 @@ sealed trait TapirSessionContinuity[T] {
 
   def invalidateSession[
       SECURITY_INPUT,
-      PRINCIPAL
+      PRINCIPAL,
+      ERROR_OUTPUT
   ](st: GetSessionTransport)(
       body: => PartialServerEndpointWithSecurityOutput[
         SECURITY_INPUT,
         PRINCIPAL,
         Unit,
-        Unit,
+        ERROR_OUTPUT,
         _,
         Unit,
         Any,
@@ -116,7 +117,7 @@ sealed trait TapirSessionContinuity[T] {
     (SECURITY_INPUT, Seq[Option[String]]),
     PRINCIPAL,
     Unit,
-    Unit,
+    ERROR_OUTPUT,
     Seq[Option[String]],
     Unit,
     Any,
@@ -230,12 +231,12 @@ trait OneOffTapirSessionContinuity[T] extends TapirSessionContinuity[T] {
                                              Future] =
     oneOffSession(st, required)
 
-  override def invalidateSession[SECURITY_INPUT, PRINCIPAL](st: GetSessionTransport)(
+  override def invalidateSession[SECURITY_INPUT, PRINCIPAL, ERROR_OUTPUT](st: GetSessionTransport)(
       body: => PartialServerEndpointWithSecurityOutput[
         SECURITY_INPUT,
         PRINCIPAL,
         Unit,
-        Unit,
+        ERROR_OUTPUT,
         _,
         Unit,
         Any,
@@ -245,7 +246,7 @@ trait OneOffTapirSessionContinuity[T] extends TapirSessionContinuity[T] {
     (SECURITY_INPUT, Seq[Option[String]]),
     PRINCIPAL,
     Unit,
-    Unit,
+    ERROR_OUTPUT,
     Seq[Option[String]],
     Unit,
     Any,
@@ -315,12 +316,12 @@ trait RefreshableTapirSessionContinuity[T] extends TapirSessionContinuity[T] wit
                                              Any,
                                              Future] = refreshableSession(st, required)
 
-  override def invalidateSession[SECURITY_INPUT, PRINCIPAL](st: GetSessionTransport)(
+  override def invalidateSession[SECURITY_INPUT, PRINCIPAL, ERROR_OUTPUT](st: GetSessionTransport)(
       body: => PartialServerEndpointWithSecurityOutput[
         SECURITY_INPUT,
         PRINCIPAL,
         Unit,
-        Unit,
+        ERROR_OUTPUT,
         _,
         Unit,
         Any,
@@ -330,7 +331,7 @@ trait RefreshableTapirSessionContinuity[T] extends TapirSessionContinuity[T] wit
     (SECURITY_INPUT, Seq[Option[String]]),
     PRINCIPAL,
     Unit,
-    Unit,
+    ERROR_OUTPUT,
     Seq[Option[String]],
     Unit,
     Any,