diff options
| author | vlad <vlad@driver.xyz> | 2017-08-10 11:53:13 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-08-10 11:53:13 -0700 |
| commit | c0f720e1d2529068abd9d80e4ee8f4d7517f527e (patch) | |
| tree | d38135038ed8ac32869e129a65a06f109b4b26fb /src | |
| parent | 5519c219e2404cb19b6116dee90b40b5e5e2a720 (diff) | |
| download | rest-query-c0f720e1d2529068abd9d80e4ee8f4d7517f527e.tar.gz rest-query-c0f720e1d2529068abd9d80e4ee8f4d7517f527e.tar.bz2 rest-query-c0f720e1d2529068abd9d80e4ee8f4d7517f527e.zip | |
Diffstat (limited to 'src')
3 files changed, 7 insertions, 5 deletions
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) } } |