Skip to content

Commit

Permalink
Upgrade to Panda v7 - support key rotation
Browse files Browse the repository at this point in the history
This upgrades Panda from v4 to v7, allowing us to use key rotation as introduced with guardian/pan-domain-authentication#150.
  • Loading branch information
davidfurey committed Jan 21, 2025
1 parent f667038 commit b48125e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
13 changes: 5 additions & 8 deletions app/controllers/BaseFaciaController.scala
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package controllers

import java.util.Locale

import com.gu.pandomainauth.action.{AuthActions, UserRequest}
import com.gu.pandomainauth.model.AuthenticatedUser
import com.gu.pandomainauth.{PanDomain, PanDomainAuthSettingsRefresher}
import com.gu.pandomainauth.{PanDomain, PanDomainAuthSettingsRefresher, S3BucketLoader}
import com.gu.permissions.{PermissionsConfig, PermissionsProvider}
import conf.ApplicationConfiguration
import logging.Logging
Expand All @@ -30,12 +29,10 @@ abstract class BaseFaciaControllerComponents(context: Context)
def config: ApplicationConfiguration

lazy val panDomainSettings: PanDomainAuthSettingsRefresher =
new PanDomainAuthSettingsRefresher(
config.pandomain.domain,
config.pandomain.service,
config.pandomain.bucketName,
config.pandomain.settingsFileKey,
config.aws.s3Client
PanDomainAuthSettingsRefresher(
domain = config.pandomain.domain,
system = config.pandomain.service,
S3BucketLoader.forAwsSdkV1(config.aws.s3Client, "pan-domain-auth-settings")
)

lazy val permissions = PermissionsProvider(
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ libraryDependencies ++= Seq(
"com.gu" %% "editorial-permissions-client" % "3.0.0",
"com.gu" %% "fapi-client-play30" % "13.0.0",
"com.gu" %% "mobile-notifications-api-models" % "3.0.0",
"com.gu" %% "pan-domain-auth-play_3-0" % "4.0.0",
"com.gu" %% "pan-domain-auth-play_3-0" % "7.0.0",
"org.scanamo" %% "scanamo" % "1.1.1" exclude ("org.scala-lang.modules", "scala-java8-compat_2.13"),
"com.github.blemale" %% "scaffeine" % "4.1.0" % "compile",
"com.gu" %% "thrift-serializer" % "4.0.2",
Expand Down

0 comments on commit b48125e

Please sign in to comment.