update version

idl-sources/izumi-version.sh

@@ -1,4 +1,4 @@
 #!/bin/bash -xe
 
-IZUMI_VERSION="0.7.0"
-IZUMI_COMPILER=${IZUMI_COMPILER:-com.github.pshirshov.izumi.r2:idealingua-v1-compiler_2.12:${IZUMI_VERSION}}
+IZUMI_VERSION="0.8.6"
+IZUMI_COMPILER=${IZUMI_COMPILER:-io.7mind.izumi:idealingua-v1-compiler_2.12:${IZUMI_VERSION}}

idl-sources/recompile-scala.sh

@@ -6,7 +6,7 @@ echo "start publishing..."
 coursier launch \
     -r https://oss.sonatype.org/content/repositories/snapshots \
     -r https://oss.sonatype.org/content/repositories/releases \
-    ${IZUMI_COMPILER} -- scala -d common.izumiVersion=${IZUMI_VERSION}
+    ${IZUMI_COMPILER} -- :scala -d common.izumiVersion=${IZUMI_VERSION}
 
 
 echo '==================================================='

server/src/main/scala/com/septimalmind/client.scala → server/src/main/scala/com/septimalmind/Client.scala

@@ -1,6 +1,5 @@
 package com.septimalmind
 
-import java.util.UUID
 
 import com.github.pshirshov.izumi.idealingua.runtime.rpc.http4s.ClientDispatcher
 import com.github.pshirshov.izumi.idealingua.runtime.rpc.{ IRTClientMultiplexor, IRTWrappedClient }
@@ -9,14 +8,12 @@ import com.septimalmind.services.users.UserProfileServiceWrappedClient
 import com.septimalmind.shared.RuntimeContext
 import org.http4s.{ Header, Request, Uri }
 import scalaz.zio.IO
-import com.github.pshirshov.izumi.functional.bio.BIO._
-import com.septimalmind.services.users.UserId
 import com.septimalmind.services.companies.CompanyId
 import com.septimalmind.services.auth.SignUpRequest
 import com.septimalmind.services.auth.EmailPassword
 import com.septimalmind.services.shared.DomainFailureCode
 
-object client extends App with RuntimeContext {
+object Client extends App with RuntimeContext {
 
   val uri = Uri.fromString("http://localhost:8080/v2").right.get
 
@@ -51,9 +48,9 @@ object client extends App with RuntimeContext {
   val out = for {
     signupToken <- adminClient.signUp(SignUpRequest("test-user", "[email protected]", "+3801234567", "qwerty12345"))
     _ <- adminClient
-          .login(EmailPassword("wrong-email", "qwerty12345"))
-          .flip
-          .map(failure => assert(failure.code == DomainFailureCode.EntityNotFound))
+      .login(EmailPassword("wrong-email", "qwerty12345"))
+      .flip
+      .map(failure => assert(failure.code == DomainFailureCode.EntityNotFound))
     loginResponse <- adminClient.login(EmailPassword("[email protected]", "qwerty12345"))
     _ = assert(loginResponse.accessToken == signupToken.accessToken)
   } yield ()

server/src/main/scala/com/septimalmind/server.scala → server/src/main/scala/com/septimalmind/Server.scala

@@ -1,29 +1,7 @@
-import cats.data.{Kleisli, OptionT}
-import cats.effect._
-import com.github.pshirshov.izumi.functional.bio.BIO._
-import com.github.pshirshov.izumi.functional.bio.BIORunner
-import com.github.pshirshov.izumi.idealingua.runtime.rpc.http4s._
+package com.septimalmind
+
 import com.github.pshirshov.izumi.idealingua.runtime.rpc.{ContextExtender, IRTClientMultiplexor, IRTServerMultiplexor, _}
-import com.github.pshirshov.izumi.logstage.api.IzLogger
-import com.septimalmind.server.externals.TokenService
-import com.septimalmind.server.idl.RequestContext.{AdminRequest, ClientRequest, GuestRequest}
-import com.septimalmind.server.idl.{NetworkContext, RequestContext}
-import com.septimalmind.server.persistence.{UserRepo, UserSessionRepo}
-import com.septimalmind.server.services.auth.LoginService
-import com.septimalmind.server.services.users.ProfileService
-import com.septimalmind.services.auth.LoginServiceWrappedServer
-import com.septimalmind.services.companies.CompanyId
-import com.septimalmind.services.users.{UserId, UserProfileServiceWrappedServer}
-import com.septimalmind.shared.RuntimeContext
-import org.http4s.Request
-import org.http4s.server.blaze.BlazeServerBuilder
-import org.http4s.server.{AuthMiddleware, Router}
-import org.http4s.syntax.kleisli._
-import scalaz.zio.IO
-import scalaz.zio.interop.catz._
 import cats.data.{Kleisli, OptionT}
-import cats.effect._
-import com.github.pshirshov.izumi.functional.bio.BIO._
 import com.github.pshirshov.izumi.functional.bio.BIORunner
 import com.github.pshirshov.izumi.idealingua.runtime.rpc.http4s._
 import com.github.pshirshov.izumi.idealingua.runtime.rpc._
@@ -35,8 +13,7 @@ import com.septimalmind.server.persistence.{UserRepo, UserSessionRepo}
 import com.septimalmind.server.services.auth.LoginService
 import com.septimalmind.server.services.users.ProfileService
 import com.septimalmind.services.auth.LoginServiceWrappedServer
-import com.septimalmind.services.companies.CompanyId
-import com.septimalmind.services.users.{UserId, UserProfileServiceWrappedServer}
+import com.septimalmind.services.users.UserProfileServiceWrappedServer
 import com.septimalmind.shared.RuntimeContext
 import org.http4s.Request
 import org.http4s.server.blaze.BlazeServerBuilder
@@ -47,9 +24,8 @@ import scalaz.zio.interop.catz._
 import cats.effect._
 import org.http4s._
 import org.http4s.dsl.io._
-import scala.util.Try
 
-object server extends App with RuntimeContext {
+object Server extends App with RuntimeContext {
 
   private val tokenService = new TokenService[IO]
   private val userRepo = new UserRepo[IO]
@@ -91,17 +67,15 @@ object server extends App with RuntimeContext {
   bio.unsafeRun(server)
 
   def setupIDLRuntime(services: Set[IRTWrappedService[IO, RequestContext]], clients: Set[IRTWrappedClient], logger: IzLogger)(implicit bio: BIORunner[IO], timer: Timer[IO[Throwable, ?]]) = {
-
     val clientMultiplexor: IRTClientMultiplexor[IO] = new IRTClientMultiplexor[IO](clients)
-
     val serverMultiplexor = new IRTServerMultiplexor[IO, RequestContext, RequestContext](services, ContextExtender.id)
 
     val (listeners, wsContextProvider, wsSessionStorage) = setupWsContext(rt, logger, clientMultiplexor)
 
     val authUser: Kleisli[OptionT[IO[Throwable, ?], ?], Request[IO[Throwable, ?]], RequestContext] =
       Kleisli {
         request: Request[IO[Throwable, ?]] =>
-            OptionT.fromOption(prepareRequest(request))
+          OptionT.fromOption(prepareRequest(request))
       }
 
     val server = new HttpServer[rt.type](