Skip to content

Commit f5ea4c7

Browse files
committed
support only play2.2 on 0.7.x branch
1 parent 001a914 commit f5ea4c7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ trait OAuth2Provider extends OAuth2BaseProvider {
110110
* @return Request is successful then return JSON to client in OAuth 2.0 format.
111111
* Request is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
112112
*/
113-
def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: play.api.mvc.Request[A]): Result = {
113+
def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: play.api.mvc.Request[A]): SimpleResult = {
114114
TokenEndpoint.handleRequest(request, dataHandler) match {
115115
case Left(e) if e.statusCode == 400 => BadRequest(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e))
116116
case Left(e) if e.statusCode == 401 => Unauthorized(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e))
@@ -128,7 +128,7 @@ trait OAuth2Provider extends OAuth2BaseProvider {
128128
* @return Authentication is successful then the response use your API result.
129129
* Authentication is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
130130
*/
131-
def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => Result)(implicit request: play.api.mvc.Request[A]): Result = {
131+
def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => SimpleResult)(implicit request: play.api.mvc.Request[A]): SimpleResult = {
132132
ProtectedResource.handleRequest(request, dataHandler) match {
133133
case Left(e) if e.statusCode == 400 => BadRequest.withHeaders(responseOAuthErrorHeader(e))
134134
case Left(e) if e.statusCode == 401 => Unauthorized.withHeaders(responseOAuthErrorHeader(e))

project/Build.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import Keys._
44
object ScalaOAuth2Build extends Build {
55

66
lazy val _organization = "com.nulab-inc"
7-
lazy val _version = "0.8.0"
8-
lazy val _playVersion = "2.3.2"
7+
lazy val _version = "0.7.3"
8+
lazy val _playVersion = "2.2.4"
99

1010
val _scalaVersion = "2.10.4"
11-
val _crossScalaVersions = Seq("2.10.4", "2.11.1")
11+
val _crossScalaVersions = Seq("2.10.4")
1212

1313
val commonDependenciesInTestScope = Seq(
1414
"org.scalatest" %% "scalatest" % "2.2.0" % "test"

0 commit comments

Comments
 (0)