lint

Author: tylerjroach

aws-auth-cognito/src/main/java/com/amplifyframework/statemachine/codegen/data/Tokens.kt

@@ -20,9 +20,8 @@ import com.amplifyframework.auth.exceptions.UnknownException
 import com.amplifyframework.statemachine.util.mask
 import java.time.Instant
 import kotlin.text.Charsets.UTF_8
-import kotlinx.serialization.Serializable
-import org.json.JSONObject
 import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerializationException
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.encoding.Decoder
@@ -31,6 +30,7 @@ import kotlinx.serialization.json.JsonDecoder
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import kotlinx.serialization.json.jsonPrimitive
+import org.json.JSONObject
 
 internal abstract class Jwt {
     abstract val tokenValue: String
@@ -155,17 +155,15 @@ internal data class CognitoUserPoolTokens(
 /**
  * Helper function to extract token value from either flat or nested format
  */
-private fun extractTokenValue(decoder: Decoder, tokenType: String): String {
-    return if (decoder is JsonDecoder) {
-        when (val element = decoder.decodeJsonElement()) {
-            is JsonPrimitive -> element.content // Flat format: "token": "value"
-            is JsonObject -> element["tokenValue"]?.jsonPrimitive?.content 
-                ?: throw SerializationException("Missing tokenValue in nested $tokenType")
-            else -> throw SerializationException("Expected string or object for $tokenType")
-        }
-    } else {
-        decoder.decodeString() // Fallback for non-JSON decoders
+private fun extractTokenValue(decoder: Decoder, tokenType: String): String = if (decoder is JsonDecoder) {
+    when (val element = decoder.decodeJsonElement()) {
+        is JsonPrimitive -> element.content // Flat format: "token": "value"
+        is JsonObject -> element["tokenValue"]?.jsonPrimitive?.content
+            ?: throw SerializationException("Missing tokenValue in nested $tokenType")
+        else -> throw SerializationException("Expected string or object for $tokenType")
     }
+} else {
+    decoder.decodeString() // Fallback for non-JSON decoders
 }
 
 /**
@@ -193,4 +191,4 @@ internal object RefreshTokenAsStringSerializer : KSerializer<RefreshToken> {
     override val descriptor = String.serializer().descriptor
     override fun serialize(encoder: Encoder, value: RefreshToken) = encoder.encodeString(value.tokenValue)
     override fun deserialize(decoder: Decoder) = RefreshToken(extractTokenValue(decoder, "RefreshToken"))
-}
+}

aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/data/TokensTest.kt

@@ -28,8 +28,8 @@ import org.junit.Test
 class TokensTest {
     private val tokenString =
         "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwidXNlcm5hbWUiOiJqZG" +
-                "9lIiwiaWF0IjoxNzU2OTk4Mjc4LCJleHAiOjE3NTY5OTg1NzgsIm9yaWdpbl9qdGkiOiJhYWFhYWFhYS1iYmJiLWNjY2MtZGRkZC1lZ" +
-                "WVlZWVlZWVlZWUifQ.3Mvd5WVi1z1GpQ37hEoev6DzYNv9lWNL-fGfQTxUYx4"
+            "9lIiwiaWF0IjoxNzU2OTk4Mjc4LCJleHAiOjE3NTY5OTg1NzgsIm9yaWdpbl9qdGkiOiJhYWFhYWFhYS1iYmJiLWNjY2MtZGRkZC1lZ" +
+            "WVlZWVlZWVlZWUifQ.3Mvd5WVi1z1GpQ37hEoev6DzYNv9lWNL-fGfQTxUYx4"
 
     @Test
     fun `identity token returns expiry`() {
@@ -88,8 +88,8 @@ class TokensTest {
             expiration = null
         )
         cognitoTokens.toString() shouldBe
-                "CognitoUserPoolTokens(idToken=eyJh***, accessToken=eyJh***, " +
-                "refreshToken=eyJh***, expiration=null)"
+            "CognitoUserPoolTokens(idToken=eyJh***, accessToken=eyJh***, " +
+            "refreshToken=eyJh***, expiration=null)"
     }
 
     @Test
@@ -202,4 +202,4 @@ class TokensTest {
         val serializedNested = Json.encodeToString(tokensFromNested)
         serializedFlat shouldBe serializedNested
     }
-}
+}