From c0f720e1d2529068abd9d80e4ee8f4d7517f527e Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Thu, 10 Aug 2017 11:53:13 -0700
Subject: Using updated auth model

---
 .../xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala | 8 +++++---
 src/main/scala/xyz/driver/pdsuicommon/domain/User.scala           | 2 +-
 .../scala/xyz/driver/pdsuidomain/services/rest/RestHelper.scala   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/main/scala/xyz')

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)
   }
 }
-- 
cgit v1.2.3