Merge branch 'master' into update-readme-version

Author: rtfpessoa

build.sbt

@@ -2,7 +2,7 @@ import Dependencies._
 
 name := """bitbucket-scala-client"""
 
-version := "1.8.0-SNAPSHOT"
+version := "1.9.0-SNAPSHOT"
 
 scalaVersion := "2.10.5"
 

src/main/scala/com/codacy/client/bitbucket/Email.scala

@@ -0,0 +1,14 @@
+package com.codacy.client.bitbucket
+
+import play.api.libs.functional.syntax._
+import play.api.libs.json._
+
+case class Email(email: String, primary: Boolean, active: Boolean)
+
+object Email {
+  implicit def emailReader: Reads[Email] =
+    ((__ \ "email").read[String] and
+      (__ \ "primary").read[Boolean] and
+      (__ \ "active").read[Boolean]
+      ) (Email.apply _)
+}

src/main/scala/com/codacy/client/bitbucket/PullRequest.scala

@@ -5,11 +5,10 @@ import play.api.libs.functional.syntax._
 import play.api.libs.json._
 
 case class PullRequest(id: Long, title: String, description: String,
-                       authorUsername: Option[String], authorAvatar: Option[String],
-                       state: String, created_on: DateTime, updated_on: DateTime,
+                       authorUsername: Option[String], authorAvatar: Option[String], state: String, created_on: DateTime, updated_on: DateTime,
                        sourceRepository: String, sourceBranch: String, sourceCommit: String,
                        destRepository: String, destBranch: String, destCommit: Option[String],
-                       apiUrls: Seq[ApiUrl]) {
+                       apiUrls: Seq[ApiUrl], authorUUID: Option[String] = None) {
   val url = s"https://bitbucket.org/$destRepository/pull-request/$id"
 }
 
