Merge pull request #79 from tsuyoshizawa/master

Do not use import scala.concurrent.ExecutionContext.Implicits.global

Author: tsuyoshizawa

scala-oauth2-core/src/main/scala/scalaoauth2/provider/GrantHandler.scala

@@ -1,7 +1,6 @@
 package scalaoauth2.provider
 
-import scala.concurrent.Future
-import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.{ ExecutionContext, Future }
 
 case class GrantHandlerResult[U](
   authInfo: AuthInfo[U],
@@ -19,12 +18,12 @@ trait GrantHandler {
    */
   def clientCredentialRequired = true
 
-  def handleRequest[U](request: AuthorizationRequest, authorizationHandler: AuthorizationHandler[U]): Future[GrantHandlerResult[U]]
+  def handleRequest[U](request: AuthorizationRequest, authorizationHandler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]]
 
   /**
    * Returns valid access token.
    */
-  protected def issueAccessToken[U](handler: AuthorizationHandler[U], authInfo: AuthInfo[U]): Future[GrantHandlerResult[U]] = {
+  protected def issueAccessToken[U](handler: AuthorizationHandler[U], authInfo: AuthInfo[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]] = {
     handler.getStoredAccessToken(authInfo).flatMap {
       case Some(token) if shouldRefreshAccessToken(token) => token.refreshToken.map {
         handler.refreshAccessToken(authInfo, _)
@@ -51,7 +50,7 @@ trait GrantHandler {
 
 class RefreshToken extends GrantHandler {
 
-  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[GrantHandlerResult[U]] = {
+  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]] = {
     val refreshTokenRequest = new RefreshTokenRequest(request)
     val clientCredential = refreshTokenRequest.clientCredential.getOrElse(throw new InvalidRequest("Client credential is required"))
     val refreshToken = refreshTokenRequest.refreshToken
@@ -69,7 +68,7 @@ class RefreshToken extends GrantHandler {
 
 class Password extends GrantHandler {
 
-  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[GrantHandlerResult[U]] = {
+  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]] = {
     val passwordRequest = new PasswordRequest(request)
     if (clientCredentialRequired && passwordRequest.clientCredential.isEmpty) {
       throw new InvalidRequest("Client credential is required")
@@ -88,7 +87,7 @@ class Password extends GrantHandler {
 
 class ClientCredentials extends GrantHandler {
 
-  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[GrantHandlerResult[U]] = {
+  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]] = {
     val clientCredentialsRequest = new ClientCredentialsRequest(request)
     val clientCredential = clientCredentialsRequest.clientCredential.getOrElse(throw new InvalidRequest("Client credential is required"))
     val scope = clientCredentialsRequest.scope
@@ -105,7 +104,7 @@ class ClientCredentials extends GrantHandler {
 
 class AuthorizationCode extends GrantHandler {
 
-  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[GrantHandlerResult[U]] = {
+  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]] = {
     val authorizationCodeRequest = new AuthorizationCodeRequest(request)
     val clientCredential = authorizationCodeRequest.clientCredential.getOrElse(throw new InvalidRequest("Client credential is required"))
     val clientId = clientCredential.clientId
@@ -132,7 +131,7 @@ class AuthorizationCode extends GrantHandler {
 
 class Implicit extends GrantHandler {
 
-  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[GrantHandlerResult[U]] = {
+  override def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[GrantHandlerResult[U]] = {
     val implicitRequest = new ImplicitRequest(request)
     val clientCredential = implicitRequest.clientCredential.getOrElse(throw new InvalidRequest("Client credential is required"))
 

scala-oauth2-core/src/main/scala/scalaoauth2/provider/ProtectedResource.scala

@@ -1,13 +1,12 @@
 package scalaoauth2.provider
 
-import scala.concurrent.Future
-import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.{ ExecutionContext, Future }
 
 trait ProtectedResource {
 
   val fetchers = Seq(AuthHeader, RequestParameter)
 
-  def handleRequest[U](request: ProtectedResourceRequest, handler: ProtectedResourceHandler[U]): Future[Either[OAuthError, AuthInfo[U]]] = try {
+  def handleRequest[U](request: ProtectedResourceRequest, handler: ProtectedResourceHandler[U])(implicit ctx: ExecutionContext): Future[Either[OAuthError, AuthInfo[U]]] = try {
     fetchers.find { fetcher =>
       fetcher.matches(request)
     }.map { fetcher =>

scala-oauth2-core/src/main/scala/scalaoauth2/provider/TokenEndpoint.scala

@@ -1,12 +1,11 @@
 package scalaoauth2.provider
 
-import scala.concurrent.ExecutionContext.Implicits.global
-import scala.concurrent.Future
+import scala.concurrent.{ ExecutionContext, Future }
 
 trait TokenEndpoint {
   val handlers = Map.empty[String, GrantHandler]
 
-  def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[Either[OAuthError, GrantHandlerResult[U]]] = try {
+  def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U])(implicit ctx: ExecutionContext): Future[Either[OAuthError, GrantHandlerResult[U]]] = try {
     val grantType = request.grantType
     val grantHandler = handlers.getOrElse(grantType, throw new UnsupportedGrantType(s"${grantType} is not supported"))
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/AuthorizationCodeSpec.scala

@@ -5,6 +5,7 @@ import org.scalatest._
 import org.scalatest.concurrent.ScalaFutures
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext.Implicits.global
 
 class AuthorizationCodeSpec extends FlatSpec with ScalaFutures with OptionValues {
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/ClientCredentialsSpec.scala

@@ -5,6 +5,7 @@ import org.scalatest._
 import org.scalatest.concurrent.ScalaFutures
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext.Implicits.global
 
 class ClientCredentialsSpec extends FlatSpec with ScalaFutures with OptionValues {
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/ImplicitSpec.scala

@@ -7,6 +7,7 @@ import org.scalatest.Matchers._
 import org.scalatest.concurrent.ScalaFutures
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext.Implicits.global
 
 class ImplicitSpec extends FlatSpec with ScalaFutures with OptionValues {
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/PasswordSpec.scala

@@ -5,6 +5,7 @@ import org.scalatest.Matchers._
 import org.scalatest.concurrent.ScalaFutures
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext.Implicits.global
 
 class PasswordSpec extends FlatSpec with ScalaFutures with OptionValues {
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/RefreshTokenSpec.scala

@@ -5,6 +5,7 @@ import org.scalatest.Matchers._
 import org.scalatest.concurrent.ScalaFutures
 
 import scala.concurrent.Future
+import scala.concurrent.ExecutionContext.Implicits.global
 
 class RefreshTokenSpec extends FlatSpec with ScalaFutures with OptionValues {