Merge pull request #56 from gakuzzzz/feature/action_builder

Added ActionBuilder

Author: tsuyoshizawa

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/AuthInfoRequest.scala

@@ -0,0 +1,5 @@
+package scalaoauth2.provider
+
+import play.api.mvc.{Request, WrappedRequest}
+
+case class AuthInfoRequest[A, U](authInfo: AuthInfo[U], private val request: Request[A]) extends WrappedRequest[A](request)

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/AuthorizedActionFunction.scala

@@ -0,0 +1,15 @@
+package scalaoauth2.provider
+
+import play.api.mvc._
+
+import scala.concurrent.{Future, ExecutionContext}
+
+case class AuthorizedActionFunction[U](handler: ProtectedResourceHandler[U])(implicit ctx: ExecutionContext) extends ActionFunction[Request, ({type L[A] = AuthInfoRequest[A, U]})#L] with OAuth2Provider {
+
+  override def invokeBlock[A](request: Request[A], block: AuthInfoRequest[A, U] => Future[Result]): Future[Result] = {
+    authorize(handler) { authInfo =>
+      block(AuthInfoRequest(authInfo, request))
+    }(request, ctx)
+  }
+
+}

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/OAuth2ProviderActionBuilders.scala

@@ -0,0 +1,19 @@
+package scalaoauth2.provider
+
+import play.api.mvc._
+
+import scala.concurrent.{Future, ExecutionContext}
+
+trait OAuth2ProviderActionBuilders {
+
+  implicit val executionContext: ExecutionContext
+
+  def AuthorizedAction[U](handler: ProtectedResourceHandler[U]): ActionBuilder[({type L[A] = AuthInfoRequest[A, U]})#L] = {
+    AuthorizedActionFunction(handler) compose Action
+  }
+
+}
+
+object OAuth2ProviderActionBuilders extends OAuth2ProviderActionBuilders {
+  val executionContext: ExecutionContext = play.api.libs.concurrent.Execution.defaultContext
+}

play2-oauth2-provider/src/test/scala/scalaoauth2/provider/OAuth2ProviderActionBuildersSpec.scala

@@ -0,0 +1,25 @@
+package scalaoauth2.provider
+
+import org.scalatest._
+import org.scalatest.Matchers._
+import scala.concurrent.Future
+import play.api.test.Helpers._
+import play.api.test.FakeRequest
+import play.api.mvc.Results._
+
+class OAuth2ProviderActionBuildersSpec extends FlatSpec {
+
+  import OAuth2ProviderActionBuilders._
+  import scala.concurrent.ExecutionContext.Implicits.global
+
+  val action = AuthorizedAction(new MockDataHandler) { request =>
+    Ok(request.authInfo.user.name)
+  }
+
+  it should "return BadRequest" in {
+    val result = action(FakeRequest())
+    status(result) should be (400)
+    contentAsString(result) should be ("")
+  }
+
+}

project/Build.scala

@@ -56,10 +56,11 @@ object ScalaOAuth2Build extends Build {
       description := "Support scala-oauth2-core library on Playframework Scala",
       resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/maven-releases/",
       libraryDependencies ++= Seq(
-        "com.typesafe.play" %% "play" % _playVersion % "provided"
+        "com.typesafe.play" %% "play"      % _playVersion % "provided",
+        "com.typesafe.play" %% "play-test" % _playVersion % "test"
       ) ++ commonDependenciesInTestScope
     )
-  ) dependsOn(scalaOAuth2Core)
+  ) dependsOn(scalaOAuth2Core % "compile->compile;test->test")
 
   def _publishTo(v: String) = {
     val nexus = "https://oss.sonatype.org/"