@@ -97,9 +97,8 @@ class DescopeFlowCoordinator(val webView: WebView) {
97
97
val jwtServerResponse = JwtServerResponse .fromJson(success, emptyList())
98
98
// take tokens from cookies if missing
99
99
val cookieString = CookieManager .getInstance().getCookie(url)
100
- val projectId = sdk?.client?.config?.projectId
101
- jwtServerResponse.sessionJwt = jwtServerResponse.sessionJwt ? : findJwtInCookies(cookieString, projectId = projectId, name = SESSION_COOKIE_NAME )
102
- jwtServerResponse.refreshJwt = jwtServerResponse.refreshJwt ? : findJwtInCookies(cookieString, projectId = projectId, name = REFRESH_COOKIE_NAME )
100
+ jwtServerResponse.sessionJwt = jwtServerResponse.sessionJwt ? : findJwtInCookies(cookieString, name = SESSION_COOKIE_NAME )
101
+ jwtServerResponse.refreshJwt = jwtServerResponse.refreshJwt ? : findJwtInCookies(cookieString, name = REFRESH_COOKIE_NAME )
103
102
handler.post {
104
103
try {
105
104
val authResponse = jwtServerResponse.convert()
@@ -501,7 +500,7 @@ private fun String.escapeForBackticks() = replace("\\", "\\\\")
501
500
502
501
// Cookies
503
502
504
- internal fun findJwtInCookies (cookieString : String? , projectId : String? , name : String ): String? {
503
+ internal fun findJwtInCookies (cookieString : String? , name : String ): String? {
505
504
// split and aggregate all cookies
506
505
val cookies = mutableListOf<HttpCookie >().apply {
507
506
cookieString?.split(" ; " )?.forEach {
@@ -512,18 +511,15 @@ internal fun findJwtInCookies(cookieString: String?, projectId: String?, name: S
512
511
}
513
512
}
514
513
515
- var filtered = cookies.filter { it.name == name } // filter according cookie name
514
+ return cookies.filter { it.name == name } // filter according cookie name
516
515
.mapNotNull { httpCookie -> // parse token
517
516
try {
518
517
Token (httpCookie.value)
519
518
} catch (e: Exception ) {
520
519
null
521
520
}
522
521
}
523
- projectId?.let { pId ->
524
- filtered = filtered.filter { it.projectId == projectId } // enforce projectId
525
- }
526
- return filtered.maxByOrNull { it.issuedAt }?.jwt // take latest
522
+ .maxByOrNull { it.issuedAt }?.jwt // take latest
527
523
}
528
524
529
525
// URI
0 commit comments