Simplified session storage

Author: emyfops

common/src/main/kotlin/com/lambda/module/modules/client/Discord.kt

@@ -18,6 +18,7 @@
 package com.lambda.module.modules.client
 
 import com.lambda.Lambda
+import com.lambda.Lambda.LOG
 import com.lambda.context.SafeContext
 import com.lambda.event.EventFlow
 import com.lambda.event.events.WorldEvent
@@ -80,8 +81,8 @@ object Discord : Module(
         val auth = rpc.applicationManager.authenticate()
 
         linkDiscord(discordToken = auth.accessToken)
-            .fold(onSuccess = { updateToken(it); discordAuth = auth },
-                onFailure = { warn("Failed to link the discord account to the minecraft auth") })
+            .onSuccess { updateToken(it); discordAuth = auth }
+            .onFailure { LOG.error(it); warn("Failed to link your discord account") }
     }
 
     private fun stop() {

common/src/main/kotlin/com/lambda/module/modules/client/Network.kt

@@ -80,10 +80,8 @@ object Network : Module(
             // a race condition where the game server haven't acknowledged the packets
             // and posted to the sessionserver api
             login(mc.session.username, hash ?: return@listenUnsafeConcurrently)
-                .fold(
-                    onSuccess = { updateToken(it) },
-                    onFailure = { LOG.warn("Unable to authenticate: $it") }
-                )
+                .onSuccess { updateToken(it) }
+                .onFailure { LOG.warn(it) }
         }
     }
 

common/src/main/kotlin/com/lambda/network/NetworkManager.kt

@@ -17,54 +17,49 @@
 
 package com.lambda.network
 
-import com.lambda.Lambda.gson
 import com.lambda.Lambda.mc
 import com.lambda.config.Configurable
 import com.lambda.config.configurations.UserConfig
 import com.lambda.core.Loadable
 import com.lambda.network.api.v1.models.Authentication
 import com.lambda.network.api.v1.models.Authentication.Data
-import com.lambda.util.FolderRegister.capes
-import com.lambda.util.reflections.getResources
-import java.io.File
+import com.lambda.util.StringUtils.base64UrlDecode
+import com.lambda.util.StringUtils.json
+import com.lambda.util.collections.updatableLazy
 import java.util.*
 
 object NetworkManager : Configurable(UserConfig), Loadable {
     override val name = "network"
 
-    var accessToken by setting("authentication", ""); private set
+    var accessToken by setting("access_token", ""); private set
 
-    val isDiscordLinked: Boolean
-        get() = deserialized?.data?.discordId != null
+    val isValid: Boolean
+        get() = mc.gameProfile.name == auth.value?.data?.name &&
+                mc.gameProfile.id == auth.value?.data?.uuid &&
+                System.currentTimeMillis() > (auth.value?.expirationDate ?: Long.MAX_VALUE)
 
-    /**
-     * Returns whether the auth has expired
-     */
-    val isExpired: Boolean
-        get() = (deserialized?.expirationDate ?: 0) < System.currentTimeMillis()
+    private val auth = updatableLazy {
+        val parts = accessToken.split(".")
+        if (parts.size != 3) return@updatableLazy null
 
-    /**
-     * Returns whether the auth token is invalid or not
-     */
-    val isValid: Boolean
-        get() = mc.gameProfile.name == deserialized?.data?.name &&
-                mc.gameProfile.id == deserialized?.data?.uuid &&
-                !isExpired
+        val payload = parts[1]
+        val data = payload.base64UrlDecode().json<Data>()
 
-    private var deserialized: Data? = null
+        return@updatableLazy if (System.currentTimeMillis() < data.expirationDate) null
+        else data
+    }
 
     fun updateToken(resp: Authentication) {
         accessToken = resp.accessToken
-        decodeAuth(accessToken)
+        auth.update()
     }
 
-    private fun decodeAuth(token: String) {
-        val payload = token.split(".").getOrNull(1) ?: return
-        deserialized = gson.fromJson(String(Base64.getUrlDecoder().decode(payload)), Data::class.java)
-    }
 
+    override fun load(): String {
+        auth.update()
 
-    init {
-        decodeAuth(accessToken)
+        return auth.value
+            ?.let { "Logged you in as ${it.data.name} (${it.data.uuid})" }
+            ?: "You are not authenticated"
     }
 }

common/src/main/kotlin/com/lambda/util/StringUtils.kt

@@ -17,7 +17,11 @@
 
 package com.lambda.util
 
+import com.google.gson.Gson
+import com.lambda.Lambda.gson
 import java.security.MessageDigest
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
 
 object StringUtils {
     /**
@@ -92,6 +96,19 @@ object StringUtils {
         return cost[len0 - 1]
     }
 
+    /**
+     * Takes the receiver string and decodes it to the input type
+     *
+     * @return Instance of [T]
+     */
+    inline fun <reified T : Any> String.json() = gson.fromJson(this, T::class.java)
+
+    /**
+     * @see kotlin.io.encoding.Base64.decode
+     */
+    @OptIn(ExperimentalEncodingApi::class)
+    fun String.base64UrlDecode() = Base64.UrlSafe.decode(this).decodeToString()
+
     /**
      * See [MessageDigest section](https://docs.oracle.com/en/java/javase/11/docs/specs/security/standard-names.html#messagedigest-algorithms) of the Java Security Standard Algorithm Names Specification
      *