diff options
author | Jakob Odersky <jakob@odersky.com> | 2017-11-20 21:38:21 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-20 21:38:21 -0800 |
commit | f2a56045d0b29291a18054607701d5863722121e (patch) | |
tree | 34b5fc63cc425a27969c73354fd7a2071ea67ba3 /src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala | |
parent | 8d30baada3a9c25ef61ef80511f4b4f25799f0cb (diff) | |
parent | b872ee2649c7b56df413fbde746ee68312c17abd (diff) | |
download | driver-core-f2a56045d0b29291a18054607701d5863722121e.tar.gz driver-core-f2a56045d0b29291a18054607701d5863722121e.tar.bz2 driver-core-f2a56045d0b29291a18054607701d5863722121e.zip |
Merge pull request #91 from drivergroup/new-creds-and-format
New creds and format
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala index 58ff1f1..5282956 100644 --- a/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala +++ b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala @@ -8,9 +8,10 @@ import xyz.driver.core.generators import scalaz.Scalaz.{mapEqual, stringInstance} import scalaz.syntax.equal._ -class ServiceRequestContext(val trackingId: String = generators.nextUuid().toString, - val originatingIp: Option[InetAddress] = None, - val contextHeaders: Map[String, String] = Map.empty[String, String]) { +class ServiceRequestContext( + val trackingId: String = generators.nextUuid().toString, + val originatingIp: Option[InetAddress] = None, + val contextHeaders: Map[String, String] = Map.empty[String, String]) { def authToken: Option[AuthToken] = contextHeaders.get(AuthProvider.AuthenticationTokenHeader).map(AuthToken.apply) @@ -44,11 +45,11 @@ class ServiceRequestContext(val trackingId: String = generators.nextUuid().toStr override def toString: String = s"ServiceRequestContext($trackingId, $contextHeaders)" } -class AuthorizedServiceRequestContext[U <: User](override val trackingId: String = generators.nextUuid().toString, - override val originatingIp: Option[InetAddress] = None, - override val contextHeaders: Map[String, String] = - Map.empty[String, String], - val authenticatedUser: U) +class AuthorizedServiceRequestContext[U <: User]( + override val trackingId: String = generators.nextUuid().toString, + override val originatingIp: Option[InetAddress] = None, + override val contextHeaders: Map[String, String] = Map.empty[String, String], + val authenticatedUser: U) extends ServiceRequestContext { def withPermissionsToken(permissionsToken: PermissionsToken): AuthorizedServiceRequestContext[U] = |