Skip to content

Commit

Permalink
Add redirect_url to config, fix build
Browse files Browse the repository at this point in the history
Also remove erroneous user-agent header in HTTP response
  • Loading branch information
tomverran committed May 6, 2017
1 parent d9c6301 commit dadb5e8
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ akka {
reddit {
client-id = ${?REDDIT_CLIENT_ID}
client-secret = ${?REDDIT_CLIENT_SECRET}
redirect-url = ${REDDIT_REDIRECT_URL}
}

aws {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion src/main/scala/io/tvc/spoilerfree/reddit/ApiClient.scala
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ class ApiClient(implicit val as: ActorSystem, mat: ActorMaterializer) {
HttpResponse(
status = StatusCodes.TemporaryRedirect,
headers = List(
userAgent,
Location(
authorize.withQuery(
Query(
Expand Down
15 changes: 7 additions & 8 deletions src/main/scala/io/tvc/spoilerfree/settings/package.scala
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
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._

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
}

0 comments on commit dadb5e8

Please sign in to comment.