Wip

Author: Rafa Paradela

src/main/scala/com/fortysevendeg/github4s/GithubAPIs.scala

@@ -48,4 +48,12 @@ class GHAuth(implicit O : AuthOps[GitHub4s]){
       redirect_uri: String,
       scopes: List[String]): GHIO[GHResponse[Authorize]] =
     O.authorizeUrl(client_id, redirect_uri, scopes)
+
+  def getAccessToken(
+      client_id: String,
+      client_secret: String,
+      code: String,
+      redirect_uri: String,
+      state: String): GHIO[GHResponse[OAuthToken]] =
+    O.getAccessToken(client_id, client_secret, code, redirect_uri, state)
 }

src/main/scala/com/fortysevendeg/github4s/HttpClient.scala

@@ -129,6 +129,15 @@ class HttpClient {
         .withData(data)
         .run, D)
 
+  def postOAuth[A](
+      url: String,
+      data: String)
+      (implicit D: Decoder[A]): GHResponse[A] =
+    GithubResponses.toEntity(HttpRequestBuilder(url)
+        .withHeaders(Map("Accept" -> "application/json"))
+        .withData(data)
+        .run, D)
+
   def delete(method: String)(implicit C: GithubConfig): GHResponse[Unit] =
     GithubResponses.toEmpty(HttpRequestBuilder(buildURL(method))
         .deleteMethod

src/main/scala/com/fortysevendeg/github4s/api/Auth.scala

@@ -16,6 +16,7 @@ object Auth {
   protected val httpClient = new HttpClient()
 
   val authorizeUrl = "https://github.com/login/oauth/authorize?client_id=%s&redirect_uri=%s&scope=%s&state=%s"
+  val accessTokenUrl = "https://github.com/login/oauth/access_token"
 
   /**
     * Call to request a new authorization given a basic authentication, the returned object Authorization includes an
@@ -62,13 +63,24 @@ object Auth {
   }
 
 
+  /**
+    * Requests an access token based on the code retrieved in the first step of the oAuth process
+    * @param client_id
+    * @param client_secret
+    * @param code
+    * @param redirect_uri
+    * @param state
+    * @return
+    */
   def getAccessToken(
       client_id: String,
       client_secret: String,
       code: String,
       redirect_uri: String,
-      state: String): GHResponse[OAuthToken] = ???
-  )
+      state: String): GHResponse[OAuthToken] = httpClient.postOAuth[OAuthToken](
+    url = accessTokenUrl,
+    data = NewOAuthRequest(client_id, client_secret, code, redirect_uri, state).asJson.noSpaces)
+
 
 
 }

src/main/scala/com/fortysevendeg/github4s/free/algebra/AuthOps.scala

@@ -2,7 +2,7 @@ package com.fortysevendeg.github4s.free.algebra
 
 import cats.free.{Free, Inject}
 import com.fortysevendeg.github4s.GithubResponses._
-import com.fortysevendeg.github4s.free.domain.{Authorize, Authorization}
+import com.fortysevendeg.github4s.free.domain.{OAuthToken, Authorize, Authorization}
 
 /** Auths ops ADT
   */
@@ -21,6 +21,13 @@ final case class AuthorizeUrl(
     redirect_uri: String,
     scopes: List[String]) extends AuthOp[GHResponse[Authorize]]
 
+final case class GetAccessToken(
+    client_id: String,
+    client_secret: String,
+    code: String,
+    redirect_uri: String,
+    state: String) extends AuthOp[GHResponse[OAuthToken]]
+
 
 /** Exposes Auths operations as a Free monadic algebra that may be combined with other Algebras via
   * Coproduct
@@ -42,6 +49,14 @@ class AuthOps[F[_]](implicit I: Inject[AuthOp, F]) {
       scopes: List[String]): Free[F, GHResponse[Authorize]] =
     Free.inject[AuthOp, F](AuthorizeUrl(client_id, redirect_uri, scopes))
 
+  def getAccessToken(
+      client_id: String,
+      client_secret: String,
+      code: String,
+      redirect_uri: String,
+      state: String): Free[F, GHResponse[OAuthToken]] =
+    Free.inject[AuthOp, F](GetAccessToken(client_id, client_secret, code, redirect_uri, state))
+
 }
 
 /** Default implicit based DI factory from which instances of the AuthOps may be obtained

src/main/scala/com/fortysevendeg/github4s/free/domain/Authorization.scala

@@ -18,4 +18,11 @@ case class Authorize(
 case class OAuthToken(
   access_token: String,
   token_type: String,
-  scope: String)
+  scope: String)
+
+case class NewOAuthRequest(
+  client_id: String,
+  client_secret: String,
+  code: String,
+  redirect_uri: String,
+  state: String)

src/main/scala/com/fortysevendeg/github4s/free/interpreters/Interpreters.scala

@@ -51,6 +51,7 @@ trait Interpreters[M[_]] {
     def apply[A](fa: AuthOp[A]): M[A] = fa match {
       case NewAuth(username, password, scopes, note, client_id, client_secret) ⇒ A.pureEval(Eval.later(Auth.newAuth(username, password, scopes, note, client_id, client_secret)))
       case AuthorizeUrl(client_id, redirect_uri, scopes) => A.pureEval(Eval.later(Auth.authorizeUrl(client_id, redirect_uri, scopes)))
+      case GetAccessToken(client_id, client_secret, code, redirect_uri, state) => A.pureEval(Eval.later(Auth.getAccessToken(client_id, client_secret, code, redirect_uri, state)))
     }
   }