Update to latests play-git-hub

Now shared with gu-who & prout.

Author: rtyley

app/lib/Bot.scala

@@ -1,17 +1,20 @@
 package lib
 
-import java.nio.file.Paths
+import com.madgag.github.GitHubCredentials
 
-import com.madgag.github.OkGitHub
+import scalax.file.ImplicitConversions._
+import scalax.file.Path
 
 object Bot {
 
-  val okGitHub = new OkGitHub(Paths.get("/tmp/submitgit/working-dir/http-response-cache/"))
+  val workingDir = Path.fromString("/tmp") / "bot" / "working-dir"
 
   import play.api.Play.current
   val config = play.api.Play.configuration
 
   val accessToken = config.getString("github.botAccessToken").get
 
-  def conn() = okGitHub.conn(accessToken)
+  val ghCreds = GitHubCredentials.forAccessKey(accessToken, workingDir.toPath).get
+
+  def conn() = ghCreds.conn()
 }

app/lib/actions/Actions.scala

@@ -2,7 +2,8 @@ package lib.actions
 
 import com.madgag.github.Implicits._
 import com.madgag.github.{PullRequestId, RepoId}
-import com.madgag.playgithub.auth.GHRequest
+import com.madgag.playgithub.auth.AuthenticatedSessions.AccessToken
+import com.madgag.playgithub.auth.{Client, GHRequest}
 import controllers.Application._
 import controllers.Auth
 import lib._
@@ -15,26 +16,30 @@ import play.api.mvc._
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future
 import scala.util.{Failure, Success, Try}
+import scalax.file.ImplicitConversions._
 
 
 object Actions {
   private val authScopes = Seq("user:email")
 
-  val GitHubAuthenticatedAction = com.madgag.playgithub.auth.Actions.githubAction(authScopes)(Auth.authClient)
+  implicit val authClient: Client = Auth.authClient
+
+  implicit val provider = AccessToken.FromSession
+
+  val GitHubAuthenticatedAction = com.madgag.playgithub.auth.Actions.gitHubAction(authScopes, Bot.workingDir.toPath)
 
   def githubRepoAction(repoId: RepoId) = GitHubAuthenticatedAction andThen new ActionRefiner[GHRequest, GHRepoRequest] {
     override protected def refine[A](request: GHRequest[A]): Future[Either[Result, GHRepoRequest[A]]] = Future {
       Either.cond(Project.byRepoId.contains(repoId), {
-        val gitHub = request.gitHub
         val repo = Bot.conn().getRepository(repoId.fullName)
-        new GHRepoRequest(gitHub, repo, request)}, Forbidden("Not a supported repo"))
+        new GHRepoRequest(request.gitHubCredentials, repo, request)}, Forbidden("Not a supported repo"))
     }
   }
 
   def githubPRAction(prId: PullRequestId) = githubRepoAction(prId.repo) andThen new ActionRefiner[GHRepoRequest, GHPRRequest] {
     override protected def refine[A](request: GHRepoRequest[A]): Future[Either[Result, GHPRRequest[A]]] = Future {
       Try(request.repo.getPullRequest(prId.num)) match {
-        case Success(pr) => Right(new GHPRRequest[A](request.gitHub, pr, request))
+        case Success(pr) => Right(new GHPRRequest[A](request.gitHubCredentials, pr, request))
         case Failure(e) => Left(NotFound(s"${request.repo.getFullName} doesn't seem to have PR #${prId.num}"))
       }
     }

app/lib/actions/requests.scala

@@ -1,6 +1,7 @@
 package lib.actions
 
 import com.madgag.git._
+import com.madgag.github.GitHubCredentials
 import com.madgag.github.Implicits._
 import com.madgag.okhttpscala._
 import com.madgag.playgithub.auth.GHRequest
@@ -20,9 +21,9 @@ object Requests {
     lazy val userEmail = req.user.primaryEmail
   }
 
-  class GHRepoRequest[A](gitHub: GitHub, val repo: GHRepository, request: Request[A]) extends GHRequest[A](gitHub, request)
+  class GHRepoRequest[A](gitHubCredentials: GitHubCredentials, val repo: GHRepository, request: Request[A]) extends GHRequest[A](gitHubCredentials, request)
 
-  class GHPRRequest[A](gitHub: GitHub, val pr: GHPullRequest, request: Request[A]) extends GHRepoRequest[A](gitHub, pr.getRepository, request) {
+  class GHPRRequest[A](gitHubCredentials: GitHubCredentials, val pr: GHPullRequest, request: Request[A]) extends GHRepoRequest[A](gitHubCredentials, pr.getRepository, request) {
     lazy val userOwnsPR = user == pr.getUser
 
     lazy val patchCommitsF: Future[Seq[PatchCommit]] = {

build.sbt

@@ -33,7 +33,7 @@ resolvers ++= Seq(
 libraryDependencies ++= Seq(
   cache,
   filters,
-  "com.madgag" %% "play-git-hub" % "1.1",
+  "com.madgag" %% "play-git-hub" % "2.3",
   "com.typesafe.akka" %% "akka-agent" % "2.3.2",
   "org.webjars" % "bootstrap" % "3.3.5",
   "com.adrianhurt" %% "play-bootstrap3" % "0.4.4-P24",