diff options
4 files changed, 9 insertions, 7 deletions
@@ -17,8 +17,8 @@ lazy val core = (project in file(".")) "io.github.cloudify" %% "spdf" % "1.4.0", "org.davidbild" %% "tristate-core" % "0.2.0", "org.davidbild" %% "tristate-play" % "0.2.0" exclude ("com.typesafe.play", "play-json"), - "xyz.driver" %% "core" % "0.14.0", - "xyz.driver" %% "domain-model" % "0.11.5", + "xyz.driver" %% "core" % "0.16.3", + "xyz.driver" %% "domain-model" % "0.12.5", "ch.qos.logback" % "logback-classic" % "1.1.7", "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.8.4", "com.github.spullara.mustache.java" % "scala-extensions-2.11" % "0.9.4", diff --git a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala index 42f7435..5c07a9a 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala @@ -1,10 +1,12 @@ package xyz.driver.pdsuicommon.auth -import xyz.driver.entities.users.UserInfo +import xyz.driver.entities.users.AuthUserInfo import xyz.driver.pdsuicommon.logging._ import xyz.driver.pdsuicommon.domain.User -class AuthenticatedRequestContext(val driverUser: UserInfo, override val requestId: RequestId, val authToken: String) +class AuthenticatedRequestContext(val driverUser: AuthUserInfo, + override val requestId: RequestId, + val authToken: String) extends AnonymousRequestContext(requestId) { val executor: User = new User(driverUser) @@ -25,7 +27,7 @@ class AuthenticatedRequestContext(val driverUser: UserInfo, override val request object AuthenticatedRequestContext { - def apply(driverUser: UserInfo, authToken: String = "") = + def apply(driverUser: AuthUserInfo, authToken: String = "") = new AuthenticatedRequestContext(driverUser, RequestId(), authToken) implicit def toPhiString(x: AuthenticatedRequestContext): PhiString = { diff --git a/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala b/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala index 654af1a..f75f391 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/domain/User.scala @@ -15,7 +15,7 @@ final case class User(id: StringId[User], latestActivity: Option[LocalDateTime], deleted: Option[LocalDateTime]) { - def this(driverUser: xyz.driver.entities.users.UserInfo) { + def this(driverUser: xyz.driver.entities.users.AuthUserInfo) { this( id = StringId[xyz.driver.pdsuicommon.domain.User](driverUser.id.value), email = Email(driverUser.email.toString), diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala index 3638ac9..0ff29ef 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala @@ -123,6 +123,6 @@ trait RestHelper { case _ => Map() } - new ServiceRequestContext(contextHeaders = auth) + new ServiceRequestContext(contextHeaders = auth, trackingId = requestContext.requestId.value) } } |