Alter the library methods to propagate an implicit ExecutionContext to

solve issue #341.

silhouette-testkit/app/com/mohiva/play/silhouette/test/Fakes.scala

@@ -29,6 +29,7 @@ import play.api.mvc.RequestHeader
 
 import scala.collection.mutable
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext
 import scala.reflect.runtime.universe._
 
 /**
@@ -53,7 +54,7 @@ class FakeIdentityService[I <: Identity](identities: (LoginInfo, I)*)
    * @param loginInfo The login info to retrieve an identity.
    * @return The retrieved identity or None if no identity could be retrieved for the given login info.
    */
-  def retrieve(loginInfo: LoginInfo): Future[Option[I]] = {
+  def retrieve(loginInfo: LoginInfo)(implicit ec: ExecutionContext): Future[Option[I]] = {
     Future.successful(identities.find(_._1 == loginInfo).map(_._2))
   }
 }
@@ -76,7 +77,7 @@ class FakeAuthenticatorDAO[T <: StorableAuthenticator] extends AuthenticatorDAO[
    * @param id The authenticator ID.
    * @return The found authenticator or None if no authenticator could be found for the given ID.
    */
-  def find(id: String): Future[Option[T]] = {
+  def find(id: String)(implicit ec: ExecutionContext): Future[Option[T]] = {
     Future.successful(data.get(id))
   }
 
@@ -86,7 +87,7 @@ class FakeAuthenticatorDAO[T <: StorableAuthenticator] extends AuthenticatorDAO[
    * @param authenticator The authenticator to add.
    * @return The added authenticator.
    */
-  def add(authenticator: T): Future[T] = {
+  def add(authenticator: T)(implicit ec: ExecutionContext): Future[T] = {
     data += (authenticator.id -> authenticator)
     Future.successful(authenticator)
   }
@@ -97,7 +98,7 @@ class FakeAuthenticatorDAO[T <: StorableAuthenticator] extends AuthenticatorDAO[
    * @param authenticator The authenticator to update.
    * @return The updated authenticator.
    */
-  def update(authenticator: T): Future[T] = {
+  def update(authenticator: T)(implicit ec: ExecutionContext): Future[T] = {
     data += (authenticator.id -> authenticator)
     Future.successful(authenticator)
   }
@@ -108,7 +109,7 @@ class FakeAuthenticatorDAO[T <: StorableAuthenticator] extends AuthenticatorDAO[
    * @param id The authenticator ID.
    * @return An empty future.
    */
-  def remove(id: String): Future[Unit] = {
+  def remove(id: String)(implicit ec: ExecutionContext): Future[Unit] = {
     data -= id
     Future.successful(())
   }
@@ -201,7 +202,7 @@ object FakeAuthenticator {
    * @tparam T The type of the authenticator,
    * @return A authenticator instance.
    */
-  def apply[T <: Authenticator](loginInfo: LoginInfo)(implicit env: Environment[_, T], requestHeader: RequestHeader): T = {
+  def apply[T <: Authenticator](loginInfo: LoginInfo)(implicit env: Environment[_, T], requestHeader: RequestHeader, ec: ExecutionContext): T = {
     env.authenticatorService.create(loginInfo)
   }
 }

silhouette-testkit/app/com/mohiva/play/silhouette/test/package.scala

@@ -16,10 +16,10 @@
 package com.mohiva.play.silhouette
 
 import com.mohiva.play.silhouette.api._
-import play.api.libs.concurrent.Execution.Implicits._
 import play.api.test.{ FakeHeaders, FakeRequest }
 
 import scala.concurrent.duration._
+import scala.concurrent.ExecutionContext
 import scala.concurrent.{ Await, Future }
 import scala.language.{ implicitConversions, postfixOps }
 
@@ -53,8 +53,8 @@ package object test {
      * @tparam T The type of the authenticator,
      * @return A fake request.
      */
-    def withAuthenticator[T <: Authenticator](authenticator: T)(implicit env: Environment[_, T]): FakeRequest[A] = {
-      val rh = env.authenticatorService.init(authenticator)(f).map(v => env.authenticatorService.embed(v, f))
+    def withAuthenticator[T <: Authenticator](authenticator: T)(implicit env: Environment[_, T], ec: ExecutionContext): FakeRequest[A] = {
+      val rh = env.authenticatorService.init(authenticator)(f, ec).map(v => env.authenticatorService.embed(v, f))
       new FakeRequest(
         id = rh.id,
         tags = rh.tags,
@@ -76,8 +76,8 @@ package object test {
      * @tparam T The type of the authenticator,
      * @return A fake request.
      */
-    def withAuthenticator[T <: Authenticator](loginInfo: LoginInfo)(implicit env: Environment[_, T]): FakeRequest[A] = {
-      withAuthenticator(FakeAuthenticator[T](loginInfo)(env, f))
+    def withAuthenticator[T <: Authenticator](loginInfo: LoginInfo)(implicit env: Environment[_, T], ec: ExecutionContext): FakeRequest[A] = {
+      withAuthenticator(FakeAuthenticator[T](loginInfo)(env, f, ec))
     }
   }
 }

silhouette-testkit/test/com/mohiva/play/silhouette/test/FakesSpec.scala

@@ -22,6 +22,7 @@ import com.mohiva.play.silhouette.impl.authenticators._
 import org.specs2.matcher.JsonMatchers
 import play.api.libs.json.Json
 import play.api.test.{ FakeRequest, PlaySpecification, WithApplication }
+import scala.concurrent.ExecutionContext.Implicits.global
 
 /**
  * Test case for the [[com.mohiva.play.silhouette.test]] helpers.

silhouette/app/com/mohiva/play/silhouette/api/Authorization.scala

@@ -22,7 +22,7 @@ package com.mohiva.play.silhouette.api
 import play.api.i18n.Messages
 import play.api.mvc.RequestHeader
 import scala.concurrent.Future
-import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.ExecutionContext
 
 /**
  * A trait to define Authorization objects that let you hook
@@ -40,7 +40,7 @@ trait Authorization[I <: Identity] {
    * @param messages The messages for the current language.
    * @return True if the user is authorized, false otherwise.
    */
-  def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages): Future[Boolean]
+  def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages, ec: ExecutionContext): Future[Boolean]
 }
 
 /**
@@ -61,7 +61,7 @@ object Authorization {
      * @return The authorization.
      */
     def unary_! : Authorization[I] = new Authorization[I] {
-      def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages): Future[Boolean] = {
+      def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages, ec: ExecutionContext): Future[Boolean] = {
         self.isAuthorized(identity).map(x => !x)
       }
     }
@@ -73,7 +73,7 @@ object Authorization {
      * @return The authorization.
      */
     def &&(authorization: Authorization[I]): Authorization[I] = new Authorization[I] {
-      def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages): Future[Boolean] = {
+      def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages, ec: ExecutionContext): Future[Boolean] = {
         val leftF = self.isAuthorized(identity)
         val rightF = authorization.isAuthorized(identity)
         for {
@@ -90,7 +90,7 @@ object Authorization {
      * @return The authorization.
      */
     def ||(authorization: Authorization[I]): Authorization[I] = new Authorization[I] {
-      def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages): Future[Boolean] = {
+      def isAuthorized(identity: I)(implicit request: RequestHeader, messages: Messages, ec: ExecutionContext): Future[Boolean] = {
         val leftF = self.isAuthorized(identity)
         val rightF = authorization.isAuthorized(identity)
         for {

silhouette/app/com/mohiva/play/silhouette/api/Provider.scala

@@ -18,6 +18,7 @@ package com.mohiva.play.silhouette.api
 import play.api.mvc.Request
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext
 
 /**
  * A marker interface for all providers.
@@ -54,5 +55,5 @@ trait RequestProvider extends Provider {
    * @tparam B The type of the body.
    * @return Some login info on successful authentication or None if the authentication was unsuccessful.
    */
-  def authenticate[B](request: Request[B]): Future[Option[LoginInfo]]
+  def authenticate[B](request: Request[B])(implicit ec: ExecutionContext): Future[Option[LoginInfo]]
 }

silhouette/app/com/mohiva/play/silhouette/api/SecuredSettings.scala

@@ -20,6 +20,7 @@ import play.api.i18n.Messages
 import play.api.mvc.{ RequestHeader, Result }
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext
 
 /**
  * Can be mixed into the GlobalSettings object to define a global behaviour
@@ -37,7 +38,7 @@ trait SecuredSettings {
    * @param messages The messages for the current language.
    * @return The result to send to the client.
    */
-  def onNotAuthenticated(request: RequestHeader, messages: Messages): Option[Future[Result]] = None
+  def onNotAuthenticated(request: RequestHeader, messages: Messages)(implicit ec: ExecutionContext): Option[Future[Result]] = None
 
   /**
    * Called when a user is authenticated but not authorized.
@@ -48,5 +49,5 @@ trait SecuredSettings {
    * @param messages The messages for the current language.
    * @return The result to send to the client.
    */
-  def onNotAuthorized(request: RequestHeader, messages: Messages): Option[Future[Result]] = None
+  def onNotAuthorized(request: RequestHeader, messages: Messages)(implicit ec: ExecutionContext): Option[Future[Result]] = None
 }