diff options
author | zachdriver <zach@driver.xyz> | 2018-01-29 10:11:59 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-29 10:11:59 -0800 |
commit | f5c5c18fd6e8038bc0f3831e47de94a55b46589a (patch) | |
tree | bf1d6c88545d403f30b44718ba30ffe5fcd2ee57 | |
parent | 526307e0a534008ad6b7e4578d886c50d09ee2d2 (diff) | |
parent | becf2c5087a3a9c3b4b9385239cc35b7d05a24c4 (diff) | |
download | driver-core-f5c5c18fd6e8038bc0f3831e47de94a55b46589a.tar.gz driver-core-f5c5c18fd6e8038bc0f3831e47de94a55b46589a.tar.bz2 driver-core-f5c5c18fd6e8038bc0f3831e47de94a55b46589a.zip |
Merge pull request #106 from drivergroup/zsmith/remove-auth-idv1.7.0
Remove auth ID from AuthUserInfo and add expiration time to token
-rw-r--r-- | src/main/scala/xyz/driver/core/auth.scala | 17 | ||||
-rw-r--r-- | src/test/scala/xyz/driver/core/AuthTest.scala | 5 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/main/scala/xyz/driver/core/auth.scala b/src/main/scala/xyz/driver/core/auth.scala index ec58ad5..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, PhoneNumber} +import xyz.driver.core.domain.Email +import xyz.driver.core.time.Time import scalaz.Equal @@ -25,23 +26,13 @@ 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, - 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 1a483b9..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 @@ -56,11 +57,11 @@ class AuthTest extends FlatSpec with Matchers with ScalatestRouteTest { Some( AuthTokenUserInfo( Id[User]("1"), - authUserId = Id[AuthUser]("2"), Email("foo", "bar"), emailVerified = true, audience = "driver", - roles = Set(TestRole) + roles = Set(TestRole), + expirationTime = Time(1000000L) ))) } else { Future.successful(Option.empty[User]) |