Fixed stupid gson

Author: emyfops

common/src/main/kotlin/com/lambda/Lambda.kt

@@ -17,10 +17,6 @@
 
 package com.lambda
 
-import com.github.kittinunf.fuel.Fuel
-import com.github.kittinunf.fuel.core.await
-import com.github.kittinunf.fuel.core.awaitResponse
-import com.github.kittinunf.fuel.core.awaitUnit
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.lambda.config.serializer.*

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

@@ -18,6 +18,7 @@
 package com.lambda.module.modules.client
 
 import com.lambda.Lambda.LOG
+import com.lambda.Lambda.gson
 import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.event.events.ClientEvent
@@ -31,6 +32,7 @@ import com.lambda.network.api.v1.endpoints.login
 import com.lambda.network.api.v1.models.Authentication
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.network.api.v1.models.Authentication.Data
 import com.lambda.util.extension.isOffline
 import net.minecraft.client.network.AllowedAddressResolver
 import net.minecraft.client.network.ClientLoginNetworkHandler
@@ -41,6 +43,7 @@ import net.minecraft.network.encryption.NetworkEncryptionUtils
 import net.minecraft.network.packet.c2s.login.LoginHelloC2SPacket
 import net.minecraft.text.Text
 import java.math.BigInteger
+import java.util.*
 
 object Network : Module(
     name = "Network",
@@ -49,15 +52,16 @@ object Network : Module(
     enabledByDefault = true,
 ) {
     val authServer by setting("Auth Server", "auth.lambda-client.org")
-    val apiUrl: String by setting("API Server", "https://api.lambda-client.org")
+    val apiUrl by setting("API Server", "https://api.lambda-client.org")
     val apiVersion by setting("API Version", ApiVersion.V1)
 
     var apiAuth: Authentication? = null; private set // TODO: Cache
+    var deserialized: Data? = null; private set // gson is too stupid
     val accessToken: String
         get() = apiAuth?.accessToken ?: ""
 
     val SafeContext.isDiscordLinked: Boolean
-        get() = apiAuth?.decoded?.data?.discordId != null
+        get() = deserialized?.data?.discordId != null
 
     private lateinit var serverId: String
     private lateinit var hash: String
@@ -79,11 +83,12 @@ object Network : Module(
             // and posted to the sessionserver api
             val (authResponse, error) = login(mc.session.username, hash)
             if (error != null) {
-                LOG.debug("Unable to authenticate with the API: {}", error.errorData)
+                LOG.debug("Unable to authenticate with the API: ${error.message}")
                 return@listenOnceUnsafe false
             }
 
             apiAuth = authResponse
+            deserialized = gson.fromJson(String(Base64.getUrlDecoder().decode(accessToken.split(".")[1])), Data::class.java)
 
             // Destroy the listener
             true

common/src/main/kotlin/com/lambda/network/api/v1/models/Authentication.kt

@@ -18,10 +18,6 @@
 package com.lambda.network.api.v1.models
 
 import com.google.gson.annotations.SerializedName
-import com.lambda.Lambda
-import java.time.Instant
-import kotlin.io.encoding.Base64
-import kotlin.io.encoding.ExperimentalEncodingApi
 
 data class Authentication(
     // The access token to use for the API
@@ -39,18 +35,15 @@ data class Authentication(
     @SerializedName("token_type")
     val tokenType: String,
 ) {
-    @OptIn(ExperimentalEncodingApi::class)
-    val decoded = Lambda.gson.fromJson(Base64.decode(accessToken).toString(), Payload::class.java)
-
-    data class Payload(
+    data class Data(
         @SerializedName("nbf")
-        val notBefore: Instant,
+        val notBefore: Long,
 
         @SerializedName("iat")
-        val issuedAt: Instant,
+        val issuedAt: Long,
 
         @SerializedName("exp")
-        val expirationDate: Instant,
+        val expirationDate: Long,
 
         @SerializedName("data")
         val data: Player,