Merge pull request #63 from tsuyoshizawa/support-json-body

support JSON body #62

Author: tsuyoshizawa

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

@@ -33,18 +33,34 @@ trait OAuth2BaseProvider extends Results {
     ProtectedResourceRequest(request.headers.toMap, param)
   }
 
-  final def getParam[A](request: Request[A]): Map[String, Seq[String]] = {
-    val form = request.body match {
+  private[provider] def getParam[A](request: Request[A]): Map[String, Seq[String]] = {
+    (request.body match {
       case body: play.api.mvc.AnyContent if body.asFormUrlEncoded.isDefined => body.asFormUrlEncoded.get
       case body: play.api.mvc.AnyContent if body.asMultipartFormData.isDefined => body.asMultipartFormData.get.asFormUrlEncoded
+      case body: play.api.mvc.AnyContent if body.asJson.isDefined => FormUtils.fromJson(js = body.asJson.get).mapValues(Seq(_))
       case body: Map[_, _] => body.asInstanceOf[Map[String, Seq[String]]]
       case body: play.api.mvc.MultipartFormData[_] => body.asFormUrlEncoded
+      case body: play.api.libs.json.JsValue => FormUtils.fromJson(js = body).mapValues(Seq(_))
       case _ => Map.empty[String, Seq[String]]
-    }
+    }) ++ request.queryString
+  }
+
+  private[provider] object FormUtils {
 
-    form ++ request.queryString.map {
-      case (k, v) => k -> (v ++ form.getOrElse(k, Nil))
+    import play.api.libs.json._
+
+    def fromJson(prefix: String = "", js: JsValue): Map[String, String] = js match {
+      case JsObject(fields) =>
+        fields.map { case (key, value) => fromJson(Option(prefix).filterNot(_.isEmpty).map(_ + ".").getOrElse("") + key, value) }.foldLeft(Map.empty[String, String])(_ ++ _)
+      case JsArray(values) =>
+        values.zipWithIndex.map { case (value, i) => fromJson(prefix + "[" + i + "]", value) }.foldLeft(Map.empty[String, String])(_ ++ _)
+      case JsNull => Map.empty
+      case JsUndefined() => Map.empty
+      case JsBoolean(value) => Map(prefix -> value.toString)
+      case JsNumber(value) => Map(prefix -> value.toString)
+      case JsString(value) => Map(prefix -> value.toString)
     }
+
   }
 
   protected[scalaoauth2] def responseAccessToken(r: GrantHandlerResult) = {

play2-oauth2-provider/src/test/scala/scalaoauth2/provider/OAuth2ProviderSpec.scala

@@ -1,9 +1,10 @@
 package scalaoauth2.provider
 
-import org.scalatest._
 import org.scalatest.Matchers._
-import scala.concurrent.Future
+import org.scalatest._
 import play.api.libs.json._
+import play.api.mvc.{AnyContentAsFormUrlEncoded, AnyContentAsJson}
+import play.api.test.{FakeHeaders, FakeRequest}
 
 class OAuth2ProviderSpec extends FlatSpec {
 
@@ -32,4 +33,38 @@ class OAuth2ProviderSpec extends FlatSpec {
     name should be ("WWW-Authenticate")
     value should be ("""Bearer error="invalid_request", error_description="request is invalid"""")
   }
+
+  it should "get parameters from form url encoded body" in {
+    val values = Map(
+      "id" -> List("1000"),
+      "language" -> List("Scala")
+    )
+    val request = FakeRequest(method = "GET", uri = "/", headers = FakeHeaders(), body = AnyContentAsFormUrlEncoded(values))
+    val params = TestOAuthProvider.getParam(request)
+    params.get("id") should contain (List("1000"))
+    params.get("language") should contain (List("Scala"))
+  }
+
+  it should "get parameters from query string" in {
+    val values = Map(
+      "id" -> List("1000"),
+      "language" -> List("Scala")
+    )
+    val request = FakeRequest(method = "GET", uri = "/?version=2.11", headers = FakeHeaders(), body = AnyContentAsFormUrlEncoded(values))
+    val params = TestOAuthProvider.getParam(request)
+    params.get("id") should contain (List("1000"))
+    params.get("language") should contain (List("Scala"))
+    params.get("version") should contain (List("2.11"))
+  }
+
+  it should "get parameters from JSON body" in {
+    val json = Json.obj(
+      "id" -> 1000,
+      "language" -> "Scala"
+    )
+    val request = FakeRequest(method = "GET", uri = "/", headers = FakeHeaders(), body = AnyContentAsJson(json))
+    val params = TestOAuthProvider.getParam(request)
+    params.get("id") should contain (List("1000"))
+    params.get("language") should contain (List("Scala"))
+  }
 }

project/Build.scala

@@ -4,7 +4,7 @@ import Keys._
 object ScalaOAuth2Build extends Build {
 
   lazy val _organization = "com.nulab-inc"
-  lazy val _version =  "0.13.2"
+  lazy val _version =  "0.13.3-SNAPSHOT"
   lazy val _playVersion = "2.3.7"
 
   val _scalaVersion = "2.10.5"
@@ -14,7 +14,7 @@ object ScalaOAuth2Build extends Build {
     "org.scalatest" %% "scalatest" % "2.2.4" % "test"
   )
 
-  lazy val scalaOAuth2ProviderSettings = Defaults.defaultSettings ++ Seq(
+  lazy val scalaOAuth2ProviderSettings = Defaults.coreDefaultSettings ++ Seq(
     organization := _organization,
     version := _version,
     scalaVersion := _scalaVersion,