Updatad to play2-auth2-provider-1.0.0

Author: Leandro Glossman

app/security/oauth/OAuthTokenEndpoint.scala

@@ -10,10 +10,10 @@ import scalaoauth2.provider._
 @Singleton
 class OAuthTokenEndpoint extends TokenEndpoint {
  override val handlers = Map(
- //OAuthGrantType.AUTHORIZATION_CODE -> new AuthorizationCode(),
+ OAuthGrantType.AUTHORIZATION_CODE -> new AuthorizationCode(),
  OAuthGrantType.REFRESH_TOKEN -> new RefreshToken(),
  //OAuthGrantType.CLIENT_CREDENTIALS -> new ClientCredentials(),
- //OAuthGrantType.IMPLICIT -> new Implicit()
+ //OAuthGrantType.IMPLICIT -> new Implicit(),
  OAuthGrantType.PASSWORD -> new Password()
  )
 }

app/security/oauth/deadbolt/OAuthDeadboltHandler.scala

@@ -4,18 +4,18 @@ import be.objectify.deadbolt.scala.models.Subject
 import be.objectify.deadbolt.scala.{AuthenticatedRequest, DeadboltHandler, DynamicResourceHandler}
 import com.google.inject.Inject
 import play.api.mvc.{Request, Result, Results}
-import security.oauth.OAuthDataHandler
+import security.oauth.{AccountInfo, OAuthDataHandler}
 
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
-import scalaoauth2.provider.OAuth2BaseProvider
+import scalaoauth2.provider.{AuthInfo, OAuth2ProtectedResourceProvider}
 
 /**
  * Deadbolt handler that delegates to the oauth2 data handler
  *
  * @param dataHandler
  */
-class OAuthDeadboltHandler @Inject()(dataHandler: OAuthDataHandler) extends DeadboltHandler with OAuth2BaseProvider {
+class OAuthDeadboltHandler @Inject()(dataHandler: OAuthDataHandler) extends DeadboltHandler with OAuth2ProtectedResourceProvider {
 
  val dynamicHandler: Option[DynamicResourceHandler] = Option.empty
 
@@ -28,7 +28,7 @@ class OAuthDeadboltHandler @Inject()(dataHandler: OAuthDataHandler) extends Dead
  case Some(subject) => Future.successful(request.subject)
  case _ => protectedResource.handleRequest(request, dataHandler).map {
  case Left(e) => None
- case Right(authInfo) => Some(new OAuthSubject(authInfo))
+ case Right(authInfo: AuthInfo[AccountInfo]) => Some(new OAuthSubject(authInfo))
  }
  }
 

build.sbt

@@ -15,7 +15,8 @@ libraryDependencies ++= Seq(
  "be.objectify" %% "deadbolt-scala" % "2.5.0",
  "com.typesafe.play.modules" %% "play-modules-redis" % "2.5.0",
  "org.mindrot" % "jbcrypt" % "0.3m",
- "com.nulab-inc" %% "play2-oauth2-provider" % "0.18.0"
+ "com.nulab-inc" %% "play2-oauth2-provider" % "1.0.0",
+ "com.typesafe.slick" %% "slick" % "3.1.1"
 )
 
 resolvers += Resolver.mavenLocal