Skip to content

[WIP] Make applicationPort optional #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
k4200 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Make applicationPort optional #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions module-code/app/securesocial/core/services/RoutesService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
*/
package securesocial.core.services

import com.typesafe.config.ConfigException.WrongType
import play.api.mvc.{ Call, RequestHeader }
import play.api.{ Configuration, Environment }
import play.api.{ Configuration, Environment, PlayException }
import securesocial.core.SslEnabled

/**
Expand Down Expand Up @@ -116,8 +117,18 @@ object RoutesService {
private lazy val applicationHost = configuration.get[Option[String]](ApplicationHostKey).getOrElse {
throw new RuntimeException(s"Missing property: $ApplicationHostKey")
}
private lazy val applicationPort =
configuration.get[Option[Int]](ApplicationPortKey).map(port => s":$port").getOrElse("")
private lazy val applicationPort = {
val defaultPort = if (sslEnabled.value) 443 else 80
try {
configuration.getOptional[Int](ApplicationPortKey)
.filterNot(_ == defaultPort).map(port => s":$port").getOrElse("")
} catch {
// This exception is thrown when the value of "securesocial.applicationPort" is empty.
case e: PlayException if (e.cause.isInstanceOf[WrongType]) =>
logger.warn(e.getMessage)
""
}
}
private lazy val hostAndPort = s"$applicationHost$applicationPort"

protected def absoluteUrl(call: Call)(implicit req: RequestHeader): String = {
Expand Down