From dadb5e883e0d272b7e7a56b180dc17f74f735c60 Mon Sep 17 00:00:00 2001 From: tomverran Date: Sat, 6 May 2017 16:23:01 +0100 Subject: [PATCH] Add redirect_url to config, fix build Also remove erroneous user-agent header in HTTP response --- .travis.yml | 7 ++++--- README.md | 1 + src/main/resources/application.conf | 1 + .../spoilerfree/racecalendar/RaceCalendar.scala | 2 +- .../io/tvc/spoilerfree/reddit/ApiClient.scala | 1 - .../io/tvc/spoilerfree/settings/package.scala | 15 +++++++-------- 6 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 25eb653..e8741be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,9 +24,10 @@ before_cache: script: | set -e sbt test - sbt debian:packageBin - mv target/spoiler-free*.deb target/spoiler-free.deb - + if [ -n "$TRAVIS_TAG" ]; then + sbt debian:packageBin + mv target/spoiler-free*.deb target/spoiler-free.deb + fi deploy: provider: releases api_key: diff --git a/README.md b/README.md index 09731b7..846af39 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ dpkg -i spoiler-free.deb # configure the app with the secret env vars echo "REDDIT_CLIENT_ID=???" >> /etc/default/spoiler-free echo "REDDIT_CLIENT_SECRET=???" >> /etc/default/spoiler-free +echo "REDDIT_REDIRECT_URL=???" >> /etc/default/spoiler-free echo "DYNAMO_TABLE=???" >> /etc/default/spoiler-free # restart the service so it picks up the config diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index 3ebec93..f506522 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -7,6 +7,7 @@ akka { reddit { client-id = ${?REDDIT_CLIENT_ID} client-secret = ${?REDDIT_CLIENT_SECRET} + redirect-url = ${REDDIT_REDIRECT_URL} } aws { diff --git a/src/main/scala/io/tvc/spoilerfree/racecalendar/RaceCalendar.scala b/src/main/scala/io/tvc/spoilerfree/racecalendar/RaceCalendar.scala index e528645..dbdc73d 100644 --- a/src/main/scala/io/tvc/spoilerfree/racecalendar/RaceCalendar.scala +++ b/src/main/scala/io/tvc/spoilerfree/racecalendar/RaceCalendar.scala @@ -17,7 +17,7 @@ object RaceCalendar { RaceDates(start = raceStart.minusDays(2).withHour(0), raceStart.withHour(23).withMinute(59).withSecond(59)) } - private val dates = settings.tvTimes.map(parseWeekend) + private val dates = settings.raceDates.map(parseWeekend) private[racecalendar] def status(implicit clock: Clock): CalendarStatus = { val now = ZonedDateTime.now(clock) diff --git a/src/main/scala/io/tvc/spoilerfree/reddit/ApiClient.scala b/src/main/scala/io/tvc/spoilerfree/reddit/ApiClient.scala index 0423d19..6358e50 100644 --- a/src/main/scala/io/tvc/spoilerfree/reddit/ApiClient.scala +++ b/src/main/scala/io/tvc/spoilerfree/reddit/ApiClient.scala @@ -54,7 +54,6 @@ class ApiClient(implicit val as: ActorSystem, mat: ActorMaterializer) { HttpResponse( status = StatusCodes.TemporaryRedirect, headers = List( - userAgent, Location( authorize.withQuery( Query( diff --git a/src/main/scala/io/tvc/spoilerfree/settings/package.scala b/src/main/scala/io/tvc/spoilerfree/settings/package.scala index 648c223..ea8c899 100644 --- a/src/main/scala/io/tvc/spoilerfree/settings/package.scala +++ b/src/main/scala/io/tvc/spoilerfree/settings/package.scala @@ -1,8 +1,6 @@ package io.tvc.spoilerfree -import java.time.ZonedDateTime -import java.time.format.DateTimeFormatter._ - +import akka.http.scaladsl.model.Uri import com.typesafe.config.ConfigFactory import scala.collection.JavaConverters._ @@ -10,10 +8,11 @@ import scala.collection.JavaConverters._ package object settings { private val config = ConfigFactory.load - lazy val clientId = reddit.ClientId(config.getString("reddit.client-id")) - lazy val clientSecret = reddit.ClientSecret(config.getString("reddit.client-secret")) - lazy val authConfig = reddit.AuthConfig(clientId, clientSecret, "http://localhost:8080/redirect") - lazy val dynamoTable = config.getString("aws.dynamo-table") + private lazy val clientId = reddit.ClientId(config.getString("reddit.client-id")) + private lazy val clientSecret = reddit.ClientSecret(config.getString("reddit.client-secret")) + private lazy val redirectUrl: Uri = config.getString("reddit.redirect-url") - lazy val tvTimes = config.getStringList("f1.races").asScala.toList + lazy val authConfig = reddit.AuthConfig(clientId, clientSecret, redirectUrl) + lazy val dynamoTable = config.getString("aws.dynamo-table") + lazy val raceDates = config.getStringList("f1.races").asScala.toList }