Merge branch 'master' of https://github.com/drivergroup/driver-core into service-dependencies

3 files changed, 33 insertions, 5 deletions

diff --git a/src/main/scala/xyz/driver/core/database/database.scala b/src/main/scala/xyz/driver/core/database/database.scala
index b7a4165..8426309 100644
--- a/src/main/scala/xyz/driver/core/database/database.scala
+++ b/src/main/scala/xyz/driver/core/database/database.scala
@@ -121,6 +121,23 @@ package database {
     def naturalKeyMapper[T] = MappedColumnType.base[Id[T], String](_.value, Id[T](_))
   }
 
+  trait CreateAndDropSchema {
+    val slickDal: xyz.driver.core.database.SlickDal
+    val tables: GeneratedTables
+
+    import tables.profile.api._
+    import scala.concurrent.Await
+    import scala.concurrent.duration.Duration
+
+    def createSchema(): Unit = {
+      Await.result(slickDal.execute(tables.createNamespaceSchema >> tables.schema.create), Duration.Inf)
+    }
+
+    def dropSchema(): Unit = {
+      Await.result(slickDal.execute(tables.schema.drop >> tables.dropNamespaceSchema), Duration.Inf)
+    }
+  }
+
   trait DatabaseObject extends ColumnTypes {
     def createTables(): Future[Unit]
     def disconnect(): Unit
diff --git a/src/main/scala/xyz/driver/core/database/package.scala b/src/main/scala/xyz/driver/core/database/package.scala
index 791a688..b39169d 100644
--- a/src/main/scala/xyz/driver/core/database/package.scala
+++ b/src/main/scala/xyz/driver/core/database/package.scala
@@ -4,13 +4,23 @@ import java.sql.{Date => SqlDate}
 import java.util.Calendar
 
 import date.{Date, Month}
-import slick.dbio.{DBIOAction, NoStream}
+import slick.dbio._
+import slick.driver.JdbcProfile
 
 package object database {
 
   type Schema = {
-    def create: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
-    def drop: DBIOAction[Unit, NoStream, slick.dbio.Effect.Schema]
+    def create: DBIOAction[Unit, NoStream, Effect.Schema]
+    def drop: DBIOAction[Unit, NoStream, Effect.Schema]
+  }
+
+  type GeneratedTables = {
+    // structure of Slick data model traits generated by sbt-slick-codegen
+    val profile: JdbcProfile
+    def schema: profile.SchemaDescription
+
+    def createNamespaceSchema: StreamingDBIO[Vector[Unit], Unit]
+    def dropNamespaceSchema: StreamingDBIO[Vector[Unit], Unit]
   }
 
   private[database] def sqlDateToDate(sqlDate: SqlDate): Date = {
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala
index cbd671e..be4fcd8 100644
--- a/src/main/scala/xyz/driver/core/rest.scala
+++ b/src/main/scala/xyz/driver/core/rest.scala
@@ -218,8 +218,9 @@ package rest {
   object CachedTokenAuthorization {
     def apply[U <: User](publicKeyFile: Path, issuer: String): CachedTokenAuthorization[U] = {
       lazy val publicKey: PublicKey = {
-        val publicKeyBytes = Files.readAllBytes(publicKeyFile)
-        val spec           = new X509EncodedKeySpec(publicKeyBytes)
+        val publicKeyBase64Encoded = Files.readAllBytes(publicKeyFile)
+        val publicKeyBase64Decoded = java.util.Base64.getDecoder.decode(publicKeyBase64Encoded)
+        val spec                   = new X509EncodedKeySpec(publicKeyBase64Decoded)
         KeyFactory.getInstance("RSA").generatePublic(spec)
       }
       new CachedTokenAuthorization[U](publicKey, issuer)