Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions article/app/controllers/ArticleController.scala
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ class ArticleController(
def renderArticle(path: String): Action[AnyContent] = Action.async(mapAndRender(path, ArticleBlocks)()(_))
def renderJson(path: String): Action[AnyContent] = renderArticle(path)
def renderEmail(path: String): Action[AnyContent] = renderArticle(path)
def renderHosted(campaignName: String, pageName: String): Action[AnyContent] = renderArticle(
s"advertiser-content/$campaignName/$pageName",
)

def renderHeadline(path: String): Action[AnyContent] =
Action.async { implicit request =>
Expand Down
13 changes: 8 additions & 5 deletions article/conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ GET /$path<[^/]+/([^/]+/)?live/.*>/email.emailjson controllers.LiveBlogContr
GET /$path<[^/]+/([^/]+/)?live/.*>/email.emailtxt controllers.LiveBlogController.renderEmail(path)
GET /$path<[^/]+/([^/]+/)?live/.*> controllers.LiveBlogController.renderArticle(path, page: Option[String], filterKeyEvents: Option[Boolean])

# Commercial Hosted Content (under migration)
GET /advertiser-content/:campaignName/:pageName.json controllers.ArticleController.renderHosted(campaignName, pageName)

# articles, finished liveblogs

GET /*path.json controllers.ArticleController.renderJson(path)
GET /*path/email controllers.ArticleController.renderEmail(path)
GET /*path/email/headline.txt controllers.ArticleController.renderHeadline(path)
GET /*path/email.emailjson controllers.ArticleController.renderEmail(path)
GET /*path/email.emailtxt controllers.ArticleController.renderEmail(path)
GET /*path.json controllers.ArticleController.renderJson(path)
GET /*path/email controllers.ArticleController.renderEmail(path)
GET /*path/email/headline.txt controllers.ArticleController.renderHeadline(path)
GET /*path/email.emailjson controllers.ArticleController.renderEmail(path)
GET /*path/email.emailtxt controllers.ArticleController.renderEmail(path)

# Newspaper pages paths
# gallery format (?)
Expand Down
3 changes: 2 additions & 1 deletion common/app/dev/DevParametersHttpRequestHandler.scala
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ class DevParametersHttpRequestHandler(
"/commercial/anx/anxresize.js",
) // this is used by commercial for advert resizing, served through api.nextgen
) {
val illegalParams = request.queryString.keySet.filterNot(allowedParams.contains(_))
val illegalParams =
request.queryString.keySet.filterNot(param => allowedParams.contains(param) || param.startsWith("ab-"))
if (illegalParams.nonEmpty) {
// it is pretty hard to spot what is happening in tests without this println
println(s"\n\nILLEGAL PARAMETER(S) FOUND : ${illegalParams.mkString(",")}\n\n")
Expand Down
2 changes: 2 additions & 0 deletions dev-build/conf/routes
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ GET /admin/football/api/squad/:teamId
GET /commercial/api/capi-single.json commercial.controllers.ContentApiOffersController.nativeJson
GET /commercial/api/capi-multiple.json commercial.controllers.ContentApiOffersController.nativeJsonMulti
GET /$path<commercial-containers> controllers.FaciaController.renderFront(path)
# Hosted content migration - JSON request is handled by article controller in dev
GET /advertiser-content/:campaignName/:pageName.json controllers.ArticleController.renderHosted(campaignName, pageName)
GET /advertiser-content/:campaignName/:pageName commercial.controllers.HostedContentController.renderHostedPage(campaignName, pageName)
GET /advertiser-content/:campaignName/:pageName/:cType/onward.json commercial.controllers.HostedContentController.renderOnwardComponent(campaignName, pageName, cType)
GET /advertiser-content/:campaignName/:pageName/autoplay.json commercial.controllers.HostedContentController.renderAutoplayComponent(campaignName, pageName)
Expand Down
Loading