From 69e4448749fa4a43f960f400840f9c039e669c44 Mon Sep 17 00:00:00 2001
From: sergeych <real.sergeych@gmail.com>
Date: Fri, 9 Dec 2022 02:38:42 +0100
Subject: [PATCH] simpler server API

---
 .../client/SuperloginClient.kt                        |  2 +-
 .../sergeych/superlogin/server/SuperloginServer.kt    |  5 ++++-
 src/jvmTest/kotlin/net/sergeych/WsServerKtTest.kt     | 11 ++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/commonMain/kotlin/net.sergeych.superlogin/client/SuperloginClient.kt b/src/commonMain/kotlin/net.sergeych.superlogin/client/SuperloginClient.kt
index 9a16635..bc9c373 100644
--- a/src/commonMain/kotlin/net.sergeych.superlogin/client/SuperloginClient.kt
+++ b/src/commonMain/kotlin/net.sergeych.superlogin/client/SuperloginClient.kt
@@ -354,7 +354,7 @@ class SuperloginClient<D, S : WithAdapter>(
 
 
     companion object {
-        inline operator fun <reified D, S : WithAdapter> invoke(
+        inline operator fun <reified D,S : WithAdapter> invoke(
             t: Parsec3Transport<S>,
             savedData: SuperloginData<D>? = null,
         ): SuperloginClient<D, S> {
diff --git a/src/jvmMain/kotlin/net/sergeych/superlogin/server/SuperloginServer.kt b/src/jvmMain/kotlin/net/sergeych/superlogin/server/SuperloginServer.kt
index ff37f51..b8be6e0 100644
--- a/src/jvmMain/kotlin/net/sergeych/superlogin/server/SuperloginServer.kt
+++ b/src/jvmMain/kotlin/net/sergeych/superlogin/server/SuperloginServer.kt
@@ -10,7 +10,10 @@ import kotlin.random.Random
 fun randomACOLike(): ByteArray {
     return Random.nextBytes(117)
 }
-inline fun <reified D, T : SLServerSession<D>, H : CommandHost<T>> AdapterBuilder<T, H>.superloginServer() {
+inline fun <reified D, T : SLServerSession<D>, H : CommandHost<T>> AdapterBuilder<T, H>.superloginServer(
+    crossinline sessionBuilder: suspend ()->T
+) {
+    newSession { sessionBuilder() }
     addErrors(SuperloginExceptionsRegistry)
     val a2 = SuperloginServerApi<WithAdapter>()
     on(a2.slGetNonce) { nonce }
diff --git a/src/jvmTest/kotlin/net/sergeych/WsServerKtTest.kt b/src/jvmTest/kotlin/net/sergeych/WsServerKtTest.kt
index e187a2b..69b18fd 100644
--- a/src/jvmTest/kotlin/net/sergeych/WsServerKtTest.kt
+++ b/src/jvmTest/kotlin/net/sergeych/WsServerKtTest.kt
@@ -154,15 +154,17 @@ internal class WsServerKtTest {
 
     }
 
+    class S1: WithAdapter()
+
     @Test
     fun changePasswordTest() {
         embeddedServer(Netty, port = 8081, module = Application::testServerModule).start(wait = false)
 
         runBlocking {
-            val client = Parsec3WSClient("ws://localhost:8081/api/p3")
+            val client = Parsec3WSClient.withSession<S1>("ws://localhost:8081/api/p3")
 
             val api = TestApiServer<WithAdapter>()
-            val slc = SuperloginClient<TestData, WithAdapter>(client)
+            val slc = SuperloginClient<TestData, S1>(client)
             assertEquals(LoginState.LoggedOut, slc.state.value)
             var rt = slc.register("foo", "passwd", TestData("bar!"))
             assertIs<Registration.Result.Success>(rt)
@@ -211,10 +213,9 @@ internal class WsServerKtTest {
 }
 
 fun Application.testServerModule() {
-    parsec3TransportServer(TestApiServer<SLServerSession<TestData>>()) {
+    parsec3TransportServer(TestApiServer<TestSession>()) {
 //            superloginServer(TestServerTraits,TestApiServer<SLServerSession<TestData>>()) {
-        newSession { TestSession() }
-        superloginServer()
+        superloginServer { TestSession() }
         on(api.loginName) {
             println("login name called. now we have $currentLoginName : $superloginData")
             currentLoginName