Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import com.stytch.java.consumer.models.sessions.Session

public sealed interface JWTResponse

@Deprecated("No longer returned; authenticateJwt reports failures as StytchResult.Error.")
public object JWTNullResponse : JWTResponse

public data class JWTSessionResponse(
Expand All @@ -15,6 +16,7 @@ public data class JWTAuthResponse(
val response: AuthenticateResponse,
) : JWTResponse

@Deprecated("No longer returned; authenticateJwt reports failures as StytchResult.Error.")
public data class JWTErrorResponse(
val statusCode: Int,
val requestId: String?,
Expand Down
2 changes: 1 addition & 1 deletion stytch/src/main/kotlin/com/stytch/java/common/Version.kt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.stytch.java.common

internal const val VERSION = "11.3.0"
internal const val VERSION = "11.4.0"
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ import com.squareup.moshi.Types
import com.stytch.java.common.ConsumerPolicyCache
import com.stytch.java.common.InstantAdapter
import com.stytch.java.common.JWTAuthResponse
import com.stytch.java.common.JWTErrorResponse
import com.stytch.java.common.JWTException
import com.stytch.java.common.JWTNullResponse
import com.stytch.java.common.JWTResponse
import com.stytch.java.common.JWTSessionResponse
import com.stytch.java.common.JwtOptions
Expand Down Expand Up @@ -587,26 +585,7 @@ internal class SessionsImpl(
StytchResult.Success(JWTAuthResponse(netResult.value))
}

is StytchResult.Error -> {
when (val exception = netResult.exception) {
is StytchException.Response -> {
val errorResponse = exception.reason
StytchResult.Success(
JWTErrorResponse(
statusCode = errorResponse.statusCode,
requestId = errorResponse.requestId,
errorType = errorResponse.errorType,
errorMessage = errorResponse.errorMessage,
errorUrl = errorResponse.errorUrl,
),
)
}

else -> {
StytchResult.Success(JWTNullResponse)
}
}
}
is StytchResult.Error -> netResult
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package com.stytch.java.consumer.api.sessions

import com.stytch.java.common.JWTException
import com.stytch.java.common.JwtOptions
import com.stytch.java.common.StytchException
import com.stytch.java.common.StytchResult
import com.stytch.java.http.HttpClient
import io.mockk.every
import io.mockk.mockk
import kotlinx.coroutines.CoroutineScope
Expand All @@ -12,12 +14,15 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.newSingleThreadContext
import kotlinx.coroutines.test.runTest
import kotlinx.coroutines.test.setMain
import okhttp3.mockwebserver.MockResponse
import okhttp3.mockwebserver.MockWebServer
import org.jose4j.jwk.HttpsJwks
import org.jose4j.jwk.JsonWebKey
import org.jose4j.jwk.RsaJwkGenerator
import org.jose4j.jws.AlgorithmIdentifiers
import org.jose4j.jws.JsonWebSignature
import org.jose4j.jwt.JwtClaims
import org.junit.After
import org.junit.Before
import org.junit.Test
import java.time.Instant
Expand All @@ -30,10 +35,12 @@ internal class SessionsTest {
private lateinit var jwtNoClaims: String
private lateinit var jwtWithClaims: String
private val projectId = "project-test-00000000-0000-0000-0000-000000000000"
private lateinit var server: MockWebServer
private val mainThreadSurrogate = newSingleThreadContext("UI thread")

@Before
fun before() {
server = MockWebServer().apply { start() }
Dispatchers.setMain(mainThreadSurrogate)
val rsaJsonWebKey = RsaJwkGenerator.generateJwk(2048)
val jsonWebKey = JsonWebKey.Factory.newJwk(rsaJsonWebKey.publicKey)
Expand Down Expand Up @@ -110,7 +117,7 @@ internal class SessionsTest {
}.compactSerialization
sessions =
SessionsImpl(
httpClient = mockk(relaxed = true, relaxUnitFun = true),
httpClient = HttpClient(server.url("").toString().trimEnd('/'), projectId, "secret"),
coroutineScope = CoroutineScope(mainThreadSurrogate),
jwksClient = jwksClient,
jwtOptions =
Expand All @@ -137,4 +144,31 @@ internal class SessionsTest {
val result = sessions.authenticateJwtLocal(jwtWithClaims, 50000)
require(result is StytchResult.Success)
}

@After
fun after() {
server.shutdown()
}

@Test
fun `authenticateJwt returns Error when the API rejects the JWT`() =
runTest {
server.enqueue(
MockResponse().setResponseCode(401).setBody(
"""{"status_code":401,"request_id":"req","error_type":"session_not_found","error_message":"nope","error_url":"url"}""",
),
)
val result = sessions.authenticateJwt("aaa.bbb.ccc", null)
require(result is StytchResult.Error)
assert(result.exception is StytchException.Response)
}

@Test
fun `authenticateJwt returns Error when the API error response cannot be parsed`() =
runTest {
server.enqueue(MockResponse().setResponseCode(500).setBody("upstream unavailable"))
val result = sessions.authenticateJwt("aaa.bbb.ccc", null)
require(result is StytchResult.Error)
assert(result.exception is StytchException.Critical)
}
}
2 changes: 1 addition & 1 deletion version.gradle.kts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "11.3.0"
version = "11.4.0"
Loading