Users hierarchy simplification

1 files changed, 19 insertions, 4 deletions

diff --git a/src/main/scala/xyz/driver/core/auth.scala b/src/main/scala/xyz/driver/core/auth.scala
index 5dea2db..7b589ba 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
+import xyz.driver.core.domain.{Email, PhoneNumber}
 
 import scalaz.Equal
 
@@ -16,12 +16,27 @@ object auth {
 
   trait User {
     def id: Id[User]
-    def roles: Set[Role]
   }
 
-  final case class BasicUser(id: Id[User], roles: Set[Role]) extends User
-
   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])
+      extends User
+
   final case class RefreshToken(value: String)
   final case class PermissionsToken(value: String)