Update deprecated references from Result to SimpleResult

pjay · Oct 7, 2013 · d634bc1 · d634bc1
1 parent 490cfff
commit d634bc1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/Api.scala b/app/controllers/Api.scala
@@ -9,7 +9,7 @@ import models._
 
 object Api extends Controller {
 
- def BaseApiAction[A](bp: BodyParser[A], securityCheck: (App, String) => Boolean)(f: (Request[A], App) => Result): Action[A] = {
+ def BaseApiAction[A](bp: BodyParser[A], securityCheck: (App, String) => Boolean)(f: (Request[A], App) => SimpleResult): Action[A] = {
  Action(bp) { request =>
  request.headers.get(AUTHORIZATION) match {
  case Some(header) => {
@@ -33,10 +33,10 @@ object Api extends Controller {
  }
  }
 
- def SecuredApiAction[A](bp: BodyParser[A])(f: (Request[A], App) => Result): Action[A] =
+ def SecuredApiAction[A](bp: BodyParser[A])(f: (Request[A], App) => SimpleResult): Action[A] =
  BaseApiAction(bp, (app, secret) => app.masterSecret == secret)(f)
 
- def UnsecuredApiAction[A](bp: BodyParser[A])(f: (Request[A], App) => Result): Action[A] =
+ def UnsecuredApiAction[A](bp: BodyParser[A])(f: (Request[A], App) => SimpleResult): Action[A] =
  BaseApiAction(bp, (app, secret) => app.secret == secret)(f)
 
  def createDeviceToken(value: String) = UnsecuredApiAction(parse.anyContent) { (request, app) =>

diff --git a/app/controllers/Users.scala b/app/controllers/Users.scala
@@ -82,10 +82,10 @@ trait Secured {
  def onUnauthorized(request: RequestHeader) =
  Results.Redirect(routes.Users.login).withSession("uriBeforeLogin" -> request.uri).flashing("error" -> "Login required")
 
- def withAuth(f: => String => Request[AnyContent] => Result) =
+ def withAuth(f: => String => Request[AnyContent] => SimpleResult) =
  withAuth[AnyContent](BodyParsers.parse.anyContent)(f)
 
- def withAuth[A](bp: BodyParser[A])(f: => String => Request[A] => Result) = {
+ def withAuth[A](bp: BodyParser[A])(f: => String => Request[A] => SimpleResult) = {
  Security.Authenticated(username, onUnauthorized) { user =>
  Action[A](bp)(request => f(user)(request))
  }