Merge branch 'dbalduini-bugfix' into play-2.2.x

Author: tsuyoshizawa

README.md

@@ -20,17 +20,29 @@ and an access token type called [Bearer](http://tools.ietf.org/html/rfc6750).
 
 If you'd like to use this with Playframework, add "play2-oauth2-provider" to library dependencies of your project.
 
+### For Playframework 2.3
+
+```scala
+libraryDependencies ++= Seq(
+  "com.nulab-inc" %% "play2-oauth2-provider" % "0.8.0"
+)
+```
+
+### For Playframework 2.2
+
 ```scala
 libraryDependencies ++= Seq(
   "com.nulab-inc" %% "play2-oauth2-provider" % "0.7.2"
 )
 ```
 
-Otherwise, add "scala-oauth2-core" instead. In this case, you need to implement your own OAuth provider working with web framework you use.
+### Other frameworks
+
+Add "scala-oauth2-core" instead. In this case, you need to implement your own OAuth provider working with web framework you use.
 
 ```scala
 libraryDependencies ++= Seq(
-  "com.nulab-inc" %% "scala-oauth2-core" % "0.7.2"
+  "com.nulab-inc" %% "scala-oauth2-core" % "0.8.0"
 )
 ```
 
@@ -79,7 +91,7 @@ You should follow three steps below to work with Playframework.
 * Access to an authorized resource
 
 First, define your own controller with mixining ```OAuth2Provider``` trait provided by this library to issue access token.
-Asynchronous result is used in your controller then you can use ```OAuth2AsyncProvider```, which supports returning ```Future[SimpleResult]```.
+Asynchronous result is used in your controller then you can use ```OAuth2AsyncProvider```, which supports returning ```Future[Result]```.
 
 ```scala
 import scalaoauth2.provider._

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

@@ -181,7 +181,7 @@ trait OAuth2AsyncProvider extends OAuth2BaseProvider {
    * @return Request is successful then return JSON to client in OAuth 2.0 format.
    *         Request is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
    */
-  def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: play.api.mvc.Request[A]): Future[Result] = {
+  def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: play.api.mvc.Request[A]): Future[SimpleResult] = {
     TokenEndpoint.handleRequest(request, dataHandler) match {
       case Left(e) if e.statusCode == 400 => Future.successful(BadRequest(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e)))
       case Left(e) if e.statusCode == 401 => Future.successful(Unauthorized(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e)))
@@ -199,7 +199,7 @@ trait OAuth2AsyncProvider extends OAuth2BaseProvider {
    * @return Authentication is successful then the response use your API result.
    *         Authentication is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
    */
-  def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => Future[Result])(implicit request: play.api.mvc.Request[A]): Future[Result] = {
+  def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => Future[SimpleResult])(implicit request: play.api.mvc.Request[A]): Future[SimpleResult] = {
     ProtectedResource.handleRequest(request, dataHandler) match {
       case Left(e) if e.statusCode == 400 => Future.successful(BadRequest.withHeaders(responseOAuthErrorHeader(e)))
       case Left(e) if e.statusCode == 401 => Future.successful(Unauthorized.withHeaders(responseOAuthErrorHeader(e)))

project/Build.scala

@@ -4,14 +4,11 @@ import Keys._
 object ScalaOAuth2Build extends Build {
 
   lazy val _organization = "com.nulab-inc"
-  lazy val _version =  "0.7.2"
-  def _playVersion(version: String) = version match {
-    case "2.11.1" => "2.3.0"
-    case _ => "2.2.3"
-  }
+  lazy val _version =  "0.8.0"
+  lazy val _playVersion = "2.3.2"
 
-  val _scalaVersion = "2.10.3"
-  val _crossScalaVersions = Seq("2.10.3", "2.11.1")
+  val _scalaVersion = "2.10.4"
+  val _crossScalaVersions = Seq("2.10.4", "2.11.1")
 
   val commonDependenciesInTestScope = Seq(
     "org.scalatest" %% "scalatest" % "2.2.0" % "test"
@@ -59,7 +56,7 @@ 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(scalaVersion.value) % "provided"
+        "com.typesafe.play" %% "play" % _playVersion % "provided"
       ) ++ commonDependenciesInTestScope
     )
   ) dependsOn(scalaOAuth2Core)