readme fix

README.md

@@ -2,7 +2,9 @@
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-> Current stable version 0.2.3  
+We have moved off github due to growing tensions in the world. Thanks for understanding.
+
+> Current stable version 0.2.6  
 
 This project targets to provide command set of multiplatform tools to faciliate restore access with non-recoverable passwords by providing a backup `secret` string as the only way to reset the password. It is ready to use in android, web and server apps (native target is not yet supported because of the encryption layer not yet supporting it)
 
@@ -35,7 +37,7 @@ and add in dependencies like:
 ~~~
 dependencies {
     //...  
-    implementation("net.sergeych:superlogin:0.2.3")
+    implementation("net.sergeych:superlogin:0.2.6")
 }
 ~~~
 

build.gradle.kts

@@ -9,7 +9,7 @@ val logback_version="1.2.10"
 
 
 group = "net.sergeych"
-version = "0.2.2"
+version = "0.2.6"
 
 repositories {
     mavenCentral()
@@ -24,9 +24,9 @@ repositories {
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = "1.8"
-        }
+//        compilations.all {
+//            kotlinOptions.jvmTarget = "1.8"
+//        }
         withJava()
         testRuns["test"].executionTask.configure {
             useJUnitPlatform()
@@ -34,9 +34,9 @@ kotlin {
     }
     js(IR) {
         browser {
-            commonWebpackConfig {
-                cssSupport.enabled = true
-            }
+//            commonWebpackConfig {
+//                cssSupport.enabled = true
+//            }
             testTask {
                 useMocha {
                     timeout = "30000"
@@ -51,9 +51,8 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.3")
-                api("net.sergeych:unikrypto:1.2.2-SNAPSHOT")
-                api("net.sergeych:parsec3:0.4.3-SNAPSHOT")
-                api("net.sergeych:boss-serialization-mp:0.2.4-SNAPSHOT")
+//                api("net.sergeych:unikrypto:1.2.2-SNAPSHOT")
+                api("net.sergeych:parsec3:0.4.6")
                 api("net.sergeych:unikrypto:1.2.5")
             }
         }

src/commonMain/kotlin/net.sergeych.superlogin/api.kt

@@ -19,14 +19,19 @@ data class RegistrationArgs(
     val packedACO: ByteArray,
     val extraData: ByteArray? = null
 ) {
+    @Suppress("unused")
+
     inline fun <reified T>toSuccess(loginToken: ByteArray, extraData: T): AuthenticationResult.Success {
         return AuthenticationResult.Success(
             loginName, loginToken, BossEncoder.encode(extraData)
         )
     }
 
-    inline fun <reified T>decodeOrNull(): T? = extraData?.let { it.decodeBoss<T>() }
-    inline fun <reified T: Any>decodeOrThrow(): T = extraData?.let { it.decodeBoss<T>() }
+    @Suppress("unused")
+    inline fun <reified T>decodeOrNull(): T? = extraData?.decodeBoss<T>()
+
+    @Suppress("unused")
+    inline fun <reified T: Any>decodeOrThrow(): T = extraData?.decodeBoss<T>()
         ?: throw IllegalArgumentException("missing require extra data of type ${T::class.simpleName}")
 }
 
@@ -44,6 +49,11 @@ sealed class AuthenticationResult {
     @SerialName("LoginUnavailable")
     object LoginUnavailable: AuthenticationResult()
 
+    @Serializable
+    @SerialName("OtherError")
+    class OtherError(val reason: String,val packedData: ByteArray?=null): AuthenticationResult()
+
+
     @Serializable
     @SerialName("LoginIdUnavailable")
     object LoginIdUnavailable: AuthenticationResult()

src/commonMain/kotlin/net.sergeych.superlogin/client/Registration.kt

@@ -34,6 +34,7 @@ class Registration(
     val pbkdfRounds: Int = 15000,
 ) : LogTag("SLREG") {
 
+    @Suppress("unused")
     sealed class Result {
         /**
          * Login is already in use or is somehow else invalid
@@ -53,6 +54,8 @@ class Registration(
             val encodedData: ByteArray?) : Result() {
                 inline fun <reified D>data() = encodedData?.let { BossDecoder.decodeFrom<D>(it)}
             }
+
+        class OtherError(val code: String,val packedData: ByteArray?=null): Result()
     }
 
     private var lastPasswordHash: ByteArray? = null
@@ -90,7 +93,7 @@ class Registration(
         val nonce = adapter.invokeCommand(api.slGetNonce)
         val loginPrivateKey = deferredLoginKey.await()
         val spl = SuperloginRestoreAccessPayload(login, loginPrivateKey, dataKey)
-        repeat(10) {
+        repeat(3) {
             val (restoreKey, restoreData) = AccessControlObject.pack(passwordKeys!!.loginAccessKey, spl)
             try {
                 val packedArgs = SignedRecord.pack(
@@ -122,6 +125,8 @@ class Registration(
 
                     AuthenticationResult.LoginUnavailable -> return Result.InvalidLogin
 
+                    is AuthenticationResult.OtherError -> return Result.OtherError(result.reason, result.packedData)
+
                     is AuthenticationResult.Success -> {
                         return Result.Success(
                             restoreKey.secret,

src/commonTest/kotlin/superlogin/AccessControlObjectTest.kt

@@ -18,7 +18,7 @@ internal class AccessControlObjectTest {
         val pk1 = SymmetricKeys.random()
         val pk2 = SymmetricKeys.random()
         val (rk, packed1) = AccessControlObject.pack(pk1, 117)
-        println(rk.secret)
+//        println(rk.secret)
         val ac1 = AccessControlObject.unpackWithKey<Int>(packed1,pk1)
         assertNotNull(ac1)
         assertEquals(117, ac1.payload)

src/jvmTest/kotlin/net/sergeych/WsServerKtTest.kt

@@ -59,7 +59,7 @@ data class TestSession(val s: TestStorage) : SLServerSession<TestData>() {
     }
 
     override suspend fun loginByToken(token: ByteArray): AuthenticationResult {
-        println("requested login by tokeb ${token.encodeToBase64Compact()}")
+        println("requested login by token ${token.encodeToBase64Compact()}")
         println("                         ${s.byToken[token.toList()]}")
         println("                         ${s.byToken.size} / ${s.byLoginId.size}")