Fix token handling.

Author: jdijt

app/actors/Cleaner.scala

@@ -12,6 +12,7 @@ import scala.concurrent.ExecutionContext
 @Singleton
 class CleanerScheduler @Inject()(val system: ActorSystem, @Named("cleaner-actor") val cleanerActor: ActorRef)(implicit ec: ExecutionContext) {
   QuartzSchedulerExtension(system).schedule("Clean", cleanerActor, Clean)
+  cleanerActor ! Clean
 }
 
 class Cleaner @Inject()(unifiService: UnifiService,

app/services/PeopleService.scala

@@ -1,13 +1,14 @@
 package services
 
+import cats.data.EitherT
+import cats.syntax._
 import com.google.inject.Inject
 import models.Person
 import play.api.http.Status
 import play.api.libs.json.Json
 import play.api.libs.ws.{WSAuthScheme, WSClient}
 import play.api.{Configuration, Logging}
 
-import java.time.Instant
 import scala.concurrent.{ExecutionContext, Future}
 
 class PeopleService @Inject()(configuration: Configuration,
@@ -28,35 +29,42 @@ class PeopleService @Inject()(configuration: Configuration,
   private val clientSecret: String = configuration.get[String]("lunagraph.client.secret")
   private val clientIssuer: String = configuration.get[String]("lunagraph.client.issuer")
 
-  def getPersons: Future[Either[String, Seq[Person]]] = for {
-    token <- getToken()
-    wsRes <- ws.url(s"${baseUrl}/graphql")
-      .withHttpHeaders("Authorization"-> s"Bearer ${token}")
+  def getPersons: Future[Either[String, Seq[Person]]] = {
+      for {
+        token <- EitherT(getToken())
+        people <- EitherT(getPersonsWithToken(token))
+      } yield people
+  }.value
+
+  private def getPersonsWithToken(token: String): Future[Either[String, Seq[Person]]] = {
+    ws.url(s"${baseUrl}/graphql")
+      .withHttpHeaders("Authorization" -> s"Bearer $token")
       .post(Json.toJsObject(Map("query" -> query)))
-    res = wsRes.status match {
-        case Status.OK =>
-          val jsonResult = Json.parse(wsRes.body)
-          Right((jsonResult \ "data" \ "people").get.as[Seq[Person]])
-        case _ => logger.error(wsRes.body)
-          Left(wsRes.body)
-      }
-  } yield res
-
-
-  private def getToken(): Future[Either[String, String]] = {
-    for {
-      clientResponse <- ws.url(s"${clientIssuer}/protocol/openid-connect/token")
-        .withAuth(clientId, clientSecret, WSAuthScheme.BASIC)
-        .post(Map("grant_type" -> Seq("client_credentials")))
-      parsedResponse = clientResponse.status match {
-        case Status.OK =>
-          val jsonResponse = Json.parse(clientResponse.body)
-          val token = (jsonResponse \ "access_token").get.as[String]
-          Right(token)
-        case _ =>
-          logger.error(clientResponse.body)
-          Left(clientResponse.body)
+      .map { wsRes =>
+        wsRes.status match {
+          case Status.OK =>
+            val jsonResult = Json.parse(wsRes.body)
+            Right((jsonResult \ "data" \ "people").get.as[Seq[Person]])
+          case _ => logger.error(s"${wsRes.status} - ${wsRes.body}")
+            Left(wsRes.body)
+        }
       }
-    } yield parsedResponse
   }
+
+
+  private def getToken(): Future[Either[String, String]] =
+    ws.url(s"${clientIssuer}/protocol/openid-connect/token")
+      .withAuth(clientId, clientSecret, WSAuthScheme.BASIC)
+      .post(Map("grant_type" -> Seq("client_credentials")))
+      .map { clientResponse =>
+        clientResponse.status match {
+          case Status.OK =>
+            val jsonResponse = Json.parse(clientResponse.body)
+            val token = (jsonResponse \ "access_token").get.as[String]
+            Right(token)
+          case _ =>
+            logger.error(s"${clientResponse.status} - ${clientResponse.body}")
+            Left(clientResponse.body)
+        }
+      }
 }

conf/application.conf

@@ -34,7 +34,7 @@ lunagraph {
   baseUrl = "https://lunagraph.acceptance.lunatech.cloud"
   client {
     issuer = "https://keycloak.lunatech.com/realms/lunatech"
-    id = ${LUNAGRAPH_CLIENT_ID}
+    id = ${?LUNAGRAPH_CLIENT_ID}
     secret = ${?LUNAGRAPH_CLIENT_SECRET}
   }
 }