Skip to content

Commit 4bfbdf3

Browse files
tsuyoshizawadbalduini
authored andcommitted
Merge with PR 18
1 parent 10d72b1 commit 4bfbdf3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
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
@@ -191,7 +191,7 @@ trait OAuth2AsyncProvider extends OAuth2BaseProvider {
191191
* @return Request is successful then return JSON to client in OAuth 2.0 format.
192192
* Request is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
193193
*/
194-
def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: Request[A]): Future[Result] = {
194+
def issueAccessToken[A, U](dataHandler: DataHandler[U])(implicit request: Request[A]): Future[SimpleResult] = {
195195
TokenEndpoint.handleRequest(request, dataHandler).map { requestResult =>
196196
requestResult match {
197197
case Left(e) if e.statusCode == 400 => BadRequest(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e))
@@ -211,7 +211,7 @@ trait OAuth2AsyncProvider extends OAuth2BaseProvider {
211211
* @return Authentication is successful then the response use your API result.
212212
* Authentication is failed then return BadRequest or Unauthorized status to client with cause into the JSON.
213213
*/
214-
def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => Future[Result])(implicit request: Request[A]): Future[Result] = {
214+
def authorize[A, U](dataHandler: DataHandler[U])(callback: AuthInfo[U] => Future[SimpleResult])(implicit request: Request[A]): Future[SimpleResult] = {
215215
ProtectedResource.handleRequest(request, dataHandler).flatMap { requestResult =>
216216
requestResult match {
217217
case Left(e) if e.statusCode == 400 => Future.successful(BadRequest.withHeaders(responseOAuthErrorHeader(e)))

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Keys._
44
object ScalaOAuth2Build extends Build {
55

66
lazy val _organization = "com.nulab-inc"
7-
lazy val _version = "0.7.3"
7+
lazy val _version = "0.7.4"
88
lazy val _playVersion = "2.2.4"
99

1010
val _scalaVersion = "2.10.4"

0 commit comments

Comments
 (0)