From c6d32c5d4296e7447f0e5bb2da921e04fb23a90b Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Fri, 28 Jul 2017 02:09:51 -0700
Subject: Users hierarchy simplification

---
 src/main/scala/xyz/driver/core/auth.scala | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'src/main')

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


From 4c40344fef816ad42c5e8da8ebd73c54f268c02b Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Mon, 7 Aug 2017 14:41:43 -0700
Subject: Rollback Slick to 3.1.1

---
 src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala | 6 +++---
 src/main/scala/xyz/driver/core/database/database.scala             | 6 +++---
 src/main/scala/xyz/driver/core/database/package.scala              | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/main')

diff --git a/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala b/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala
index a3f57c1..1331efc 100644
--- a/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala
+++ b/src/main/scala/xyz/driver/core/database/PatchedHsqldbProfile.scala
@@ -1,11 +1,11 @@
 package xyz.driver.core.database
 
-import slick.jdbc.HsqldbProfile
+import slick.driver.HsqldbDriver
 import slick.jdbc.JdbcType
 import slick.ast.FieldSymbol
-import slick.relational.RelationalProfile
+import slick.profile.RelationalProfile
 
-trait PatchedHsqldbProfile extends HsqldbProfile {
+trait PatchedHsqldbProfile extends HsqldbDriver {
   override def defaultSqlTypeName(tmd: JdbcType[_], sym: Option[FieldSymbol]): String = tmd.sqlType match {
     case java.sql.Types.VARCHAR =>
       val size = sym.flatMap(_.findColumnOption[RelationalProfile.ColumnOption.Length])
diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index 7855a16..8426309 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -1,7 +1,7 @@
 package xyz.driver.core
 
-import slick.basic.DatabaseConfig
-import slick.jdbc.JdbcProfile
+import slick.backend.DatabaseConfig
+import slick.driver.JdbcProfile
 import xyz.driver.core.date.Date
 import xyz.driver.core.time.Time
 
@@ -21,7 +21,7 @@ package database {
       val dbConfig: DatabaseConfig[JdbcProfile] = DatabaseConfig.forConfig(databaseName, config)
 
       new Database {
-        val profile: JdbcProfile                   = dbConfig.profile
+        val profile: JdbcProfile                   = dbConfig.driver
         val database: JdbcProfile#Backend#Database = dbConfig.db
       }
     }
diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index 9385c8f..b39169d 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -5,7 +5,7 @@ import java.util.Calendar
 
 import date.{Date, Month}
 import slick.dbio._
-import slick.jdbc.JdbcProfile
+import slick.driver.JdbcProfile
 
 package object database {
 
-- 
cgit v1.2.3