Merge pull request #29 from dbalduini/auth-covariant

Make AuthInfo[+U] covariant

Author: tsuyoshizawa

scala-oauth2-core/src/main/scala/scalaoauth2/provider/DataHandler.scala

@@ -24,7 +24,7 @@ case class AccessToken(token: String, refreshToken: Option[String], scope: Optio
  * @param scope Inform the client of the scope of the access token issued.
  * @param redirectUri This value is used by Authorization Code Grant.
  */
-case class AuthInfo[U](user: U, clientId: String, scope: Option[String], redirectUri: Option[String])
+case class AuthInfo[+U](user: U, clientId: String, scope: Option[String], redirectUri: Option[String])
 
 /**
  * Provide accessing to data storage for using OAuth 2.0.

scala-oauth2-core/src/test/scala/scalaoauth2/provider/AuthorizationCodeSpec.scala

@@ -15,11 +15,11 @@ class AuthorizationCodeSpec extends FlatSpec with ScalaFutures {
     val request = AuthorizationRequest(Map(), Map("code" -> Seq("code1"), "redirect_uri" -> Seq("http://example.com/")))
     val f = authorizationCode.handleRequest(request, new MockDataHandler() {
 
-      override def findAuthInfoByCode(code: String): Future[Option[AuthInfo[MockUser]]] = Future.successful(Some(
+      override def findAuthInfoByCode(code: String): Future[Option[AuthInfo[User]]] = Future.successful(Some(
         AuthInfo(user = MockUser(10000, "username"), clientId = "clientId1", scope = Some("all"), redirectUri = Some("http://example.com/"))
       ))
 
-      override def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = Future.successful(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new java.util.Date()))
+      override def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = Future.successful(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new java.util.Date()))
     })
 
     whenReady(f) { result =>
@@ -40,7 +40,7 @@ class AuthorizationCodeSpec extends FlatSpec with ScalaFutures {
         AuthInfo(user = MockUser(10000, "username"), clientId = "clientId1", scope = Some("all"), redirectUri = None)
       ))
 
-      override def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = Future.successful(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new java.util.Date()))
+      override def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = Future.successful(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new java.util.Date()))
     })
 
     whenReady(f) { result =>

scala-oauth2-core/src/test/scala/scalaoauth2/provider/ClientCredentialsSpec.scala

@@ -15,9 +15,9 @@ class ClientCredentialsSpec extends FlatSpec with ScalaFutures {
     val request = AuthorizationRequest(Map(), Map("scope" -> Seq("all")))
     val f = clientCredentials.handleRequest(request, new MockDataHandler() {
 
-      override def findClientUser(clientId: String, clientSecret: String, scope: Option[String]): Future[Option[MockUser]] = Future.successful(Some(MockUser(10000, "username")))
+      override def findClientUser(clientId: String, clientSecret: String, scope: Option[String]): Future[Option[User]] = Future.successful(Some(MockUser(10000, "username")))
 
-      override def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = Future.successful(AccessToken("token1", None, Some("all"), Some(3600), new java.util.Date()))
+      override def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = Future.successful(AccessToken("token1", None, Some("all"), Some(3600), new java.util.Date()))
     })
 
     whenReady(f) { result =>

scala-oauth2-core/src/test/scala/scalaoauth2/provider/MockDataHandler.scala

@@ -4,28 +4,33 @@ import java.util.Date
 
 import scala.concurrent.Future
 
-case class MockUser(id: Long, name: String)
+case class MockUser(id: Long, name: String) extends User
 
-class MockDataHandler extends DataHandler[MockUser] {
+class MockDataHandler extends DataHandler[User] {
 
   def validateClient(clientId: String, clientSecret: String, grantType: String): Future[Boolean] = Future.successful(false)
 
-  def findUser(username: String, password: String): Future[Option[MockUser]] = Future.successful(None)
+  def findUser(username: String, password: String): Future[Option[User]] = Future.successful(None)
 
-  def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = Future.successful(AccessToken("", Some(""), Some(""), Some(0L), new Date()))
+  def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = Future.successful(AccessToken("", Some(""), Some(""), Some(0L), new Date()))
 
-  def findAuthInfoByCode(code: String): Future[Option[AuthInfo[MockUser]]] = Future.successful(None)
+  def findAuthInfoByCode(code: String): Future[Option[AuthInfo[User]]] = Future.successful(None)
 
-  def findAuthInfoByRefreshToken(refreshToken: String): Future[Option[AuthInfo[MockUser]]] = Future.successful(None)
+  def findAuthInfoByRefreshToken(refreshToken: String): Future[Option[AuthInfo[User]]] = Future.successful(None)
 
-  def findClientUser(clientId: String, clientSecret: String, scope: Option[String]): Future[Option[MockUser]] = Future.successful(None)
+  def findClientUser(clientId: String, clientSecret: String, scope: Option[String]): Future[Option[User]] = Future.successful(None)
 
   def findAccessToken(token: String): Future[Option[AccessToken]] = Future.successful(None)
 
-  def findAuthInfoByAccessToken(accessToken: AccessToken): Future[Option[AuthInfo[MockUser]]] = Future.successful(None)
-  
-  def getStoredAccessToken(authInfo: AuthInfo[MockUser]): Future[Option[AccessToken]] = Future.successful(None)
+  def findAuthInfoByAccessToken(accessToken: AccessToken): Future[Option[AuthInfo[User]]] = Future.successful(None)
 
-  def refreshAccessToken(authInfo: AuthInfo[MockUser], refreshToken: String): Future[AccessToken] = Future.successful(AccessToken("", Some(""), Some(""), Some(0L), new Date()))
+  def getStoredAccessToken(authInfo: AuthInfo[User]): Future[Option[AccessToken]] = Future.successful(None)
+
+  def refreshAccessToken(authInfo: AuthInfo[User], refreshToken: String): Future[AccessToken] = Future.successful(AccessToken("", Some(""), Some(""), Some(0L), new Date()))
 
 }
+
+trait User {
+  def id: Long
+  def name: String
+}

scala-oauth2-core/src/test/scala/scalaoauth2/provider/PasswordSpec.scala

@@ -4,8 +4,6 @@ import org.scalatest._
 import org.scalatest.Matchers._
 import org.scalatest.concurrent.ScalaFutures
 
-import scala.concurrent.Await
-import scala.concurrent.duration._
 import scala.concurrent.Future
 
 class PasswordSpec extends FlatSpec with ScalaFutures {
@@ -15,9 +13,9 @@ class PasswordSpec extends FlatSpec with ScalaFutures {
     val request = AuthorizationRequest(Map(), Map("username" -> Seq("user"), "password" -> Seq("pass"), "scope" -> Seq("all")))
     val f = password.handleRequest(request, new MockDataHandler() {
 
-      override def findUser(username: String, password: String): Future[Option[MockUser]] = Future.successful(Some(MockUser(10000, "username")))
+      override def findUser(username: String, password: String): Future[Option[User]] = Future.successful(Some(MockUser(10000, "username")))
 
-      override def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = Future.successful(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new java.util.Date()))
+      override def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = Future.successful(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new java.util.Date()))
 
     })
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/ProtectedResourceSpec.scala

@@ -15,7 +15,7 @@ class ProtectedResourceSpec extends FlatSpec with ScalaFutures {
 
     override def findAccessToken(token: String): Future[Option[AccessToken]] = Future.successful(Some(AccessToken("token1", Some("refreshToken1"), Some("all"), Some(3600), new Date())))
 
-    override def findAuthInfoByAccessToken(accessToken: AccessToken): Future[Option[AuthInfo[MockUser]]] = Future.successful(Some(
+    override def findAuthInfoByAccessToken(accessToken: AccessToken): Future[Option[AuthInfo[User]]] = Future.successful(Some(
       AuthInfo(user = MockUser(10000, "username"), clientId = "clientId1", scope = Some("all"), redirectUri = None)
     ))
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/RefreshTokenSpec.scala

@@ -15,10 +15,10 @@ class RefreshTokenSpec extends FlatSpec with ScalaFutures {
     val request = AuthorizationRequest(Map(), Map("refresh_token" -> Seq("refreshToken1")))
     val f = refreshToken.handleRequest(request, new MockDataHandler() {
 
-      override def findAuthInfoByRefreshToken(refreshToken: String): Future[Option[AuthInfo[MockUser]]] =
+      override def findAuthInfoByRefreshToken(refreshToken: String): Future[Option[AuthInfo[User]]] =
         Future.successful(Some(AuthInfo(user = MockUser(10000, "username"), clientId = "clientId1", scope = None, redirectUri = None)))
 
-      override def refreshAccessToken(authInfo: AuthInfo[MockUser], refreshToken: String): Future[AccessToken] = Future.successful(AccessToken("token1", Some(refreshToken), None, Some(3600), new java.util.Date()))
+      override def refreshAccessToken(authInfo: AuthInfo[User], refreshToken: String): Future[AccessToken] = Future.successful(AccessToken("token1", Some(refreshToken), None, Some(3600), new java.util.Date()))
 
     })
 

scala-oauth2-core/src/test/scala/scalaoauth2/provider/TokenEndPointSpec.scala

@@ -15,9 +15,9 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
 
     override def validateClient(clientId: String, clientSecret: String, grantType: String): Future[Boolean] = Future.successful(true)
 
-    override def findUser(username: String, password: String): Future[Option[MockUser]] = Future.successful(Some(MockUser(10000, "username")))
+    override def findUser(username: String, password: String): Future[Option[User]] = Future.successful(Some(MockUser(10000, "username")))
 
-    override def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = Future.successful(AccessToken("token1", None, Some("all"), Some(3600), new Date()))
+    override def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = Future.successful(AccessToken("token1", None, Some("all"), Some(3600), new Date()))
 
   }
 
@@ -127,9 +127,9 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
 
       override def validateClient(clientId: String, clientSecret: String, grantType: String): Future[Boolean] = Future.successful(true)
 
-      override def findUser(username: String, password: String): Future[Option[MockUser]] = Future.successful(Some(MockUser(10000, "username")))
+      override def findUser(username: String, password: String): Future[Option[User]] = Future.successful(Some(MockUser(10000, "username")))
 
-      override def createAccessToken(authInfo: AuthInfo[MockUser]): Future[AccessToken] = throw new Exception("Failure")
+      override def createAccessToken(authInfo: AuthInfo[User]): Future[AccessToken] = throw new Exception("Failure")
 
     }