Java API for session and csrf directives

Author: kijanowski

core/src/main/java/com/softwaremill/session/javadsl/HttpSessionAwareDirectives.java

@@ -0,0 +1,56 @@
+package com.softwaremill.session.javadsl;
+
+import akka.http.javadsl.server.AllDirectives;
+import akka.http.javadsl.server.Route;
+import com.softwaremill.session.CsrfCheckMode;
+import com.softwaremill.session.CsrfDirectives$;
+import com.softwaremill.session.SessionContinuity;
+import com.softwaremill.session.SessionDirectives$;
+import com.softwaremill.session.SessionManager;
+import com.softwaremill.session.SetSessionTransport;
+import scala.Option;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class HttpSessionAwareDirectives<T> extends AllDirectives {
+
+    private final SessionManager<T> sessionManager;
+
+    public HttpSessionAwareDirectives(SessionManager<T> sessionManager) {
+        this.sessionManager = sessionManager;
+    }
+
+
+    public Route setSession(SessionContinuity sc, SetSessionTransport st, T session, Supplier<Route> continuity) {
+        return SessionDirectives$.MODULE$.setSession(sc, st, session, continuity);
+    }
+
+    public Route optionalSession(SessionContinuity sc, SetSessionTransport st, Function<Option<T>, Route> continuity) {
+        return SessionDirectives$.MODULE$.optionalSession(sc, st, continuity);
+    }
+
+    public Route requiredSession(SessionContinuity<T> sc, SetSessionTransport st, Function<T, Route> continuity) {
+        return SessionDirectives$.MODULE$.requiredSession(sc, st, continuity);
+    }
+
+    public Route touchRequiredSession(SessionContinuity<T> sc, SetSessionTransport st, Function<T, Route> continuity) {
+        return SessionDirectives$.MODULE$.touchRequiredSession(sc, st, continuity);
+    }
+
+    public Route invalidateSession(SessionContinuity<T> sc, SetSessionTransport st, Supplier<Route> continuity) {
+        return SessionDirectives$.MODULE$.invalidateSession(sc, st, continuity);
+    }
+
+    public Route setNewCsrfToken(CsrfCheckMode<T> checkHeader, Supplier<Route> continuity) {
+        return CsrfDirectives$.MODULE$.setNewCsrfToken(checkHeader, continuity);
+    }
+
+    public Route randomTokenCsrfProtection(CsrfCheckMode<T> checkHeader, Supplier<Route> continuity) {
+        return CsrfDirectives$.MODULE$.randomTokenCsrfProtection(checkHeader, continuity);
+    }
+
+    public SessionManager<T> getSessionManager() {
+        return sessionManager;
+    }
+}

core/src/main/scala/com/softwaremill/session/CsrfDirectives.scala

@@ -1,7 +1,11 @@
 package com.softwaremill.session
 
-import akka.http.scaladsl.server.{Directive1, Directive0}
+import java.util.function.Supplier
+
+import akka.http.javadsl.server.Route
+import akka.http.javadsl.server.directives.RouteAdapter
 import akka.http.scaladsl.server.Directives._
+import akka.http.scaladsl.server.{Directive0, Directive1}
 import akka.stream.Materializer
 
 trait CsrfDirectives {
@@ -36,6 +40,15 @@ trait CsrfDirectives {
     }
   }
 
+  /**
+   * Java alternative
+   */
+  def randomTokenCsrfProtection[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
+    randomTokenCsrfProtection(checkMode) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
   def submittedCsrfToken[T](checkMode: CsrfCheckMode[T]): Directive1[String] = {
     headerValueByName(checkMode.manager.config.csrfSubmittedName).recover { rejections =>
       checkMode match {
@@ -52,6 +65,15 @@ trait CsrfDirectives {
 
   def setNewCsrfToken[T](checkMode: CsrfCheckMode[T]): Directive0 =
     setCookie(checkMode.csrfManager.createCookie())
+
+  /**
+   * Java alternative
+   */
+  def setNewCsrfToken[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
+    setNewCsrfToken(checkMode) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
 }
 
 object CsrfDirectives extends CsrfDirectives

core/src/main/scala/com/softwaremill/session/SessionDirectives.scala

@@ -1,7 +1,11 @@
 package com.softwaremill.session
 
-import akka.http.scaladsl.server.{Directive1, Directive0}
+import java.util.function.Supplier
+
+import akka.http.javadsl.server.Route
+import akka.http.javadsl.server.directives.RouteAdapter
 import akka.http.scaladsl.server.Directives._
+import akka.http.scaladsl.server.{Directive0, Directive1}
 
 import scala.concurrent.ExecutionContext
 
@@ -22,6 +26,15 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
     }
   }
 
+  /**
+   * Java alternative
+   */
+  def setSession[T](sc: SessionContinuity[T], st: SetSessionTransport, v: T, inner: Supplier[Route]): Route = RouteAdapter {
+    setSession(sc, st, v) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
   /**
    * Read a session from the session cookie, wrapped in [[SessionResult]] describing the possible
    * success/failure outcomes.
@@ -50,12 +63,30 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
     }
   }
 
+  /**
+   * Java alternative
+   */
+  def invalidateSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: Supplier[Route]): Route = RouteAdapter {
+    invalidateSession(sc, st) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
   /**
    * Read an optional session from the session cookie.
    */
   def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport): Directive1[Option[T]] =
     session(sc, st).map(_.toOption)
 
+  /**
+   * Java alternative
+   */
+  def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[Option[T], Route]): Route = RouteAdapter {
+    optionalSession(sc, st) { session =>
+      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
   /**
    * Read a required session from the session cookie.
    */
@@ -65,6 +96,15 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
       case Some(data) => provide(data)
     }
 
+  /**
+   * Java alternative
+   */
+  def requiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[T, Route]): Route = RouteAdapter {
+    requiredSession(sc, st) { session =>
+      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
   /**
    * Sets the session cookie again with the same data. Useful when using the [[SessionConfig.sessionMaxAgeSeconds]]
    * option, as it sets the expiry date anew.
@@ -80,6 +120,16 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
   def touchRequiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport): Directive1[T] = {
     requiredSession(sc, st).flatMap { d => setOneOffSessionSameTransport(sc, st, d) & provide(d) }
   }
+
+  /**
+   * Java alternative
+   */
+  def touchRequiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[T, Route]): Route = RouteAdapter {
+    touchRequiredSession(sc, st) { session =>
+      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
 }
 
 object SessionDirectives extends SessionDirectives