@@ -59,7 +58,8 @@ object PullRequest {
       (__ \ "destination" \ "branch" \ "name").read[String] and
       (__ \ "destination" \ "commit" \ "hash").readNullable[String] and
       // TODO: (__ \ "destination" \ "commit" \ "hash").read[Option[String]] and
-      (__ \ "links").read[Map[String, Map[String, String]]].map(parseLinks)
+      (__ \ "links").read[Map[String, Map[String, String]]].map(parseLinks) and
+      (__ \ "author" \ "uuid").readNullable[String]
     ) (PullRequest.apply _)
 
   private def parseLinks(links: Map[String, Map[String, String]]): Seq[ApiUrl] = {

src/main/scala/com/codacy/client/bitbucket/PullRequestReviewers.scala

@@ -0,0 +1,12 @@
+package com.codacy.client.bitbucket
+
+import play.api.libs.json._
+
+case class PullRequestReviewers(reviewers: Seq[String])
+
+object PullRequestReviewers {
+
+  implicit val reader: Reads[PullRequestReviewers] =
+    (__ \ "reviewers" ).read(Reads.list((__ \ "uuid").read[String])).map(PullRequestReviewers.apply)
+
+}

src/main/scala/com/codacy/client/bitbucket/client/Authentication.scala

@@ -15,6 +15,8 @@ object Authentication {
 
   case class OAuthCredentials(key: String, secretKey: String, token: String, secretToken: String) extends Credentials
 
+  case class OAuth2Credentials(accessToken: String) extends Credentials
+
   /**
     * Your username and password | app password.
     */
@@ -29,6 +31,7 @@ object Authentication {
     def fromCredentials(credentials: Credentials): Authenticator =  {
       credentials match {
         case c: OAuthCredentials     => new OAuthAuthenticator(c)
+        case c: OAuth2Credentials    => new OAuth2Authenticator(c)
         case c: BasicAuthCredentials => new BasicAuthAuthenticator(c)
       }
     }
@@ -43,6 +46,10 @@ object Authentication {
     def authenticate(req: WSRequest): WSRequest = req.sign(requestSigner)
   }
 
+  class OAuth2Authenticator(credentials: OAuth2Credentials) extends Authenticator {
+    override def authenticate(req: WSRequest): WSRequest = req.withQueryString("access_token" -> credentials.accessToken)
+  }
+
   class BasicAuthAuthenticator(credentials: BasicAuthCredentials) extends Authenticator {
     def authenticate(req: WSRequest): WSRequest = req.withAuth(credentials.username, credentials.password, WSAuthScheme.BASIC)
   }

src/main/scala/com/codacy/client/bitbucket/service/PullRequestServices.scala

@@ -2,7 +2,7 @@ package com.codacy.client.bitbucket.service
 
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import com.codacy.client.bitbucket.util.CommitHelper
-import com.codacy.client.bitbucket.{PullRequest, PullRequestComment, SimpleCommit, SimplePullRequestComment}
+import com.codacy.client.bitbucket.{PullRequest, PullRequestComment, SimpleCommit, SimplePullRequestComment, PullRequestReviewers}
 import play.api.libs.json._
 
 class PullRequestServices(client: BitbucketClient) {
@@ -100,4 +100,10 @@ class PullRequestServices(client: BitbucketClient) {
     client.execute(Request(url, classOf[Seq[SimplePullRequestComment]]))
   }
 
+  def getPullRequestsReviewers(owner: String, repository: String, prId: Long): RequestResponse[PullRequestReviewers] = {
+    val url = s"https://bitbucket.org/api/2.0/repositories/$owner/$repository/pullrequests/$prId"
+
+    client.execute(Request(url, classOf[PullRequestReviewers]))
+  }
+
 }

src/main/scala/com/codacy/client/bitbucket/service/RepositoryServices.scala

@@ -25,12 +25,12 @@ class RepositoryServices(client: BitbucketClient) {
   /*
    * Creates a ssh key
    */
-  def createKey(username: String, repo: String, key: String): RequestResponse[SshKey] = {
+  def createKey(username: String, repo: String, key: String, label: String = "Codacy Key"): RequestResponse[SshKey] = {
     val url = s"https://bitbucket.org/api/1.0/repositories/$username/$repo/deploy-keys"
 
     val values = Json.obj(
       "key" -> key,
-      "label" -> "Codacy Key"
+      "label" -> label
     )
 
     client.postJson(Request(url, classOf[SshKey]), values)

src/main/scala/com/codacy/client/bitbucket/service/UserServices.scala

@@ -1,7 +1,7 @@
 package com.codacy.client.bitbucket.service
 
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
-import com.codacy.client.bitbucket.{SshKey, User}
+import com.codacy.client.bitbucket.{Email, SshKey, User}
 import play.api.libs.json.Json
 
 class UserServices(client: BitbucketClient) {
@@ -20,15 +20,22 @@ class UserServices(client: BitbucketClient) {
     client.execute(Request(s"https://bitbucket.org/api/1.0/users/$username", classOf[User]))
   }
 
+  /*
+   * Gets all the emails of an account
+   */
+  def getEmails(username: String): RequestResponse[Seq[Email]] = {
+    client.execute(Request(s"https://bitbucket.org/api/1.0/users/$username/emails", classOf[Seq[Email]]))
+  }
+
   /*
    * Creates a ssh key
    */
-  def createKey(username: String, key: String): RequestResponse[SshKey] = {
+  def createKey(username: String, key: String, keyName: String = "Codacy Key"): RequestResponse[SshKey] = {
     val url = s"https://bitbucket.org/api/1.0/users/$username/ssh-keys"
 
     val values = Json.obj(
       "key" -> key,
-      "label" -> "Codacy Key"
+      "label" -> keyName
     )
 
     client.postJson(Request(url, classOf[SshKey]), values)

src/test/scala/RemoteRepositorySpecs.scala

@@ -1,7 +1,7 @@
 import org.scalatest._
 import org.scalatest.Matchers
 import play.api.libs.json.Json
-import com.codacy.client.bitbucket.{PullRequest, SimpleRepository}
+import com.codacy.client.bitbucket.{Email, PullRequest, SimpleRepository}
 import com.codacy.client.bitbucket.PullRequest._
 
 class RemoteRepositorySpecs extends FlatSpec with Matchers {
@@ -506,4 +506,28 @@ class RemoteRepositorySpecs extends FlatSpec with Matchers {
       repo => repo.length shouldBe 1
     )
   }
+
+  it should "successfully parse a JSON into an array of Email" in {
+    val input =
+      """[
+        |{
+        |  "active": true,
+        |  "email": "[email protected]",
+        |  "primary": true
+        |},
+        |{
+        |  "active": false,
+        |  "email": "[email protected]",
+        |  "primary": false
+        |}
+        |]
+      """.stripMargin
+    val json = Json.parse(input)
+    val value = json.validate[Seq[Email]]
+
+    value.fold(e =>
+      fail(s"$e"),
+      emails => emails.length shouldBe 2
+    )
+  }
 }