From 2c4bf73f0aa22801c6a6d79088abefbfc9deeaad Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Mon, 22 Jan 2018 11:26:55 -0800
Subject: Remove authId from AuthTokenUserInfo and remove AuthUser case class

---
 src/main/scala/xyz/driver/core/auth.scala     | 13 +------------
 src/test/scala/xyz/driver/core/AuthTest.scala |  1 -
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/main/scala/xyz/driver/core/auth.scala b/src/main/scala/xyz/driver/core/auth.scala
index ec58ad5..be3d682 100644
--- a/src/main/scala/xyz/driver/core/auth.scala
+++ b/src/main/scala/xyz/driver/core/auth.scala
@@ -1,6 +1,6 @@
 package xyz.driver.core
 
-import xyz.driver.core.domain.{Email, PhoneNumber}
+import xyz.driver.core.domain.Email
 
 import scalaz.Equal
 
@@ -25,19 +25,8 @@ object auth {
 
   final case class AuthToken(value: String)
 
-  final case class AuthUser(
-      id: Id[AuthUser],
-      userId: Id[User],
-      email: Email,
-      emailVerified: Boolean,
-      phoneNumber: Option[PhoneNumber],
-      phoneVerified: Boolean,
-      isBlocked: Boolean,
-      roles: Set[Role])
-
   final case class AuthTokenUserInfo(
       id: Id[User],
-      authUserId: Id[AuthUser],
       email: Email,
       emailVerified: Boolean,
       audience: String,
diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala
index 1a483b9..b8cb5d0 100644
--- a/src/test/scala/xyz/driver/core/AuthTest.scala
+++ b/src/test/scala/xyz/driver/core/AuthTest.scala
@@ -56,7 +56,6 @@ class AuthTest extends FlatSpec with Matchers with ScalatestRouteTest {
             Some(
               AuthTokenUserInfo(
                 Id[User]("1"),
-                authUserId = Id[AuthUser]("2"),
                 Email("foo", "bar"),
                 emailVerified = true,
                 audience = "driver",
-- 
cgit v1.2.3


From becf2c5087a3a9c3b4b9385239cc35b7d05a24c4 Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Mon, 22 Jan 2018 12:04:53 -0800
Subject: Add expirationTime to AuthTokenUserInfo

---
 src/main/scala/xyz/driver/core/auth.scala     | 4 +++-
 src/test/scala/xyz/driver/core/AuthTest.scala | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/xyz/driver/core/auth.scala b/src/main/scala/xyz/driver/core/auth.scala
index be3d682..87b576c 100644
--- a/src/main/scala/xyz/driver/core/auth.scala
+++ b/src/main/scala/xyz/driver/core/auth.scala
@@ -1,6 +1,7 @@
 package xyz.driver.core
 
 import xyz.driver.core.domain.Email
+import xyz.driver.core.time.Time
 
 import scalaz.Equal
 
@@ -30,7 +31,8 @@ object auth {
       email: Email,
       emailVerified: Boolean,
       audience: String,
-      roles: Set[Role])
+      roles: Set[Role],
+      expirationTime: Time)
       extends User
 
   final case class RefreshToken(value: String)
diff --git a/src/test/scala/xyz/driver/core/AuthTest.scala b/src/test/scala/xyz/driver/core/AuthTest.scala
index b8cb5d0..6e5862a 100644
--- a/src/test/scala/xyz/driver/core/AuthTest.scala
+++ b/src/test/scala/xyz/driver/core/AuthTest.scala
@@ -12,6 +12,7 @@ import xyz.driver.core.domain.Email
 import xyz.driver.core.logging._
 import xyz.driver.core.rest._
 import xyz.driver.core.rest.auth._
+import xyz.driver.core.time.Time
 
 import scala.concurrent.Future
 import scalaz.OptionT
@@ -59,7 +60,8 @@ class AuthTest extends FlatSpec with Matchers with ScalatestRouteTest {
                 Email("foo", "bar"),
                 emailVerified = true,
                 audience = "driver",
-                roles = Set(TestRole)
+                roles = Set(TestRole),
+                expirationTime = Time(1000000L)
               )))
         } else {
           Future.successful(Option.empty[User])
-- 
cgit v1.2.3